diff --git a/roles/docker-container/templates/build.yml.j2 b/roles/docker-container/templates/build.yml.j2
index 9ca01adc..50f70ab8 100644
--- a/roles/docker-container/templates/build.yml.j2
+++ b/roles/docker-container/templates/build.yml.j2
@@ -1,6 +1,6 @@
 {# integrate it into service sections to be build by Dockerfile #}
-    pull_policy: never
-    build:
-      context: .
-      dockerfile: Dockerfile
+pull_policy: never
+build:
+  context: .
+  dockerfile: Dockerfile
 {# pass Arguments here #}
\ No newline at end of file
diff --git a/roles/svc-db-postgres/templates/docker-compose.yml.j2 b/roles/svc-db-postgres/templates/docker-compose.yml.j2
index 80e23d90..38549a45 100644
--- a/roles/svc-db-postgres/templates/docker-compose.yml.j2
+++ b/roles/svc-db-postgres/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@
   postgres:
     container_name:   "{{ POSTGRES_CONTAINER }}"
     image:            "{{ POSTGRES_CUSTOM_IMAGE_NAME }}"
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
     command:
       - "postgres"
       - "-c"
diff --git a/roles/web-app-bookwyrm/templates/docker-compose.yml.j2 b/roles/web-app-bookwyrm/templates/docker-compose.yml.j2
index 6904d75a..99888b8b 100644
--- a/roles/web-app-bookwyrm/templates/docker-compose.yml.j2
+++ b/roles/web-app-bookwyrm/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@
         (python manage.py initdb || true) &&
         python -m gunicorn bookwyrm.wsgi:application --bind 0.0.0.0:{{ container_port }}
       '
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
     image: "{{ BOOKWYRM_CUSTOM_IMAGE }}"
     container_name: "{{ BOOKWYRM_CONTAINER }}"
     hostname: "{{ BOOKWYRM_HOSTNAME }}"
diff --git a/roles/web-app-bridgy-fed/templates/docker-compose.yml.j2 b/roles/web-app-bridgy-fed/templates/docker-compose.yml.j2
index 84999e13..070fde2a 100644
--- a/roles/web-app-bridgy-fed/templates/docker-compose.yml.j2
+++ b/roles/web-app-bridgy-fed/templates/docker-compose.yml.j2
@@ -1,7 +1,7 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
 
   application:
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
       args:
         BRIDGY_REPO_URL: "{{ BRIDGY_REPO_URL }}"
         BRIDGY_REPO_BRANCH: "{{ BRIDGY_REPO_BRANCH }}"
diff --git a/roles/web-app-chess/templates/docker-compose.yml.j2 b/roles/web-app-chess/templates/docker-compose.yml.j2
index 576e0e0b..64610717 100644
--- a/roles/web-app-chess/templates/docker-compose.yml.j2
+++ b/roles/web-app-chess/templates/docker-compose.yml.j2
@@ -1,6 +1,6 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   application:
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
       args:
         CHESS_VERSION: "{{ CHESS_VERSION }}"
         CHESS_REPO_URL: "{{ CHESS_REPO_URL }}"
diff --git a/roles/web-app-confluence/templates/docker-compose.yml.j2 b/roles/web-app-confluence/templates/docker-compose.yml.j2
index 96700ae6..66b22dca 100644
--- a/roles/web-app-confluence/templates/docker-compose.yml.j2
+++ b/roles/web-app-confluence/templates/docker-compose.yml.j2
@@ -1,6 +1,6 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   application:
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
     image: "{{ CONFLUENCE_CUSTOM_IMAGE }}"
     container_name: "{{ CONFLUENCE_CONTAINER }}"
     hostname: '{{ CONFLUENCE_HOSTNAME}}'
diff --git a/roles/web-app-jira/templates/docker-compose.yml.j2 b/roles/web-app-jira/templates/docker-compose.yml.j2
index 353c2c31..f7098b56 100644
--- a/roles/web-app-jira/templates/docker-compose.yml.j2
+++ b/roles/web-app-jira/templates/docker-compose.yml.j2
@@ -1,7 +1,7 @@
 
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   application:
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
     image: "{{ JIRA_CUSTOM_IMAGE }}"
     container_name: "{{ JIRA_CONTAINER }}"
     hostname: '{{ JIRA_HOSTNAME }}'
diff --git a/roles/web-app-moodle/templates/docker-compose.yml.j2 b/roles/web-app-moodle/templates/docker-compose.yml.j2
index 756e7ba9..69a42848 100644
--- a/roles/web-app-moodle/templates/docker-compose.yml.j2
+++ b/roles/web-app-moodle/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@
   moodle:
 {% set container_port = 8080 %}
     container_name: {{ moodle_container }}
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
     image: moodle_custom
     ports:
       - 127.0.0.1:{{ ports.localhost.http[application_id] }}:{{ container_port }}
diff --git a/roles/web-app-openproject/templates/docker-compose.yml.j2 b/roles/web-app-openproject/templates/docker-compose.yml.j2
index ea132de6..be986df2 100644
--- a/roles/web-app-openproject/templates/docker-compose.yml.j2
+++ b/roles/web-app-openproject/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ x-op-app: &app
   logging:
     driver: journald
   image: {{ openproject_custom_image }}
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+  {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(2) }}
 
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
 
diff --git a/roles/web-app-pretix/templates/docker-compose.yml.j2 b/roles/web-app-pretix/templates/docker-compose.yml.j2
index 65e2ae14..d6b57c22 100644
--- a/roles/web-app-pretix/templates/docker-compose.yml.j2
+++ b/roles/web-app-pretix/templates/docker-compose.yml.j2
@@ -1,6 +1,6 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   application:
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
     image: "{{ PRETIX_IMAGE_CUSTOM }}"
     container_name: "{{ PRETIX_CONTAINER }}"
     hostname: '{{ PRETIX_HOSTNAME}}'
diff --git a/roles/web-app-roulette-wheel/templates/docker-compose.yml.j2 b/roles/web-app-roulette-wheel/templates/docker-compose.yml.j2
index 86bf14fb..7a7ef0d0 100644
--- a/roles/web-app-roulette-wheel/templates/docker-compose.yml.j2
+++ b/roles/web-app-roulette-wheel/templates/docker-compose.yml.j2
@@ -1,9 +1,9 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
-    application:
-        container_name: roulette_application
-{% include 'roles/docker-container/templates/build.yml.j2' %}
-        ports:
-        - 127.0.0.1:{{ ports.localhost.http[application_id] }}:8080
-        restart: {{ DOCKER_RESTART_POLICY }}
+  application:
+    container_name: roulette_application
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
+    ports:
+      - 127.0.0.1:{{ ports.localhost.http[application_id] }}:8080
+    restart: {{ DOCKER_RESTART_POLICY }}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/web-app-wordpress/templates/docker-compose.yml.j2 b/roles/web-app-wordpress/templates/docker-compose.yml.j2
index 47b46586..0f2edc98 100644
--- a/roles/web-app-wordpress/templates/docker-compose.yml.j2
+++ b/roles/web-app-wordpress/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@
     {% include 'roles/docker-container/templates/base.yml.j2' %}
     image: {{ WORDPRESS_CUSTOM_IMAGE }}
     container_name: {{ WORDPRESS_CONTAINER }}
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
     ports:
       - "127.0.0.1:{{ ports.localhost.http[application_id] }}:80"
     volumes:
diff --git a/roles/web-app-xwiki/templates/docker-compose.yml.j2 b/roles/web-app-xwiki/templates/docker-compose.yml.j2
index 9c688c70..6cd5704d 100644
--- a/roles/web-app-xwiki/templates/docker-compose.yml.j2
+++ b/roles/web-app-xwiki/templates/docker-compose.yml.j2
@@ -1,6 +1,6 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   application:
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
     image: "{{ XWIKI_IMAGE_CUSTOM }}"
     container_name: "{{ XWIKI_CONTAINER }}"
     hostname: '{{ XWIKI_HOSTNAME}}'
diff --git a/roles/web-svc-simpleicons/templates/docker-compose.yml.j2 b/roles/web-svc-simpleicons/templates/docker-compose.yml.j2
index 8ed65b5f..683c8bea 100644
--- a/roles/web-svc-simpleicons/templates/docker-compose.yml.j2
+++ b/roles/web-svc-simpleicons/templates/docker-compose.yml.j2
@@ -1,6 +1,6 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
   application:
-{% include 'roles/docker-container/templates/build.yml.j2' %}
+    {{ lookup('template', 'roles/docker-container/templates/build.yml.j2') | indent(4) }}
     image: simpleicons-server:latest
     container_name: simpleicons-server
     ports: