diff --git a/kubernetes/22-scheduler-listener.yml b/kubernetes/22-scheduler-listener.yml
new file mode 100644
index 0000000..69cc414
--- /dev/null
+++ b/kubernetes/22-scheduler-listener.yml
@@ -0,0 +1,133 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: scheduler-listener
+data:
+  config.yml: |
+    scheduler:
+      cls: remote
+      url: http://scheduler:5008
+    celery:
+      task_broker: amqp://guest:guest@amqp/%2f
+      broker_transport_options:
+        max_retries: 1
+
+  entrypoint-init.sh: |
+    #!/bin/bash
+
+    set -e
+
+    echo Waiting on the scheduler service
+    wait-for-it scheduler:5008 -s --timeout=0
+
+    echo Waiting on the rabbit
+    exec wait-for-it amqp:5672 -s --timeout=0
+  entrypoint.sh: |
+    #!/bin/bash
+
+    set -e
+
+    echo "Starting the scheduler listener"
+    swh --log-level ${LOGLEVEL} scheduler -C /etc/softwareheritage/config.yml start-listener
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: scheduler-listener
+  labels:
+    app: scheduler-listener
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: scheduler-listener
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+  template:
+    metadata:
+      labels:
+        app: scheduler-listener
+    spec:
+      initContainers:
+        - name: scheduler-listener-init
+          image: swh/scheduler:latest
+          imagePullPolicy: Always
+          command:
+          - /entrypoint-init.sh
+          volumeMounts:
+          - name: config
+            mountPath: /entrypoint-init.sh
+            subPath: entrypoint-init.sh
+            readOnly: true
+      containers:
+      - name: scheduler-listener
+        image: swh/scheduler:latest
+        imagePullPolicy: Always
+        command:
+        - /entrypoint.sh
+        ports:
+        - containerPort: 5008
+        resources:
+          requests:
+            cpu: "50m"
+            memory: "128Mi"
+          limits:
+            cpu: "250m"
+            memory: "256Mi"
+        env:
+        - name: PORT
+          value: "5008"
+        - name: STATSD_HOST
+          value: "prometheus-statsd-exporter"
+        - name: STATSD_PORT
+          value: "9125"
+        - name: SWH_CONFIG_FILENAME
+          value: /etc/softwareheritage/config.yml
+        - name: LOGLEVEL
+          value: INFO
+        volumeMounts:
+          - name: config
+            mountPath: /etc/softwareheritage/config.yml
+            subPath: config.yml
+            readOnly: true
+          - name: config
+            mountPath: /entrypoint.sh
+            subPath: entrypoint.sh
+            readOnly: true
+      volumes:
+        - name: config
+          configMap:
+            name: scheduler-listener
+            defaultMode: 0777
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: scheduler-listener
+spec:
+  type: ClusterIP
+  selector:
+    app: scheduler-listener
+  ports:
+    - port: 5008
+      targetPort: 5008
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: scheduler-listener
+spec:
+  rules:
+  - host: scheduler-listener.default
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: scheduler-listener
+            port:
+              number: 5008
diff --git a/skaffold.yaml b/skaffold.yaml
index 97617a6..5ac1f03 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -1,65 +1,66 @@
 apiVersion: skaffold/v2beta13
 kind: Config
 metadata:
   name: swh-environment
 build:
   artifacts:
   - image: swh/stack-base
     docker:
       dockerfile: Dockerfile
   - image: swh/objstorage
     docker:
       dockerfile: Dockerfile.objstorage
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/storage
     docker:
       dockerfile: Dockerfile.storage
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/scheduler
     docker:
       dockerfile: Dockerfile.scheduler
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/webapp
     docker:
       dockerfile: Dockerfile.webapp
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/loaders
     docker:
       dockerfile: Dockerfile.loaders
     requires:
       - image: swh/stack-base
         alias: BASE
   - image: swh/grafana
     docker:
       dockerfile: Dockerfile.grafana
   - image: swh/search
     docker:
       dockerfile: Dockerfile.search
     requires:
       - image: swh/stack-base
         alias: BASE
 deploy:
   kubectl:
     manifests:
     - kubernetes/01-journal.yml
     - kubernetes/02-monitoring.yml
     - kubernetes/05-storage-db.yml
     - kubernetes/10-objstorage.yml
     - kubernetes/11-storage.yml
     - kubernetes/15-scheduler-db.yml
     - kubernetes/16-rabbitmq.yml
     - kubernetes/20-scheduler.yml
     - kubernetes/21-scheduler-runner.yml
     - kubernetes/29-web-db.yml
     - kubernetes/30-webapp.yml
     - kubernetes/40-loaders.yml
     - kubernetes/50-elasticsearch.yml
     - kubernetes/55-search.yml
+    - kubernetes/22-scheduler-listener.yml