diff --git a/dockerfiles/swh-indexer-worker/entrypoint.sh b/dockerfiles/swh-indexer-worker/entrypoint.sh
index ec4592c..86448ff 100755
--- a/dockerfiles/swh-indexer-worker/entrypoint.sh
+++ b/dockerfiles/swh-indexer-worker/entrypoint.sh
@@ -1,34 +1,41 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         echo "WARNING: $srcrepo will NOT be pip installed in dev mode"
         echo "         due to permission limitations."
         pip install --user .
         popd
     done
 fi
 
 mkdir -p ~/.config/swh/worker
 
 cat > ~/.config/swh/worker/${SWH_WORKER_INSTANCE}.ini <<EOF
 [main]
 task_broker = amqp://guest@amqp//
 task_modules = swh.indexer.tasks
 task_queues = swh_indexer_${SWH_WORKER_INSTANCE}
 task_soft_time_limit = 0
 EOF
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
 
         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
index 5a8e732..b1236c9 100755
--- a/dockerfiles/swh-listers-worker/entrypoint.sh
+++ b/dockerfiles/swh-listers-worker/entrypoint.sh
@@ -1,71 +1,71 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         echo "WARNING: $srcrepo wil NOT be pip installed in dev mode"
         echo "         due to permission limitations."
         pip install --user .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 export POSTGRES_DB=swh-lister-${SWH_WORKER_INSTANCE}
 
 echo "${PGHOST}:5432:postgres:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" >> ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 mkdir -p ~/.config/swh/worker
 
 cat > ~/.config/swh/worker/${SWH_WORKER_INSTANCE}.ini <<EOF
 [main]
 task_broker = amqp://guest@amqp//
 task_modules = swh.lister.${SWH_WORKER_INSTANCE}.tasks
 task_soft_time_limit = 0
 EOF
 
 ln -fs ~/.config/swh/lister.yml ~/.config/swh/lister-${SWH_WORKER_INSTANCE}.yml
 
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
         echo Setup ${POSTGRES_DB} database for ${SWH_WORKER_INSTANCE}
 
         if psql -lqt | cut -d \| -f 1 | grep -qw ${POSTGRES_DB}; then
             echo Database already exists, nothing to do
         else
             echo Creating database
             createdb ${POSTGRES_DB}
             echo Initialize database
             python -m swh.lister.cli --create-tables --with-data \
                    --db-url postgres://${PGUSER}@${PGHOST}/${POSTGRES_DB} \
                    --lister ${SWH_WORKER_INSTANCE}
         fi
         echo Starting the swh-lister Celery worker for ${SWH_WORKER_INSTANCE}
         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}.${HOSTNAME}
+                    --hostname "${SWH_WORKER_INSTANCE}@%h"
         ;;
 esac
diff --git a/dockerfiles/swh-loaders-worker/entrypoint.sh b/dockerfiles/swh-loaders-worker/entrypoint.sh
index da6d5d2..2454fca 100755
--- a/dockerfiles/swh-loaders-worker/entrypoint.sh
+++ b/dockerfiles/swh-loaders-worker/entrypoint.sh
@@ -1,46 +1,46 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         echo "WARNING: $srcrepo will NOT be pip installed in dev mode"
         echo "         due to permission limitations."
         pip install --user .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 mkdir -p ~/.config/swh/worker
 
 cat > ~/.config/swh/worker/${SWH_WORKER_INSTANCE}.ini <<EOF
 [main]
 task_broker = amqp://guest@amqp//
 task_modules = swh.loader.${SWH_WORKER_INSTANCE}.tasks
 task_soft_time_limit = 0
 EOF
 
 mkdir -p ~/.config/swh/loader
 ln -fs ~/.config/swh/loader.yml ~/.config/swh/loader/${SWH_WORKER_INSTANCE}.yml
 
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
         echo Starting the swh-loader Celery worker for ${SWH_WORKER_INSTANCE}
         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}.${HOSTNAME}
+                    --hostname "${SWH_WORKER_INSTANCE}@%h"
         ;;
 esac