diff --git a/roles/docker-compose/templates/base.yml.j2 b/roles/docker-compose/templates/base.yml.j2
index c670b275..f010189a 100644
--- a/roles/docker-compose/templates/base.yml.j2
+++ b/roles/docker-compose/templates/base.yml.j2
@@ -1,11 +1,11 @@
 {# Base template for all docker-compose.yml.j2 #}
 services:
 {# Load Database #}
-{% if applications[application_id].docker.database.enabled | default(false) | bool %}
+{% if applications[application_id].docker.services.database.enabled | default(false) | bool %}
 {% include 'roles/docker-central-database/templates/services/main.yml.j2' %}
 {% endif %}
 {# Load Redis #}
-{% if applications[application_id].docker.redis.enabled | default(false) | bool %}
+{% if applications[application_id].docker.services.redis.enabled | default(false) | bool %}
 {% include 'roles/docker-redis/templates/service.yml.j2' %}
 {% endif %}
 {# Load OAuth2 Proxy #}
diff --git a/roles/docker-container/templates/depends_on_dmbs.j2 b/roles/docker-container/templates/depends_on_dmbs.j2
index 326feb21..c45c6f23 100644
--- a/roles/docker-container/templates/depends_on_dmbs.j2
+++ b/roles/docker-container/templates/depends_on_dmbs.j2
@@ -1,18 +1,18 @@
 {# This template needs to be included in docker-compose.yml containers, which depend on a database, redis and optional additional volumes #}
 {% if applications | is_feature_enabled('central_database', application_id)
-      and not (applications[application_id].docker.redis.enabled
+      and not (applications[application_id].docker.services.redis.enabled
                | default(false)
                | bool) %}
     depends_on: []
 {% else %}
     depends_on:
-  {% if not applications | is_feature_enabled('central_database', application_id) %}
+{% if not applications | is_feature_enabled('central_database', application_id) %}
       database:
         condition: service_healthy
-  {% endif %}
-  {% if applications[application_id].docker.redis.enabled | default(false) | bool %}
+{% endif %}
+{% if applications[application_id].docker.services.redis.enabled | default(false) | bool %}
       redis:
         condition: service_healthy
-  {% endif %}
+{% endif %}
 {% endif %}
 {{ "\n" }}