diff --git a/docker-compose.yml b/docker-compose.yml
index 3482e94..bb48d95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,203 +1,208 @@
 version: '2'
 
 services:
 
   amqp:
     image: rabbitmq:3.6-management
     ports:
       - 5018:15672
 
   zookeeper:
     image: wurstmeister/zookeeper
     ports:
       - "2181:2181"
 
   kafka:
     image: wurstmeister/kafka
     ports:
       - "9092:9092"
     env_file: ./kafka.env
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       - zookeeper
 
 # Scheduler
 
   swh-scheduler-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-scheduler
 
   swh-scheduler-api:
     image: swh/scheduler-api
     build: ./dockerfiles/swh-scheduler-api
     env_file: ./scheduler.env
     depends_on:
       - swh-scheduler-db
     ports:
       - 5008:5008
 
   swh-scheduler-listener:
     image: swh/scheduler-worker
     build: ./dockerfiles/swh-scheduler-worker
     env_file: ./scheduler.env
     command: listener
     depends_on:
       - swh-scheduler-api
       - amqp
 
   swh-scheduler-runner:
     image: swh/scheduler-worker
     build: ./dockerfiles/swh-scheduler-worker
     env_file: ./scheduler.env
     command: runner
     depends_on:
       - swh-scheduler-api
       - amqp
 
 # Graph storage
 
   swh-storage-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-storage
 
   swh-storage:
     build: ./dockerfiles/swh-storage
     image: swh/storage
     ports:
       - 5002:5002
     depends_on:
       - swh-storage-db
       - swh-objstorage
-    environment:
-      POSTGRES_PASSWORD: testpassword
-      POSTGRES_DB: swh-storage
-      PGHOST: swh-storage-db
-      PGUSER: postgres
+    env_file: ./storage.env
 
 # Object storage
 
   swh-objstorage:
     build: ./dockerfiles/swh-objstorage
     image: swh/objstorage
     ports:
       - 5003:5003
 
 # Indexer storage
 
   swh-idx-storage-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-idx-storage
 
   swh-idx-storage:
     build: ./dockerfiles/swh-indexer-storage
     image: swh/indexer-storage
     ports:
     - 5007:5007
     depends_on:
       - swh-idx-storage-db
     environment:
       POSTGRES_PASSWORD: testpassword
       POSTGRES_DB: swh-idx-storage
       PGHOST: swh-idx-storage-db
       PGUSER: postgres
 
 # Web interface
 
   swh-web:
     build: ./dockerfiles/swh-web
     image: swh/web
     ports:
       - 8080:5004
     depends_on:
       - swh-objstorage
       - swh-storage
       - swh-idx-storage
 
 # Lister Celery workers
 
   swh-listers-db:
     image: postgres:10
     environment:
       POSTGRES_PASSWORD: testpassword
 
   swh-lister-debian:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: debian
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
 
   swh-lister-github:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: github
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
 
   swh-lister-gitlab:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: gitlab
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
 
   swh-lister-npm:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: npm
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
 
   swh-lister-pypi:
     image: swh/listers-worker
     build: ./dockerfiles/swh-listers-worker
     env_file: ./listers.env
     environment:
       SWH_WORKER_INSTANCE: pypi
     depends_on:
       - swh-listers-db
       - swh-scheduler-api
       - swh-storage
       - amqp
 
 # Indexer Celery workers
 
   swh-indexer-mimetype:
     image: swh/indexer-worker
     build: ./dockerfiles/swh-indexer-worker
     env_file: ./indexers.env
     environment:
       SWH_WORKER_INSTANCE: mimetype
     depends_on:
       - swh-scheduler-api
       - swh-idx-storage
       - swh-storage
       - swh-objstorage
       - amqp
+
+  swh-storage-listener:
+    image: swh/storage-listener
+    build: ./dockerfiles/swh-storage-listener
+    env_file: ./storage.env
+    depends_on:
+      - swh-storage-db
+      - kafka
+
diff --git a/dockerfiles/swh-storage-listener/Dockerfile b/dockerfiles/swh-storage-listener/Dockerfile
new file mode 100644
index 0000000..a7a199d
--- /dev/null
+++ b/dockerfiles/swh-storage-listener/Dockerfile
@@ -0,0 +1,12 @@
+FROM python:3
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+  apt-get update && \
+  apt-get install -y \
+    libsystemd-dev postgresql-client
+
+RUN pip install swh-storage
+COPY listener.yml /etc/softwareheritage/storage/
+COPY entrypoint.sh /
+
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/dockerfiles/swh-storage-listener/entrypoint.sh b/dockerfiles/swh-storage-listener/entrypoint.sh
new file mode 100755
index 0000000..3a3b0ef
--- /dev/null
+++ b/dockerfiles/swh-storage-listener/entrypoint.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -e
+
+if [[ -d /src ]] ; then
+    for srcrepo in /src/swh-* ; do
+      pushd $srcrepo
+      pip install -e .
+      popd
+    done
+fi
+
+echo "${PGHOST}:5432:${POSTGRES_DB}:${PGUSER}:${POSTGRES_PASSWORD}" > ~/.pgpass
+cat > ~/.pg_service.conf <<EOF
+[swh]
+dbname=${POSTGRES_DB}
+host=${PGHOST}
+port=5432
+user=${PGUSER}
+EOF
+
+chmod 0400 ~/.pgpass
+
+case "$1" in
+    "shell")
+      exec bash -i
+      ;;
+    *)
+      echo "Waiting for postgresql to start"
+      until psql service=swh -c "select 1" 1>&2 >/dev/null; do sleep 0.1; done
+
+      echo "Starting swh-storage's listener"
+      exec python3 -m swh.storage.listener
+      ;;
+esac
diff --git a/dockerfiles/swh-storage-listener/listener.yml b/dockerfiles/swh-storage-listener/listener.yml
new file mode 100644
index 0000000..c50d2d8
--- /dev/null
+++ b/dockerfiles/swh-storage-listener/listener.yml
@@ -0,0 +1,4 @@
+database: service=swh
+brokers': kafka
+topic_prefix: swh.tmp_journal.new
+poll_timeout': 10
diff --git a/storage.env b/storage.env
new file mode 100644
index 0000000..8c16b00
--- /dev/null
+++ b/storage.env
@@ -0,0 +1,4 @@
+POSTGRES_PASSWORD=testpassword
+POSTGRES_DB=swh-storage
+PGHOST=swh-storage-db
+PGUSER=postgres