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
@@ -29,6 +29,13 @@
     *)
 
         echo Starting swh-indexer worker
-        exec python -m celery worker --app=swh.scheduler.celery_backend.config.app --pool=prefork --events --concurrency=${CONCURRENCY} --maxtasksperchild=${MAX_TASKS_PER_CHILD} -Ofair --loglevel=${LOGLEVEL} --without-gossip --without-mingle --without-heartbeat -n ${SWH_WORKER_INSTANCE}.${HOSTNAME}
+        exec python -m celery worker \
+			 --app=swh.scheduler.celery_backend.config.app \
+			 --pool=prefork --events \
+			 --concurrency=${CONCURRENCY} \
+			 --maxtasksperchild=${MAX_TASKS_PER_CHILD} \
+			 -Ofair --loglevel=${LOGLEVEL} --without-gossip \
+			 --without-mingle --without-heartbeat \
+			 --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
@@ -66,6 +66,6 @@
                     --maxtasksperchild=${MAX_TASKS_PER_CHILD} \
                     -Ofair --loglevel=${LOGLEVEL} --without-gossip \
                     --without-mingle --without-heartbeat \
-                    --hostname ${SWH_WORKER_INSTANCE}.${HOSTNAME}
+                    --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
@@ -41,6 +41,6 @@
                     --maxtasksperchild=${MAX_TASKS_PER_CHILD} \
                     -Ofair --loglevel=${LOGLEVEL} --without-gossip \
                     --without-mingle --without-heartbeat \
-                    --hostname ${SWH_WORKER_INSTANCE}.${HOSTNAME}
+                    --hostname "${SWH_WORKER_INSTANCE}@%h"
         ;;
 esac