diff --git a/dockerfiles/swh-indexer-worker/entrypoint.sh b/dockerfiles/swh-indexer-worker/entrypoint.sh
--- a/dockerfiles/swh-indexer-worker/entrypoint.sh
+++ b/dockerfiles/swh-indexer-worker/entrypoint.sh
@@ -25,7 +25,8 @@
              --concurrency=${CONCURRENCY} \
              --maxtasksperchild=${MAX_TASKS_PER_CHILD} \
              -Ofair --loglevel=${LOGLEVEL} --without-gossip \
-             --without-mingle --without-heartbeat \
+             --without-mingle \
+			 --heartbeat-interval 10 \
              --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;
 esac
diff --git a/dockerfiles/swh-listers-worker/entrypoint.sh b/dockerfiles/swh-listers-worker/entrypoint.sh
--- a/dockerfiles/swh-listers-worker/entrypoint.sh
+++ b/dockerfiles/swh-listers-worker/entrypoint.sh
@@ -57,7 +57,8 @@
                     --concurrency=${CONCURRENCY} \
                     --maxtasksperchild=${MAX_TASKS_PER_CHILD} \
                     -Ofair --loglevel=${LOGLEVEL} --without-gossip \
-                    --without-mingle --without-heartbeat \
+                    --without-mingle \
+					--heartbeat-interval 10 \
                     --hostname "${SWH_WORKER_INSTANCE}@%h"
         ;;
 esac
diff --git a/dockerfiles/swh-loaders-worker/entrypoint.sh b/dockerfiles/swh-loaders-worker/entrypoint.sh
--- a/dockerfiles/swh-loaders-worker/entrypoint.sh
+++ b/dockerfiles/swh-loaders-worker/entrypoint.sh
@@ -29,7 +29,8 @@
                     --concurrency=${CONCURRENCY} \
                     --maxtasksperchild=${MAX_TASKS_PER_CHILD} \
                     -Ofair --loglevel=${LOGLEVEL} --without-gossip \
-                    --without-mingle --without-heartbeat \
+                    --without-mingle \
+					--heartbeat-interval 10 \
                     --hostname "${SWH_WORKER_INSTANCE}@%h"
         ;;
 esac