diff --git a/docker/conf/deposit.yml b/docker/conf/deposit.yml
--- a/docker/conf/deposit.yml
+++ b/docker/conf/deposit.yml
@@ -1,7 +1,7 @@
 scheduler:
   cls: remote
   args:
-    url: http://swh-scheduler-api:5008
+    url: http://swh-scheduler:5008
 
 allowed_hosts:
   - swh-deposit
diff --git a/docker/conf/indexer.yml b/docker/conf/indexer.yml
--- a/docker/conf/indexer.yml
+++ b/docker/conf/indexer.yml
@@ -13,7 +13,7 @@
 scheduler:
   cls: remote
   args:
-    url: http://swh-scheduler-api:5008/
+    url: http://swh-scheduler:5008/
 celery:
   task_broker: amqp://guest:guest@amqp//
   task_modules:
diff --git a/docker/conf/indexer_journal_client.yml b/docker/conf/indexer_journal_client.yml
--- a/docker/conf/indexer_journal_client.yml
+++ b/docker/conf/indexer_journal_client.yml
@@ -8,4 +8,4 @@
 scheduler:
   cls: remote
   args:
-    url: http://swh-scheduler-api:5008/
+    url: http://swh-scheduler:5008/
diff --git a/docker/conf/lister.yml b/docker/conf/lister.yml
--- a/docker/conf/lister.yml
+++ b/docker/conf/lister.yml
@@ -6,7 +6,7 @@
 scheduler:
   cls: remote
   args:
-    url: http://swh-scheduler-api:5008/
+    url: http://swh-scheduler:5008/
 
 lister:
   cls: local
diff --git a/docker/conf/loader.yml b/docker/conf/loader.yml
--- a/docker/conf/loader.yml
+++ b/docker/conf/loader.yml
@@ -17,7 +17,7 @@
 scheduler:
   cls: remote
   args:
-    url: http://swh-scheduler-api:5008/
+    url: http://swh-scheduler:5008/
 
 celery:
   task_broker: amqp://guest:guest@amqp//
diff --git a/docker/conf/nginx.conf b/docker/conf/nginx.conf
--- a/docker/conf/nginx.conf
+++ b/docker/conf/nginx.conf
@@ -56,7 +56,7 @@
       proxy_pass $upstream$uri;
     }
     location /scheduler {
-      set $upstream "http://swh-scheduler-api:5008";
+      set $upstream "http://swh-scheduler:5008";
 
       rewrite ^/scheduler/(.*)$ /$1 break;
       proxy_pass $upstream;
diff --git a/docker/conf/vault-api.yml b/docker/conf/vault.yml
rename from docker/conf/vault-api.yml
rename to docker/conf/vault.yml
--- a/docker/conf/vault-api.yml
+++ b/docker/conf/vault.yml
@@ -5,7 +5,7 @@
 scheduler:
   cls: remote
   args:
-    url: http://swh-scheduler-api:5008/
+    url: http://swh-scheduler:5008/
 vault:
   cls: local
   args:
diff --git a/docker/conf/web-replica.yml b/docker/conf/web-replica.yml
--- a/docker/conf/web-replica.yml
+++ b/docker/conf/web-replica.yml
@@ -17,12 +17,12 @@
 scheduler:
   cls: remote
   args:
-    url: http://swh-scheduler-api:5008/
+    url: http://swh-scheduler:5008/
 
 vault:
   cls: remote
   args:
-    url: http://swh-vault-api:5005/
+    url: http://swh-vault:5005/
 
 deposit:
   private_api_url: https://swh-deposit:5006/1/private/
diff --git a/docker/conf/web.yml b/docker/conf/web.yml
--- a/docker/conf/web.yml
+++ b/docker/conf/web.yml
@@ -17,12 +17,12 @@
 scheduler:
   cls: remote
   args:
-    url: http://swh-scheduler-api:5008/
+    url: http://swh-scheduler:5008/
 
 vault:
   cls: remote
   args:
-    url: http://swh-vault-api:5005/
+    url: http://swh-vault:5005/
 
 deposit:
   private_api_url: https://swh-deposit:5006/1/private/
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -84,7 +84,7 @@
       # unset PGHOST as db service crashes otherwise
       PGHOST:
 
-  swh-scheduler-api:
+  swh-scheduler:
     image: swh/stack
     build: ./
     env_file:
@@ -100,7 +100,7 @@
       - 5008:5008
     volumes:
       - "./conf/scheduler.yml:/scheduler.yml:ro"
-      - "./services/swh-scheduler-api/entrypoint.sh:/entrypoint.sh:ro"
+      - "./services/swh-scheduler/entrypoint.sh:/entrypoint.sh:ro"
 
   swh-scheduler-listener:
     image: swh/stack
@@ -114,7 +114,7 @@
     entrypoint: /entrypoint.sh
     command: start-listener
     depends_on:
-      - swh-scheduler-api
+      - swh-scheduler
       - amqp
     volumes:
       - "./conf/scheduler.yml:/scheduler.yml:ro"
@@ -132,7 +132,7 @@
     entrypoint: /entrypoint.sh
     command: start-runner -p 10
     depends_on:
-      - swh-scheduler-api
+      - swh-scheduler
       - amqp
     volumes:
       - "./conf/scheduler.yml:/scheduler.yml:ro"
@@ -242,7 +242,7 @@
       - 5006:5006
     depends_on:
       - swh-deposit-db
-      - swh-scheduler-api
+      - swh-scheduler
     environment:
       VERBOSITY: 3
       SWH_CONFIG_FILENAME: /deposit.yml
@@ -262,13 +262,13 @@
       # unset PGHOST as db service crashes otherwise
       PGHOST:
 
-  swh-vault-api:
+  swh-vault:
     image: swh/stack
     build: ./
     env_file:
       - ./env/vault-db.env
     environment:
-      SWH_CONFIG_FILENAME: /vault-api.yml
+      SWH_CONFIG_FILENAME: /vault.yml
     command: server
     ports:
       - 5005:5005
@@ -276,10 +276,10 @@
       - swh-vault-db
       - swh-objstorage
       - swh-storage
-      - swh-scheduler-api
+      - swh-scheduler
     entrypoint: /entrypoint.sh
     volumes:
-      - "./conf/vault-api.yml:/vault-api.yml:ro"
+      - "./conf/vault.yml:/vault.yml:ro"
       - "./services/swh-vault/entrypoint.sh:/entrypoint.sh:ro"
 
   swh-vault-worker:
@@ -289,7 +289,7 @@
     environment:
       SWH_CONFIG_FILENAME: /cooker.yml
     depends_on:
-      - swh-vault-api
+      - swh-vault
       - swh-storage
     entrypoint: /entrypoint.sh
     volumes:
@@ -321,7 +321,7 @@
       SWH_CONFIG_FILENAME: /lister.yml
     depends_on:
       - swh-listers-db
-      - swh-scheduler-api
+      - swh-scheduler
       - swh-scheduler-runner
       - swh-storage
       - amqp
@@ -346,7 +346,7 @@
     entrypoint: /entrypoint.sh
     depends_on:
       - swh-storage
-      - swh-scheduler-api
+      - swh-scheduler
       - amqp
     volumes:
       - "./conf/loader.yml:/loader.yml:ro"
@@ -384,7 +384,7 @@
     depends_on:
       - kafka
       - swh-storage
-      - swh-scheduler-api
+      - swh-scheduler
     volumes:
       - "./conf/indexer_journal_client.yml:/etc/softwareheritage/indexer/journal_client.yml:ro"
       - "./services/swh-indexer-journal-client/entrypoint.sh:/entrypoint.sh:ro"
diff --git a/docker/services/swh-scheduler-api/entrypoint.sh b/docker/services/swh-scheduler/entrypoint.sh
rename from docker/services/swh-scheduler-api/entrypoint.sh
rename to docker/services/swh-scheduler/entrypoint.sh