diff --git a/base-services.yml b/base-services.yml
--- a/base-services.yml
+++ b/base-services.yml
@@ -22,7 +22,7 @@
     volumes:
       - "storage-db:/var/lib/postgresql/data:rw,Z"
     secrets:
-      - source: postgres-storage-password
+      - source: swh-mirror-db-postgres-password
         target: postgres-password
         uid: '999'
         mode: 0400
@@ -42,7 +42,7 @@
     volumes:
       - "web-db:/var/lib/postgresql/data:rw,Z"
     secrets:
-      - source: postgres-web-password
+      - source: swh-mirror-web-postgres-password
         target: postgres-password
         uid: '999'
         mode: 0400
@@ -62,7 +62,7 @@
       - db-web
       - memcache
     secrets:
-      - source: postgres-web-password
+      - source: swh-mirror-web-postgres-password
         target: postgres-password
         mode: 0400
 
@@ -112,7 +112,7 @@
     depends_on:
       - db-storage
     secrets:
-      - source: postgres-storage-password
+      - source: swh-mirror-db-postgres-password
         target: postgres-password
         mode: 0400
 
@@ -164,9 +164,9 @@
   web-db:
 
 secrets:
-  postgres-storage-password:
+  swh-mirror-db-postgres-password:
     external: true
-  postgres-web-password:
+  swh-mirror-web-postgres-password:
     external: true
 
 configs: