diff --git a/defaults/main.yml b/defaults/main.yml
index 64ebfc2..236e4d3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,10 +7,6 @@ kimai_group: www-data
 kimai_home: /var/www
 kimai_private: "{{ kimai_home }}/kimai"
 kimai_docroot: "{{ kimai_home }}/kimai/public"
-kimai_tz: Europe/London
-kimai_locale: en
-kimai_country: GB
-kimai_currency: GBP
 # The MySQL user, password and database name need to be set using these variables:
 # kimai_dbuser:
 # kimai_dbpass:
@@ -20,6 +16,23 @@ kimai_dbport: 3306
 # If these variables are set then the admin user will be created on install:
 # kimai_admin_user:
 # kimai_admin_email:
+kimai_local:
+  kimai:
+    defaults:
+      user:
+        timezone: Europe/London
+        language: en
+        currency: GBP
+      customer:
+        timezone: Europe/London
+        country: GB
+        currency: GBP
+    calendar:
+      businessHours:
+        begin: '09:00'
+        end: '17:00'
+    user:
+      registration: false
 # Send the admin password by email to the admin:
 # kimai_notify: true
 kimai_notify_from: "{{ kimai_user }}@{{ inventory_hostname }}"
diff --git a/templates/local.yaml.j2 b/templates/local.yaml.j2
index b1b5394..e3d30f9 100644
--- a/templates/local.yaml.j2
+++ b/templates/local.yaml.j2
@@ -1,30 +1,7 @@
 ---
 # {{ ansible_managed }}
 
-kimai:
-    defaults:
-        user:
-            timezone: {{ kimai_tz | default('Europe/London') }}
-            language: {{ kimai_locale | default('en') }}
-            currency: {{ kimai_currency | default('GBP') }}
-        customer:
-            timezone: {{ kimai_tz | default('Europe/London') }}
-            country: {{ kimai_country | default('GB') }}
-            currency: {{ kimai_currency | default('GBP') }}
-    calendar:
-        businessHours:
-            begin: '09:00'
-            end: '17:00'
-{% if kimai_user_registration == False %}
-    user:
-        registration: false
-{% endif %}
-
-{% if kimai_email_transport == "sendmail" %}
-swiftmailer:
-  transport: sendmail
-  command: {{ kimai_sendmail_command }}
-{% endif %}
+{{ kimai_local | to_nice_yaml }}
 
 # vim: set ft=yaml
 ...