diff --git a/dockerfiles/swh-indexer-storage/entrypoint.sh b/dockerfiles/swh-indexer-storage/entrypoint.sh
--- a/dockerfiles/swh-indexer-storage/entrypoint.sh
+++ b/dockerfiles/swh-indexer-storage/entrypoint.sh
@@ -19,7 +19,7 @@
 user=${PGUSER}
 EOF
 
-chmod 0400 ~/.pgpass
+chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
diff --git a/dockerfiles/swh-listers-worker/entrypoint.sh b/dockerfiles/swh-listers-worker/entrypoint.sh
--- a/dockerfiles/swh-listers-worker/entrypoint.sh
+++ b/dockerfiles/swh-listers-worker/entrypoint.sh
@@ -24,7 +24,7 @@
 user=${PGUSER}
 EOF
 
-chmod 0400 ~/.pgpass
+chmod 0600 ~/.pgpass
 
 mkdir -p ~/.config/swh/worker
 
@@ -36,7 +36,7 @@
 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
diff --git a/dockerfiles/swh-scheduler-api/entrypoint.sh b/dockerfiles/swh-scheduler-api/entrypoint.sh
--- a/dockerfiles/swh-scheduler-api/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-api/entrypoint.sh
@@ -19,7 +19,7 @@
 user=${PGUSER}
 EOF
 
-chmod 0400 ~/.pgpass
+chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
diff --git a/dockerfiles/swh-scheduler-worker/entrypoint.sh b/dockerfiles/swh-scheduler-worker/entrypoint.sh
--- a/dockerfiles/swh-scheduler-worker/entrypoint.sh
+++ b/dockerfiles/swh-scheduler-worker/entrypoint.sh
@@ -19,7 +19,7 @@
 user=${PGUSER}
 EOF
 
-chmod 0400 ~/.pgpass
+chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")
diff --git a/dockerfiles/swh-storage/entrypoint.sh b/dockerfiles/swh-storage/entrypoint.sh
--- a/dockerfiles/swh-storage/entrypoint.sh
+++ b/dockerfiles/swh-storage/entrypoint.sh
@@ -19,7 +19,7 @@
 user=${PGUSER}
 EOF
 
-chmod 0400 ~/.pgpass
+chmod 0600 ~/.pgpass
 
 case "$1" in
     "shell")