diff --git a/dockerfiles/swh-indexer-storage/entrypoint.sh b/dockerfiles/swh-indexer-storage/entrypoint.sh
index b2eef7b..7ed6900 100755
--- a/dockerfiles/swh-indexer-storage/entrypoint.sh
+++ b/dockerfiles/swh-indexer-storage/entrypoint.sh
@@ -1,40 +1,40 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         pip install -e .
         popd
     done
 fi
 
 echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
 cat > ~/.pg_service.conf <<EOF
 [swh-indexer]
 dbname=${POSTGRES_DB}
 host=${PGHOST}
 port=5432
 user=${PGUSER}
 EOF
 
-chmod 0400 ~/.pgpass
+chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
 
     echo Waiting for postgresql to start
     until psql service=swh-indexer -c "select 1" 2>&1 > /dev/null; do sleep 0.1; done
 
     echo Setup the database
     PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init indexer \
           --db-name ${POSTGRES_DB}
 
     echo Starting the swh-indexer-storage API server
         exec python -m swh.indexer.storage.api.server /indexer_storage.yml
     ;;
 esac
diff --git a/dockerfiles/swh-listers-worker/entrypoint.sh b/dockerfiles/swh-listers-worker/entrypoint.sh
index a1671d6..28ce99a 100755
--- a/dockerfiles/swh-listers-worker/entrypoint.sh
+++ b/dockerfiles/swh-listers-worker/entrypoint.sh
@@ -1,69 +1,69 @@
 #!/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
 
 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 0400 ~/.pgpass
+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_queues = swh_lister_${SWH_WORKER_INSTANCE}
 task_soft_time_limit = 0
 EOF
 
-ln -s ~/.config/swh/lister.yml ~/.config/swh/lister-${SWH_WORKER_INSTANCE}.yml
+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}
         ;;
 esac
diff --git a/dockerfiles/swh-scheduler-api/entrypoint.sh b/dockerfiles/swh-scheduler-api/entrypoint.sh
index 0c050b7..1fc7391 100755
--- a/dockerfiles/swh-scheduler-api/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-api/entrypoint.sh
@@ -1,41 +1,41 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         pip install -e .
         popd
     done
 fi
 
 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 0400 ~/.pgpass
+chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     "swh-scheduler")
         exec $@
         ;;
     *)
         echo Waiting for postgresql to start
         until psql 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 python -m swh.scheduler.api.server /scheduler.yml
 esac
diff --git a/dockerfiles/swh-scheduler-worker/entrypoint.sh b/dockerfiles/swh-scheduler-worker/entrypoint.sh
index 6972bdc..bdcfdca 100755
--- a/dockerfiles/swh-scheduler-worker/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-worker/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 "${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 0400 ~/.pgpass
+chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     "listener")
         echo Starting the swh-scheduler listener
         exec python -m swh.scheduler.celery_backend.listener
         ;;
     "runner")
         echo Starting the swh-scheduler runner
         exec sh -c 'while true; do
             echo running pending tasks at `/bin/date`;
             python -m swh.scheduler.celery_backend.runner;
             sleep 10;
           done'  # beuark
         ;;
     *)
         echo "Provide a command (shell|listener|runner)"
         exit 1
         ;;
 esac
diff --git a/dockerfiles/swh-storage/entrypoint.sh b/dockerfiles/swh-storage/entrypoint.sh
index 697c52c..df60f70 100755
--- a/dockerfiles/swh-storage/entrypoint.sh
+++ b/dockerfiles/swh-storage/entrypoint.sh
@@ -1,40 +1,40 @@
 #!/bin/bash
 
 set -e
 
 if [[ -d /src ]] ; then
     for srcrepo in /src/swh-* ; do
         pushd $srcrepo
         pip install -e .
         popd
     done
 fi
 
 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 0400 ~/.pgpass
+chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
         exec bash -i
         ;;
     *)
 
 	echo Waiting for postgresql to start
 	until psql service=swh -c "select 1" > /dev/null 2> /dev/null; do sleep 0.1; done
 
 	echo Setup the database
 	PGPASSWORD=${POSTGRES_PASSWORD} swh-db-init storage \
 		  --db-name ${POSTGRES_DB}
 
 	echo Starting the swh-storage API server
         exec python -m swh.storage.api.server /storage.yml
     ;;
 esac