diff --git a/plays/lib/database.yml b/plays/lib/database.yml
index b2fc1d0..62c352c 100644
--- a/plays/lib/database.yml
+++ b/plays/lib/database.yml
@@ -1,33 +1,32 @@
 ---
 
 - name: Run database setup tasks
-  when: db is defined
   block:
     - name: Setup database facts
       set_fact:
         mount_map:
           mariadb: /var/lib/mysql
 
-    - name: "Create {{ db.type }} database"
+    - name: "Create {{ item.type }} database"
       no_log: true
       shell: "
         dokku
-        {{ db.type }}:create
+        {{ item.type }}:create
         {{ app }}
-        --password {{ db_passwd }}
-        --root-password {{ root_db_passwd }}
+        --password {{ item.passwd }}
+        --root-password {{ item.root_passwd }}
       "
       args:
-        creates: "/var/lib/dokku/services/{{ db.type }}/{{ app }}"
+        creates: "/var/lib/dokku/services/{{ item.type }}/{{ app }}"
 
-    - name: Link mariadb database to application
+    - name: "Link {{ db.type }} database to application"
       dokku_service_link:
         app: "{{ app }}"
         name: "{{ app }}"
-        service: "{{ db.type }}"
+        service: "{{ item.type }}"
 
-    - name: "Specify {{ db.type }} volume mounts"
+    - name: "Specify {{ item.type }} volume mounts"
       dokku_storage:
         app: "{{ app }}"
         mounts:
-          - "/var/lib/dokku/services/{{ db.type }}/{{ app }}:{{ mount_map[db.type] }}"
+          - "/var/lib/dokku/services/{{ item.type }}/{{ app }}:{{ mount_map[item.type] }}"
diff --git a/plays/pre_deploy.yml b/plays/pre_deploy.yml
index e9e9add..17bf91e 100644
--- a/plays/pre_deploy.yml
+++ b/plays/pre_deploy.yml
@@ -18,6 +18,8 @@
 
     - name: Include database tasks
       include: ./lib/database.yml
+      with_items: "{{ db }}"
+      when: db is defined
 
     - name: Include env tasks
       include: ./lib/env.yml