diff --git a/dockerfiles/swh-scheduler-worker/Dockerfile b/dockerfiles/swh-scheduler-worker/Dockerfile
index 500b8c6..8d3fc60 100644
--- a/dockerfiles/swh-scheduler-worker/Dockerfile
+++ b/dockerfiles/swh-scheduler-worker/Dockerfile
@@ -1,15 +1,18 @@
 FROM python:3
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     libsystemd-dev postgresql-client libpq-dev
 
 RUN pip install swh-scheduler --no-binary psycopg2
-RUN mkdir /etc/softwareheritage/
+RUN mkdir -p /etc/softwareheritage/worker/
 COPY scheduler.yml /etc/softwareheritage/
+# XXX this should NOT be needed.
+# Some cleanup work in config files handling seems necessary...
+RUN ln -s /etc/softwareheritage/scheduler.yml /etc/softwareheritage/worker/
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 5008
diff --git a/dockerfiles/swh-scheduler-worker/scheduler.yml b/dockerfiles/swh-scheduler-worker/scheduler.yml
index dedcbab..415a523 100644
--- a/dockerfiles/swh-scheduler-worker/scheduler.yml
+++ b/dockerfiles/swh-scheduler-worker/scheduler.yml
@@ -1,2 +1,2 @@
-task_broker: amqp://guest@amqp//
+task_broker: amqp://guest:guest@amqp//
 scheduling_db: service=swh-scheduler
diff --git a/scheduler.env b/scheduler.env
index 8445cfa..ea489c8 100644
--- a/scheduler.env
+++ b/scheduler.env
@@ -1,4 +1,5 @@
 POSTGRES_PASSWORD=testpassword
 POSTGRES_DB=swh-scheduler
 PGHOST=swh-scheduler-db
 PGUSER=postgres
+SWH_WORKER_INSTANCE=scheduler