diff --git a/dockerfiles/swh-indexer-worker/entrypoint.sh b/dockerfiles/swh-indexer-worker/entrypoint.sh
index 1f2b1ce..a5940a3 100755
--- a/dockerfiles/swh-indexer-worker/entrypoint.sh
+++ b/dockerfiles/swh-indexer-worker/entrypoint.sh
@@ -1,41 +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 \
-             --hostname "${SWH_WORKER_INSTANCE}.%h"
+             --hostname "${SWH_WORKER_INSTANCE}@%h"
     ;;
 esac