diff --git a/docker/conf/web-search.yml b/docker/conf/web-search.yml
new file mode 100644
--- /dev/null
+++ b/docker/conf/web-search.yml
@@ -0,0 +1,66 @@
+storage:
+  cls: remote
+  url: http://swh-storage:5002/
+  timeout: 1
+
+indexer_storage:
+  cls: remote
+  url: http://swh-idx-storage:5007/
+
+scheduler:
+  cls: remote
+  url: http://swh-scheduler:5008/
+
+vault:
+  cls: remote
+  url: http://swh-vault:5005/
+
+deposit:
+  private_api_url: https://swh-deposit:5006/1/private/
+  private_api_user: swhworker
+  private_api_password: ""
+
+allowed_hosts:
+  - "*"
+
+debug: yes
+
+serve_assets: yes
+
+development_db: /tmp/db.sqlite3
+production_db: /tmp/db.sqlite3
+
+throttling:
+  cache_uri: 127.0.0.1:11211
+  scopes:
+    swh_api:
+      limiter_rate:
+        default: 120/h
+      exempted_networks:
+        - 0.0.0.0/0
+    swh_api_origin_search:
+      limiter_rate:
+        default: 70/m
+      exempted_networks:
+        - 0.0.0.0/0
+    swh_api_origin_visit_latest:
+      limiter_rate:
+        default: 700/m
+      exempted_networks:
+        - 0.0.0.0/0
+    swh_vault_cooking:
+      limiter_rate:
+        default: 120/h
+      exempted_networks:
+        - 0.0.0.0/0
+    swh_save_origin:
+      limiter_rate:
+        default: 120/h
+      exempted_networks:
+        - 0.0.0.0/0
+
+search:
+  cls: remote
+  url: http://swh-search:5010/
+
+metadata_search_backend: swh-search
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,20 +1,11 @@
-version: '2'
+version: "2"
 
 services:
-
   amqp:
     image: rabbitmq:3.6-management
     ports:
       - 5072:5672
 
-#  flower:
-#    image: mher/flower
-#    command: --broker=amqp://guest:guest@amqp:5672// --url_prefix=flower
-#    ports:
-#      - 5055:5555
-#    depends_on:
-#      - amqp
-
   zookeeper:
     image: wurstmeister/zookeeper
     restart: always
@@ -27,23 +18,10 @@
     depends_on:
       - zookeeper
 
-  kafka-manager:
-    image: hlebalbau/kafka-manager:stable
-    ports:
-      - "5093:9000"
-    environment:
-      ZK_HOSTS: zookeeper:2181
-      APPLICATION_SECRET: random-secret
-    depends_on:
-      - zookeeper
-    command: -Dpidfile.path=/dev/null
-    volumes:
-      - "./conf/kafka-manager_logback.xml:/kafka-manager/conf/logback.xml:ro"
-
   prometheus:
     image: prom/prometheus
     depends_on:
-    - prometheus-statsd-exporter
+      - prometheus-statsd-exporter
     command:
       # Needed for the reverse-proxy
       - "--web.external-url=/prometheus"
@@ -73,7 +51,7 @@
     image: grafana/grafana
     restart: unless-stopped
     depends_on:
-    - prometheus
+      - prometheus
     environment:
       GF_SERVER_ROOT_URL: http://localhost:5080/grafana
     volumes:
@@ -87,7 +65,7 @@
     ports:
       - 5080:5080
 
-# Scheduler
+  # Scheduler
 
   swh-scheduler-db:
     image: postgres:12
@@ -152,7 +130,7 @@
       - "./conf/scheduler.yml:/scheduler.yml:ro"
       - "./services/swh-scheduler-worker/entrypoint.sh:/entrypoint.sh:ro"
 
-# Graph storage
+  # Graph storage
 
   swh-storage-db:
     image: postgres:12
@@ -179,7 +157,7 @@
       - "./conf/storage.yml:/storage.yml:ro"
       - "./services/swh-storage/entrypoint.sh:/entrypoint.sh:ro"
 
-# Object storage
+  # Object storage
 
   swh-objstorage:
     build: ./
@@ -195,7 +173,7 @@
       - "./conf/objstorage.yml:/objstorage.yml:ro"
       - "./services/swh-objstorage/entrypoint.sh:/entrypoint.sh:ro"
 
-# Indexer storage
+  # Indexer storage
 
   swh-idx-storage-db:
     image: postgres:12
@@ -220,7 +198,7 @@
       - "./conf/indexer_storage.yml:/indexer_storage.yml:ro"
       - "./services/swh-indexer-storage/entrypoint.sh:/entrypoint.sh:ro"
 
-# Web interface
+  # Web interface
 
   swh-web:
     build: ./
@@ -311,8 +289,7 @@
       - "./conf/vault-worker.yml:/cooker.yml:ro"
       - "./services/swh-vault/entrypoint.sh:/entrypoint.sh:ro"
 
-
-# Lister Celery workers
+  # Lister Celery workers
 
   swh-lister:
     image: swh/stack
@@ -334,7 +311,7 @@
       - "./conf/lister.yml:/lister.yml:ro"
       - "./services/swh-listers-worker/entrypoint.sh:/entrypoint.sh:ro"
 
-# Loader + deposit checker Celery workers
+  # Loader + deposit checker Celery workers
 
   swh-loader:
     image: swh/stack
@@ -356,7 +333,7 @@
       - "./conf/loader.yml:/loader.yml:ro"
       - "./services/swh-worker/entrypoint.sh:/entrypoint.sh:ro"
 
-# Indexer Celery workers
+  # Indexer Celery workers
 
   swh-indexer:
     image: swh/stack
@@ -382,7 +359,8 @@
       - "./conf/indexer.yml:/indexer.yml:ro"
       - "./services/swh-indexer-worker/entrypoint.sh:/entrypoint.sh:ro"
 
-# Journal related
+  # Journal related
+
   swh-indexer-journal-client:
     image: swh/stack
     build: ./