diff --git a/Dockerfile b/Dockerfile
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,14 +27,12 @@
 COPY services/swh-indexer-storage/entrypoint.sh /swh-indexer-storage/entrypoint.sh
 COPY services/swh-indexer-worker/entrypoint.sh /swh-indexer-worker/entrypoint.sh
 COPY services/swh-journal-client/entrypoint.sh /swh-journal-client/entrypoint.sh
-COPY services/swh-journal-publisher/entrypoint.sh /swh-journal-publisher/entrypoint.sh
 COPY services/swh-listers-worker/entrypoint.sh /swh-listers-worker/entrypoint.sh
 COPY services/swh-loaders-worker/entrypoint.sh /swh-loaders-worker/entrypoint.sh
 COPY services/swh-objstorage/entrypoint.sh /swh-objstorage/entrypoint.sh
 COPY services/swh-scheduler-api/entrypoint.sh /swh-scheduler-api/entrypoint.sh
 COPY services/swh-scheduler-worker/entrypoint.sh /swh-scheduler-worker/entrypoint.sh
 COPY services/swh-storage/entrypoint.sh /swh-storage/entrypoint.sh
-COPY services/swh-storage-listener/entrypoint.sh /swh-storage-listener/entrypoint.sh
 COPY services/swh-vault/entrypoint.sh /swh-vault/entrypoint.sh
 COPY services/swh-web/entrypoint.sh /swh-web/entrypoint.sh
 
diff --git a/conf/journal_publisher.yml b/conf/journal_publisher.yml
deleted file mode 100644
--- a/conf/journal_publisher.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-brokers:
-  - kafka
-
-temporary_prefix: swh.tmp.journal.new
-final_prefix: swh.journal.objects
-consumer_id: swh.journal.publisher
-publisher_id: swh.journal.publisher
-
-object_types:
-  - content
-  - revision
-  - release
-  - origin
-  - origin_visit
-  - snapshot
-
-storage:
-  cls: remote
-  args:
-    url: http://swh-storage:5002/
-
-max_messages: 50
diff --git a/conf/storage_listener.yml b/conf/storage_listener.yml
deleted file mode 100644
--- a/conf/storage_listener.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-database: postgresql:///?service=swh-storage
-brokers:
-  - kafka
-topic_prefix: swh.tmp.journal.new
diff --git a/docker-compose.yml b/docker-compose.yml
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -354,30 +354,6 @@
 
 # Journal related
 
-  swh-storage-listener:
-    image: swh/stack
-    build: ./
-    entrypoint: /swh-storage-listener/entrypoint.sh
-    env_file:
-      - ./env/storage-db.env
-    depends_on:
-      - swh-storage-db
-      - kafka
-    volumes:
-      - "./conf/storage_listener.yml:/etc/softwareheritage/storage/listener.yml:ro"
-
-  swh-journal-publisher:
-    image: swh/stack
-    build: ./
-    entrypoint: /swh-journal-publisher/entrypoint.sh
-    environment:
-      SWH_CONFIG_FILENAME: /journal_publisher.yml
-    depends_on:
-      - kafka
-      - swh-storage-listener
-    volumes:
-      - "./conf/journal_publisher.yml:/journal_publisher.yml:ro"
-
   swh-journal-client:
     image: swh/stack
     build: ./
@@ -392,7 +368,8 @@
     build: ./
     entrypoint: /swh-indexer-journal-client/entrypoint.sh
     depends_on:
-      - swh-journal-publisher
+      - kafka
+      - swh-storage-api
       - swh-scheduler-api
     volumes:
       - "./conf/indexer_journal_client.yml:/etc/softwareheritage/indexer/journal_client.yml:ro"