diff --git a/roles/docker-taiga/templates/docker-compose.yml.j2 b/roles/docker-taiga/templates/docker-compose.yml.j2
index 2edba8a1..b4d0b84c 100644
--- a/roles/docker-taiga/templates/docker-compose.yml.j2
+++ b/roles/docker-taiga/templates/docker-compose.yml.j2
@@ -38,6 +38,9 @@ x-volumes:
 services:
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}
   taiga-back:
+    restart: {{docker_restart_policy}}
+    logging:
+      driver: journald
     image: taigaio/taiga-back:latest
     environment: *default-back-environment
     volumes: *default-back-volumes
@@ -46,12 +49,15 @@ services:
       taiga:
 
 {% include 'templates/docker/container/depends-on-also-database.yml.j2' %}
-      events-rabbitmq:
+      taiga-events-rabbitmq:
         condition: service_started
       taiga-async-rabbitmq:
         condition: service_started
 
   taiga-async:
+    restart: {{docker_restart_policy}}
+    logging:
+      driver: journald
     image: taigaio/taiga-back:latest
     entrypoint: ["/taiga-back/docker/async_entrypoint.sh"]
     environment: *default-back-environment
@@ -61,7 +67,7 @@ services:
       taiga:
 
 {% include 'templates/docker/container/depends-on-also-database.yml.j2' %}
-      events-rabbitmq:
+      taiga-events-rabbitmq:
         condition: service_started
       taiga-async-rabbitmq:
         condition: service_started
@@ -76,6 +82,9 @@ services:
     hostname: "taiga-async-rabbitmq"
     volumes:
       - async-rabbitmq-data:/var/lib/rabbitmq
+    restart: {{docker_restart_policy}}
+    logging:
+      driver: journald
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -87,6 +96,9 @@ services:
       TAIGA_WEBSOCKETS_URL: "${WEBSOCKETS_SCHEME}://${TAIGA_DOMAIN}"
       TAIGA_SUBPATH: "${SUBPATH}"
       # ...your customizations go here
+    restart: {{docker_restart_policy}}
+    logging:
+      driver: journald
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -99,14 +111,17 @@ services:
       RABBITMQ_USER: "${RABBITMQ_USER}"
       RABBITMQ_PASS: "${RABBITMQ_PASS}"
       TAIGA_SECRET_KEY: "${SECRET_KEY}"
+    restart: {{docker_restart_policy}}
+    logging:
+      driver: journald
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
     depends_on:
-      events-rabbitmq:
+      taiga-events-rabbitmq:
         condition: service_started
 
-  events-rabbitmq:
+  taiga-events-rabbitmq:
     image: rabbitmq:3.8-management-alpine
     environment:
       RABBITMQ_ERLANG_COOKIE: "${RABBITMQ_ERLANG_COOKIE}"
@@ -116,6 +131,9 @@ services:
     hostname: "events-rabbitmq"
     volumes:
       - events-rabbitmq-data:/var/lib/rabbitmq
+    restart: {{docker_restart_policy}}
+    logging:
+      driver: journald
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -125,6 +143,9 @@ services:
     environment:
       MAX_AGE: "${ATTACHMENTS_MAX_AGE}"
       SECRET_KEY: "${SECRET_KEY}"
+    restart: {{docker_restart_policy}}
+    logging:
+      driver: journald
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -137,6 +158,9 @@ services:
       - ./taiga-gateway/taiga.conf:/etc/nginx/conf.d/default.conf
       - static-data:/taiga/static
       - media-data:/taiga/media
+    restart: {{docker_restart_policy}}
+    logging:
+      driver: journald
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga: