diff --git a/deploy.d/app.yml b/deploy.d/app.yml
new file mode 100644
index 0000000..11dc6cd
--- /dev/null
+++ b/deploy.d/app.yml
@@ -0,0 +1,2 @@
+---
+port: 8080
diff --git a/deploy.d/config.yml b/deploy.d/config.yml
deleted file mode 100644
index e433a85..0000000
--- a/deploy.d/config.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-port: 8080
-
-db:
-  type: mariadb
-  password: "{{ db_passwd }}"
-  root_password: "{{ root_db_passwd }}"
-
-env:
-  DB_ADDR: "{{ dokku_db_addr }}"
-  DB_DATABASE: "keycloak"
-  DB_PASSWORD: "{{ db_passwd }}"
-  DB_USER: "{{ dokku_db_user }}"
-  DB_VENDOR: "mariadb"
-  KEYCLOAK_PASSWORD: "helo@autonomic.zone"
-  KEYCLOAK_USER: "autonomic"
-  PROXY_ADDRESS_FORWARDING: "true"
diff --git a/deploy.d/db.yml b/deploy.d/db.yml
new file mode 100644
index 0000000..95bac74
--- /dev/null
+++ b/deploy.d/db.yml
@@ -0,0 +1,4 @@
+---
+mariadb:
+  password: "{{ db_passwd }}"
+  root_password: "{{ root_db_passwd }}"
diff --git a/deploy.d/env.yml b/deploy.d/env.yml
new file mode 100644
index 0000000..d8d22a0
--- /dev/null
+++ b/deploy.d/env.yml
@@ -0,0 +1,9 @@
+---
+DB_ADDR: "{{ dokku_db_addr }}"
+DB_DATABASE: "keycloak"
+DB_PASSWORD: "{{ db_passwd }}"
+DB_USER: "{{ dokku_db_user }}"
+DB_VENDOR: "mariadb"
+KEYCLOAK_PASSWORD: "helo@autonomic.zone"
+KEYCLOAK_USER: "autonomic"
+PROXY_ADDRESS_FORWARDING: "true"