diff --git a/deploy.d/config.yml b/deploy.d/config.yml
index 058755b..b572781 100644
--- a/deploy.d/config.yml
+++ b/deploy.d/config.yml
@@ -7,7 +7,7 @@ vars:
   domain: "punkbase.autonomic.zone"
   http_mirror: "true"
   port: "8085"
-  webapi_password: "{{ webapi_password }}"
+  webapi_password: "{{ vault.webapi_password }}"
   webapi_username: "{{ webapi_username }}"
   dats:
     # https://sunbeam.city/@kawaiipunk/103883932490360099
diff --git a/deploy.d/plays/predeploy.yml b/deploy.d/plays/predeploy.yml
index 4daf6c2..4372acf 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: "{{ app }}"
+    app: "{{ dokku.app_name }}"
     mappings:
-      - "http:{{ dat_port }}:{{ dat_port }}"
+      - "http:{{ vars.dat_port }}:{{ vars.dat_port }}"
     state: present
 
-- name: "Allow access to {{ dat_port }} on the firewall"
+- name: "Allow access to {{ vars.dat_port }} on the firewall"
   become: true
   ufw:
     rule: allow
-    port: "{{ dat_port }}"
+    port: "{{ vars.dat_port }}"
 
-- name: "Reload the firewall to enable {{ dat_port }}"
+- name: "Reload the firewall to enable {{ 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 477a2bc..a343428 100644
--- a/deploy.d/templates/homebase.yml.j2
+++ b/deploy.d/templates/homebase.yml.j2
@@ -1,18 +1,18 @@
 ---
-directory: {{ dat_root }}
-httpMirror: {{ http_mirror }}
-letsencrypt: {{ auto_letsencrypt }}
-dashboard: {{ dashboard }}
+directory: {{ vars.dat_root }}
+httpMirror: {{ vars.http_mirror }}
+letsencrypt: {{ vars.auto_letsencrypt }}
+dashboard: {{ vars.dashboard }}
 
 webapi:
-  domain: {{ domain }}
-  username: {{ webapi_username }}
-  password: {{ webapi_password }}
+  domain: {{ vars.domain }}
+  username: {{ vault.webapi_username }}
+  password: {{ vault.webapi_password }}
 
 ports:
-  http: {{ port }}
+  http: {{ vars.port }}
 
 dats:
-{% for dat in dats %}
+{% for dat in vars.dats %}
   - url: "{{ dat }}"
 {% endfor %}