diff --git a/roles/svc-db-mariadb/tasks/main.yml b/roles/svc-db-mariadb/tasks/main.yml
index c24cc0d8..9e60ece6 100644
--- a/roles/svc-db-mariadb/tasks/main.yml
+++ b/roles/svc-db-mariadb/tasks/main.yml
@@ -1,6 +1,10 @@
-- include_tasks: 01_core.yml
-  when: run_once_svc_db_mariadb is not defined
 
-- name: "Initialize database for '{{ database_name }}'"
-  include_tasks: 02_init.yml
-  when: database_init | bool
\ No newline at end of file
+- block:
+    - include_tasks: 01_core.yml
+      when: run_once_svc_db_mariadb is not defined
+
+    - name: "Initialize database for '{{ database_name }}'"
+      include_tasks: 02_init.yml
+      when: database_init | bool
+  vars:
+    application_id: svc-db-mariadb
\ No newline at end of file
diff --git a/roles/svc-db-postgres/tasks/main.yml b/roles/svc-db-postgres/tasks/main.yml
index 23d8f502..830f3131 100644
--- a/roles/svc-db-postgres/tasks/main.yml
+++ b/roles/svc-db-postgres/tasks/main.yml
@@ -1,11 +1,14 @@
-- include_tasks: 01_core.yml
-  when: run_once_svc_db_postgres is not defined
+- block:
+  - include_tasks: 01_core.yml
+    when: run_once_svc_db_postgres is not defined
+  
+  - include_tasks: utils/load_handlers.yml
+    # Necessary because docker handlers are overwritten by condition
+    vars:
+      handler_role_name: "docker-compose"
 
-- include_tasks: utils/load_handlers.yml
-  # Necessary because docker handlers are overwritten by condition
+  - name: "Initialize database for '{{ database_name }}'"
+    include_tasks: 02_init.yml
+    when: database_init | bool
   vars:
-    handler_role_name: "docker-compose"
-
-- name: "Initialize database for '{{ database_name }}'"
-  include_tasks: 02_init.yml
-  when: database_init | bool
\ No newline at end of file
+    application_id: svc-db-postgres
\ No newline at end of file