diff --git a/deploy.d/config.yml b/deploy.d/config.yml
index 11e48b9..74ecbb8 100644
--- a/deploy.d/config.yml
+++ b/deploy.d/config.yml
@@ -1,17 +1,20 @@
 ---
-port: "8080"
-domain: "id.autonomic.zone"
+vars:
+  port: "8080"
+  domain: "id.autonomic.zone"
+
 db:
   - type: "mariadb"
-    passwd: "{{ db_passwd }}"
-    root_passwd: "{{ root_db_passwd }}"
+    passwd: "{{ vault.db_passwd }}"
+    root_passwd: "{{ vault.root_db_passwd }}"
+
 env:
-  DB_ADDR: "{{ dokku_mariadb_db_addr }}"
+  DB_ADDR: "{{ dokku.mariadb_db_addr }}"
   DB_DATABASE: "keycloak"
-  DB_PASSWORD: "{{ db_passwd }}"
-  DB_USER: "{{ dokku_mariadb_db_user }}"
+  DB_PASSWORD: "{{ vault.db_passwd }}"
+  DB_USER: "{{ dokku.mariadb_db_user }}"
   DB_VENDOR: "mariadb"
   DOKKU_LETSENCRYPT_EMAIL: "helo@autonomic.zone"
-  KEYCLOAK_PASSWORD: "{{ autonomic_admin_pass }}"
+  KEYCLOAK_PASSWORD: "{{ vault.autonomic_admin_pass }}"
   KEYCLOAK_USER: "autonomic"
   PROXY_ADDRESS_FORWARDING: "true"