diff --git a/dockerfiles/swh-scheduler-api/entrypoint.sh b/dockerfiles/swh-scheduler-api/entrypoint.sh
index b3e349a..34a5d3f 100755
--- a/dockerfiles/swh-scheduler-api/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-api/entrypoint.sh
@@ -1,44 +1,44 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         pip install -e .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-scheduler]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     "swh-scheduler")
         exec $@
         ;;
     *)
         echo Waiting for postgresql to start
         until psql postgresql:///?service=swh-scheduler -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
 
         echo Setup the swh-scheduler API database
         PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init scheduler \
                   --db-name ${POSTGRES_DB}
 
         echo Starting the swh-scheduler API server
-        exec swh-scheduler --log-level ${LOGLEVEL} api-server /scheduler.yml
+        exec swh-scheduler --log-level ${LOGLEVEL} -C /scheduler.yml api-server
 esac
diff --git a/dockerfiles/swh-scheduler-worker/Dockerfile b/dockerfiles/swh-scheduler-worker/Dockerfile
index 0fd3e90..fe50b9a 100644
--- a/dockerfiles/swh-scheduler-worker/Dockerfile
+++ b/dockerfiles/swh-scheduler-worker/Dockerfile
@@ -1,17 +1,14 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
   apt-get install -y \
     libsystemd-dev postgresql-client libpq-dev
 
 RUN pip install --upgrade pip setuptools wheel
 RUN pip install swh-scheduler --no-binary psycopg2
-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 scheduler.yml /
 COPY entrypoint.sh /
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-scheduler-worker/entrypoint.sh b/dockerfiles/swh-scheduler-worker/entrypoint.sh
index ccb7a24..fca3001 100755
--- a/dockerfiles/swh-scheduler-worker/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-worker/entrypoint.sh
@@ -1,35 +1,35 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         pip install -e .
         popd
     done
 fi
 
 echo Installed Python packages:
 pip list
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-scheduler]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
 chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
 		echo Starting the swh-scheduler $1
-		exec swh-scheduler --log-level ${LOGLEVEL} $@
+		exec swh-scheduler --log-level ${LOGLEVEL} -C /scheduler.yml $@
         ;;
 esac