diff --git a/README.md b/README.md
index 821bd32..19b07a8 100644
--- a/README.md
+++ b/README.md
@@ -46,19 +46,19 @@ ansible-galaxy install claranet.motd
## :gear: Role variables
-Variable | Default value | Description
------------------------------|---------------------------------------------------------------|----------------------------------------------------------------
-motd_disable_default_motd | true | Disable system default MOTD (/etc/motd)
-motd_banner_template | https://raw.githubusercontent.com/claranet/motd/master/banner | SSH banner template
Can be a URL, a local template or `null`
-motd_banner_template_prepend | "" | Prepend raw content to `motd_banner_template`
-motd_banner_template_append | "" | Append raw content to `motd_banner_template`
-motd_banner_template_username| {{ motd_template_username }} | Used when `motd_banner_template` is an URL
-motd_banner_template_password| {{ motd_template_password }} | Used when `motd_banner_template` is an URL
-motd_template | https://raw.githubusercontent.com/claranet/motd/master/motd | Dynmaic MOTD template
Can be a URL or a local template
-motd_template_prepend | "" | Prepend raw content to `motd_template`
-motd_template_append | See [defaults/main.yml](defaults/main.yml) | Append raw content to `motd_template`
-motd_template_username | "" | Used when `motd_template` is an URL
-motd_template_password | "" | Used when `motd_template` is an URL
+Variable | Default value | Description
+-----------------------------|------------------------------------------------------------------------|----------------------------------------------------------------
+motd_disable_default_motd | true | Disable system default MOTD (/etc/motd)
+motd_banner_template | https://raw.githubusercontent.com/claranet/motd/master/banner | SSH banner template
Can be a URL, a local template or `null`
+motd_banner_template_prepend | "" | Prepend raw content to `motd_banner_template`
+motd_banner_template_append | "" | Append raw content to `motd_banner_template`
+motd_banner_template_username| {{ motd_template_username }} | Used when `motd_banner_template` is an URL
+motd_banner_template_password| {{ motd_template_password }} | Used when `motd_banner_template` is an URL
+motd_template | https://raw.githubusercontent.com/claranet/motd/master/scripts/00-basic| Dynmaic MOTD template
Can be a URL or a local template
+motd_template_prepend | "" | Prepend raw content to `motd_template`
+motd_template_append | See [defaults/main.yml](defaults/main.yml) | Append raw content to `motd_template`
+motd_template_username | "" | Used when `motd_template` is an URL
+motd_template_password | "" | Used when `motd_template` is an URL
## :pencil2: Example Playbook
diff --git a/defaults/main.yml b/defaults/main.yml
index bcd554e..ca8b1d2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,7 @@
---
motd_disable_default_motd: true
motd_banner_template: https://raw.githubusercontent.com/claranet/motd/master/banner
-motd_template: https://raw.githubusercontent.com/claranet/motd/master/dynmotd
+motd_template: https://raw.githubusercontent.com/claranet/motd/master/scripts/00-basic
motd_banner_template_prepend: ""
motd_banner_template_append: ""
motd_template_prepend: ""