diff --git a/Dockerfile b/Dockerfile
index cbfb2e3..304d15f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,48 +1,46 @@
 FROM python:3.6
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && apt-get upgrade -y && \
   apt-get install -y \
     libapr1-dev \
     libaprutil1-dev \
     libpq-dev \
     libsvn-dev \
     libsystemd-dev \
     postgresql-client \
     wait-for-it \
     ngrep && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/*
 
 RUN pip install --upgrade pip setuptools wheel
 RUN pip install swh-deposit swh-indexer swh-journal swh-lister swh-loader-debian \
                 swh-loader-dir swh-loader-git swh-loader-mercurial swh-loader-pypi \
                 swh-loader-svn swh-loader-tar swh-storage swh-objstorage \
                 swh-scheduler swh-vault swh-web
 
 RUN pip install gunicorn
 
 COPY services/swh-deposit/entrypoint.sh /swh-deposit/entrypoint.sh
 COPY services/swh-indexer-journal-client/entrypoint.sh /swh-indexer-journal-client/entrypoint.sh
 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
 
 COPY services/swh-journal-client/client.py /swh-journal-client/
 
 COPY utils/pgsql.sh /swh-utils/pgsql.sh
 
 RUN useradd -ms /bin/bash swh
 
 RUN mkdir -p /srv/softwareheritage/objects
 
diff --git a/conf/journal_publisher.yml b/conf/journal_publisher.yml
deleted file mode 100644
index 88fbbd7..0000000
--- 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
index 28d876c..0000000
--- 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
index 0f51118..effc7ca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,398 +1,375 @@
 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
 
   kafka:
     image: wurstmeister/kafka
     ports:
       - "5092:9092"
     env_file: ./env/kafka.env
     depends_on:
       - zookeeper
 
   kafka-manager:
     image: hlebalbau/kafka-manager:stable
     ports:
       - "5093:9000"
     environment:
       ZK_HOSTS: zookeeper:2181
       APPLICATION_SECRET: random-secret
     command: -Dpidfile.path=/dev/null
 
   prometheus:
     image: prom/prometheus
     command:
       # Needed for the reverse-proxy
       - "--web.external-url=/prometheus"
       - "--config.file=/etc/prometheus/prometheus.yml"
     volumes:
       - "./conf/prometheus.yml:/etc/prometheus/prometheus.yml:ro"
     restart: unless-stopped
 
   prometheus-statsd-exporter:
     image: prom/statsd-exporter
     command:
       - "--statsd.mapping-config=/etc/prometheus/statsd-mapping.yml"
     volumes:
       - "./conf/prometheus-statsd-mapping.yml:/etc/prometheus/statsd-mapping.yml:ro"
     restart: unless-stopped
 
   grafana:
     image: grafana/grafana
     restart: unless-stopped
     environment:
       GF_SERVER_ROOT_URL: http://localhost:5080/grafana
     volumes:
       - "./conf/grafana/provisioning:/etc/grafana/provisioning:ro"
       - "./conf/grafana/dashboards:/var/lib/grafana/dashboards"
 
   nginx:
     image: nginx
     volumes:
       - "./conf/nginx.conf:/etc/nginx/nginx.conf:ro"
     ports:
       - 5080:5080
 
 # Scheduler
 
   swh-scheduler-db:
     image: postgres:11
     env_file:
       - ./env/scheduler-db.env
     environment:
       # unset PGHOST as db service crashes otherwise
       PGHOST:
 
   swh-scheduler-api:
     image: swh/stack
     build: ./
     env_file:
       - ./env/scheduler-db.env
       - ./env/scheduler.env
     entrypoint: /swh-scheduler-api/entrypoint.sh
     environment:
       SWH_CONFIG_FILENAME: /scheduler.yml
       SWH_SCHEDULER_CONFIG_FILE: /scheduler.yml
     depends_on:
       - swh-scheduler-db
     ports:
       - 5008:5008
     volumes:
       - "./conf/scheduler.yml:/scheduler.yml:ro"
 
   swh-scheduler-listener:
     image: swh/stack
     build: ./
     entrypoint: /swh-scheduler-worker/entrypoint.sh
     env_file:
       - ./env/scheduler-db.env
       - ./env/scheduler.env
     environment:
       SWH_CONFIG_FILENAME: /scheduler.yml
       SWH_SCHEDULER_CONFIG_FILE: /scheduler.yml
     command: listener
     depends_on:
       - swh-scheduler-api
       - amqp
     volumes:
       - "./conf/scheduler.yml:/scheduler.yml:ro"
 
   swh-scheduler-runner:
     image: swh/stack
     build: ./
     entrypoint: /swh-scheduler-worker/entrypoint.sh
     env_file:
       - ./env/scheduler-db.env
       - ./env/scheduler.env
     environment:
       SWH_CONFIG_FILENAME: /scheduler.yml
       SWH_SCHEDULER_CONFIG_FILE: /scheduler.yml
     command: runner -p 10
     depends_on:
       - swh-scheduler-api
       - amqp
     volumes:
       - "./conf/scheduler.yml:/scheduler.yml:ro"
 
 # Graph storage
 
   swh-storage-db:
     image: postgres:11
     env_file:
       - ./env/storage-db.env
     environment:
       # unset PGHOST as db service crashes otherwise
       PGHOST:
 
   swh-storage:
     build: ./
     image: swh/stack
     entrypoint: /swh-storage/entrypoint.sh
     ports:
       - 5002:5002
     depends_on:
       - swh-storage-db
       - swh-objstorage
     env_file:
       - ./env/storage-db.env
     environment:
       SWH_CONFIG_FILENAME: /storage.yml
     volumes:
       - "./conf/storage.yml:/storage.yml:ro"
 
 # Object storage
 
   swh-objstorage:
     build: ./
     image: swh/stack
     entrypoint: /swh-objstorage/entrypoint.sh
     ports:
       - 5003:5003
     environment:
       SWH_CONFIG_FILENAME: /objstorage.yml
     volumes:
       - "./conf/objstorage.yml:/objstorage.yml:ro"
 
 # Indexer storage
 
   swh-idx-storage-db:
     image: postgres:11
     env_file:
       - ./env/indexers-db.env
     environment:
       # unset PGHOST as db service crashes otherwise
       PGHOST:
 
   swh-idx-storage:
     build: ./
     image: swh/stack
     entrypoint: /swh-indexer-storage/entrypoint.sh
     ports:
       - 5007:5007
     depends_on:
       - swh-idx-storage-db
     env_file:
       - ./env/indexers-db.env
     environment:
       SWH_CONFIG_FILENAME: /indexer_storage.yml
     volumes:
       - "./conf/indexer_storage.yml:/indexer_storage.yml:ro"
 
 # Web interface
 
   swh-web:
     build: ./
     image: swh/stack
     entrypoint: /swh-web/entrypoint.sh
     ports:
       - 5004:5004
     depends_on:
       - swh-objstorage
       - swh-storage
       - swh-idx-storage
     environment:
       VERBOSITY: 3
       DJANGO_SETTINGS_MODULE: swh.web.settings.development
       SWH_CONFIG_FILENAME: /web.yml
       PYTHONPATH: /tmp/swh
     volumes:
       - "./conf/web.yml:/web.yml:ro"
 
   swh-deposit-db:
     image: postgres:11
     env_file:
       - ./env/deposit-db.env
     environment:
       # unset PGHOST as db service crashes otherwise
       PGHOST:
 
   swh-deposit:
     build: ./
     entrypoint: /swh-deposit/entrypoint.sh
     image: swh/stack
     ports:
       - 5006:5006
     depends_on:
       - swh-deposit-db
       - swh-scheduler-api
     env_file:
       - ./env/deposit-db.env
       - ./env/deposit.env
     volumes:
       - "./conf/deposit.yml:/deposit.yml:ro"
 
   swh-vault-db:
     image: postgres:11
     env_file:
       - ./env/vault-db.env
     environment:
       # unset PGHOST as db service crashes otherwise
       PGHOST:
 
   swh-vault-api:
     build: ./
     image: swh/stack
     entrypoint: /swh-vault/entrypoint.sh
     env_file:
       - ./env/vault-db.env
     environment:
       SWH_CONFIG_FILENAME: /vault-api.yml
     command: server
     ports:
       - 5005:5005
     depends_on:
       - swh-vault-db
       - swh-objstorage
       - swh-storage
       - swh-scheduler-api
     volumes:
       - "./conf/vault-api.yml:/vault-api.yml:ro"
 
   swh-vault-worker:
     build: ./
     image: swh/stack
     entrypoint: /swh-vault/entrypoint.sh
     command: worker
     environment:
       SWH_CONFIG_FILENAME: /cooker.yml
     depends_on:
       - swh-vault-api
       - swh-storage
     volumes:
       - "./conf/vault-worker.yml:/cooker.yml:ro"
 
 
 # Lister Celery workers
 
   swh-listers-db:
     image: postgres:11
     env_file:
       - ./env/listers-db.env
     environment:
       # unset PGHOST as db service crashes otherwise
       PGHOST:
 
   swh-lister:
     image: swh/stack
     build: ./
     entrypoint: /swh-listers-worker/entrypoint.sh
     env_file:
       - ./env/listers-db.env
       - ./env/listers.env
     user: swh
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: listers
       SWH_CONFIG_FILENAME: /lister.yml
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-scheduler-runner
       - swh-storage
       - amqp
     volumes:
       - "./conf/lister.yml:/lister.yml:ro"
 
 # Loader Celery workers
 
   swh-loader:
     image: swh/stack
     build: ./
     entrypoint: /swh-loaders-worker/entrypoint.sh
     env_file:
       - ./env/listers.env
     user: swh
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
       SWH_WORKER_INSTANCE: loader
       SWH_CONFIG_FILENAME: /loader.yml
     depends_on:
       - swh-storage
       - amqp
     volumes:
       - "./conf/loader.yml:/loader.yml:ro"
 
 # Indexer Celery workers
 
   swh-indexer:
     image: swh/stack
     build: ./
     user: swh
     entrypoint: /swh-indexer-worker/entrypoint.sh
     env_file:
       - ./env/indexers-db.env
       - ./env/indexers.env
     environment:
       STATSD_HOST: prometheus-statsd-exporter
       STATSD_PORT: 9125
     depends_on:
       - swh-scheduler-runner
       - swh-idx-storage
       - swh-storage
       - swh-objstorage
       - amqp
     volumes:
       - "./conf/indexer.yml:/indexer.yml:ro"
 
 # 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: ./
     entrypoint: /swh-journal-client/entrypoint.sh
     depends_on:
       - swh-journal-publisher
     volumes:
       - "./conf/journal_client.yml:/etc/softwareheritage/journal/logger.yml:ro"
 
   swh-indexer-journal-client:
     image: swh/stack
     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"