diff --git a/.gitignore b/.gitignore
new file mode 100644
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/conf/graph-replayer.yml
+/conf/content-replayer.yml
diff --git a/base-services.yml b/base-services.yml
--- a/base-services.yml
+++ b/base-services.yml
@@ -12,7 +12,7 @@
       mode: global
       placement:
         constraints:
-          - node.role == manager
+          - node.labels.org.softwareheritage.mirror.volumes.storage-db == true
     command: ['-c', 'shared_buffers=4GB', '-c', 'effective_cache_size=4GB', '-c', 'random_page_cost=1.5', '-c', 'max_wal_size=4GB']
     environment:
       POSTGRES_PASSWORD_FILE: /run/secrets/postgres-password
@@ -33,7 +33,7 @@
       mode: global
       placement:
         constraints:
-          - node.role == manager
+          - node.labels.org.softwareheritage.mirror.volumes.web-db == true
     command: ['-c', 'shared_buffers=4GB', '-c', 'effective_cache_size=4GB', '-c', 'random_page_cost=1.5', '-c', 'max_wal_size=4GB']
     environment:
       POSTGRES_PASSWORD_FILE: /run/secrets/postgres-password
@@ -69,17 +69,17 @@
   objstorage:
     image: softwareheritage/base:${SWH_IMAGE_TAG:-latest}
     deploy:
-      # needed to allow actual and dynammic load balancing
+      # needed to allow actual and dynamic load balancing
       endpoint_mode: dnsrr
       # a real life replicas value better be in the 16 to 64 range
       replicas: 2
       placement:
-        # note: if using a local volume, you need to stick objstorage instances
-        # on the node hosting the volume, eg. the manager, otherwise, if using
-        # a remote/distrubuted objstorage backend (seaweedfs, cloud, etc.) you
-        # want to remove this placement constraint
+        # note: if using a local volume, you need to pin the objstorage
+        # instances on the node hosting the volume, eg. the manager, otherwise,
+        # if using a remote/distributed objstorage backend (seaweedfs, cloud,
+        # etc.) you want to remove this placement constraint
         constraints:
-          - node.role == manager
+          - node.labels.org.softwareheritage.mirror.volumes.objstorage == true
     volumes:
       - "objstorage:/srv/softwareheritage/objects:rw,Z"
     configs:
@@ -105,6 +105,7 @@
       PGHOST: db-storage
       PGUSER: swh
       POSTGRES_DB: swh-storage
+      FLAVOR: mirror
       PORT: "5002"
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
diff --git a/graph-replayer-override.yml b/graph-replayer-override.yml
--- a/graph-replayer-override.yml
+++ b/graph-replayer-override.yml
@@ -2,9 +2,6 @@
 version: '3.7'
 
 services:
-  storage:
-    environment:
-      FLAVOR: mirror
   graph-replayer:
     image: softwareheritage/replayer:${SWH_IMAGE_TAG:-latest}
     environment: