diff --git a/docker/conf/search_journal_client_indexed.yml b/docker/conf/search_journal_client_indexed.yml
new file mode 100644
--- /dev/null
+++ b/docker/conf/search_journal_client_indexed.yml
@@ -0,0 +1,11 @@
+search:
+  cls: remote
+  url: http://swh-search:5010/
+journal:
+  brokers:
+    - kafka
+  group_id: swh.search.journal_client
+  prefix: swh.journal.indexed
+  object_types:
+    - origin_intrinsic_metadata
+
diff --git a/docker/docker-compose.search.yml b/docker/docker-compose.search.yml
--- a/docker/docker-compose.search.yml
+++ b/docker/docker-compose.search.yml
@@ -32,8 +32,19 @@
       - swh-search
       - kafka
     volumes:
-      - "./conf/search_journal_client_objects.yml:/etc/softwareheritage/search/journal_client_objects.yml:ro"
-      - "./services/swh-search-journal-client-objects/entrypoint.sh:/entrypoint.sh:ro"
+      - "./conf/search_journal_client_objects.yml:/etc/softwareheritage/search/journal_client.yml:ro"
+      - "./services/swh-search-journal-client/entrypoint.sh:/entrypoint.sh:ro"
+
+  swh-search-journal-client-indexed:
+    image: swh/stack
+    build: ./
+    entrypoint: /entrypoint.sh
+    depends_on:
+      - swh-search
+      - kafka
+    volumes:
+      - "./conf/search_journal_client_indexed.yml:/etc/softwareheritage/search/journal_client.yml:ro"
+      - "./services/swh-search-journal-client/entrypoint.sh:/entrypoint.sh:ro"
 
 volumes:
   elasticsearch-data:
diff --git a/docker/services/swh-search-journal-client-objects/entrypoint.sh b/docker/services/swh-search-journal-client/entrypoint.sh
rename from docker/services/swh-search-journal-client-objects/entrypoint.sh
rename to docker/services/swh-search-journal-client/entrypoint.sh
--- a/docker/services/swh-search-journal-client-objects/entrypoint.sh
+++ b/docker/services/swh-search-journal-client/entrypoint.sh
@@ -10,10 +10,9 @@
       exec bash -i
       ;;
     *)
-      echo "Starting swh-indexer-journal client"
+      echo "Starting swh-search-journal client"
       exec wait-for-it -s kafka:9092 -s --timeout=0 -- \
           wait-for-it -s swh-search:5010 -s --timeout=0 -- \
-          swh --log-level DEBUG search --config-file /etc/softwareheritage/search/journal_client_objects.yml journal-client objects
+          swh --log-level DEBUG search --config-file /etc/softwareheritage/search/journal_client.yml journal-client objects
       ;;
 esac
-