diff --git a/deploy.d/plays/predeploy.yml b/deploy.d/plays/predeploy.yml
index 4372acf..6db7c98 100644
--- a/deploy.d/plays/predeploy.yml
+++ b/deploy.d/plays/predeploy.yml
@@ -1,18 +1,18 @@
 ---
 - name: Open up the Dat port
   dokku_ports:
-    app: "{{ dokku.app_name }}"
+    app: "{{ dokku.app }}"
     mappings:
-      - "http:{{ vars.dat_port }}:{{ vars.dat_port }}"
+      - "http:{{ config.vars.dat_port }}:{{ config.vars.dat_port }}"
     state: present
 
-- name: "Allow access to {{ vars.dat_port }} on the firewall"
+- name: "Allow access to {{ config.vars.dat_port }} on the firewall"
   become: true
   ufw:
     rule: allow
-    port: "{{ vars.dat_port }}"
+    port: "{{ config.vars.dat_port }}"
 
-- name: "Reload the firewall to enable {{ vars.dat_port }}"
+- name: "Reload the firewall to enable {{ config.vars.dat_port }}"
   become: true
   service:
     name: ufw
diff --git a/deploy.d/templates/homebase.yml.j2 b/deploy.d/templates/homebase.yml.j2
index a343428..2758b03 100644
--- a/deploy.d/templates/homebase.yml.j2
+++ b/deploy.d/templates/homebase.yml.j2
@@ -1,18 +1,18 @@
 ---
-directory: {{ vars.dat_root }}
-httpMirror: {{ vars.http_mirror }}
-letsencrypt: {{ vars.auto_letsencrypt }}
-dashboard: {{ vars.dashboard }}
+directory: {{ config.vars.dat_root }}
+httpMirror: {{ config.vars.http_mirror }}
+letsencrypt: {{ config.vars.auto_letsencrypt }}
+dashboard: {{ config.vars.dashboard }}
 
 webapi:
-  domain: {{ vars.domain }}
-  username: {{ vault.webapi_username }}
-  password: {{ vault.webapi_password }}
+  domain: {{ config.vars.domain }}
+  username: {{ config.vault.webapi_username }}
+  password: {{ config.vault.webapi_password }}
 
 ports:
-  http: {{ vars.port }}
+  http: {{ config.vars.port }}
 
 dats:
-{% for dat in vars.dats %}
+{% for dat in config.vars.dats %}
   - url: "{{ dat }}"
 {% endfor %}