diff --git a/docker-compose/archiver.yml b/docker-compose/archiver.yml
index 41d5df160e011ca1aad79828bf2fd3c941958620..8006ece3b86f0013a5eedc1e066dc4c2f07b73af 100644
--- a/docker-compose/archiver.yml
+++ b/docker-compose/archiver.yml
@@ -15,7 +15,7 @@ services:
       - MYSQL_USER=tango
       - MYSQL_PASSWORD=tango
       - TANGO_HOST=${TANGO_HOST}
-    restart: on-failure
+    restart: unless-stopped
 
   hdbpp-es:
       image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:2021-05-28
@@ -34,6 +34,7 @@ services:
           wait-for-it.sh archiver-maria-db:3306 --timeout=30 --strict --
           wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
                hdbppes-srv 01"
+      restart: unless-stopped
 
   hdbpp-cm:
       image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:${TANGO_ARCHIVER_VERSION}
diff --git a/docker-compose/elk.yml b/docker-compose/elk.yml
index cce66839b499caa0b8948eaeb0c5cc65176be2c9..bf6e22e3de6ea82571acba0ac8e7c69f3eeb2941 100644
--- a/docker-compose/elk.yml
+++ b/docker-compose/elk.yml
@@ -38,3 +38,4 @@ services:
       - "5959:5959" # logstash tcp json input
     depends_on:
       - elk-configure-host
+    restart: unless-stopped
diff --git a/docker-compose/itango.yml b/docker-compose/itango.yml
index 941974e8770823c6a680de9ffcf95f301163663d..34161eb43f752716f28d44170898d94c4b6d76cd 100644
--- a/docker-compose/itango.yml
+++ b/docker-compose/itango.yml
@@ -37,4 +37,4 @@ services:
       - --strict
       - --
       - /venv/bin/itango3
-    restart: on-failure
+    restart: unless-stopped
diff --git a/docker-compose/jupyter.yml b/docker-compose/jupyter.yml
index 36cc0acbcd32631a9cf8e6bb1f10ecfb77362cf0..989601cf8d858f493ba47ed607a9e4cd5a6d2770 100644
--- a/docker-compose/jupyter.yml
+++ b/docker-compose/jupyter.yml
@@ -38,4 +38,4 @@ services:
       - --strict
       - --
       - /usr/bin/tini -- /usr/local/bin/jupyter-notebook --port=8888 --no-browser --ip=0.0.0.0 --allow-root --NotebookApp.token= --NotebookApp.password=
-    restart: on-failure
+    restart: unless-stopped
diff --git a/docker-compose/tango.yml b/docker-compose/tango.yml
index b3a860d7b55ea71c5e2bc23895b7b57040e3f216..9fa0f5cde06f91b7cdc078f5c6481b013442e5ae 100644
--- a/docker-compose/tango.yml
+++ b/docker-compose/tango.yml
@@ -28,7 +28,7 @@ services:
       - tangodb:/var/lib/mysql
     ports:
       - "3306:3306"
-    restart: on-failure
+    restart: unless-stopped
 
   databaseds:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-cpp:${TANGO_CPP_VERSION}
@@ -55,4 +55,4 @@ services:
       - "2"
       - -ORBendPoint
       - giop:tcp::10000
-    restart: on-failure
+    restart: unless-stopped