diff --git a/Dockerfile.scheduler b/Dockerfile.scheduler
new file mode 100644
index 0000000..3fc6681
--- /dev/null
+++ b/Dockerfile.scheduler
@@ -0,0 +1,7 @@
+ARG BASE
+
+FROM $BASE
+
+COPY swh-scheduler /app/swh-scheduler
+
+RUN pip install /app/swh-scheduler
diff --git a/kubernetes/11-storage.yml b/kubernetes/11-storage.yml
index 0562916..374931b 100644
--- a/kubernetes/11-storage.yml
+++ b/kubernetes/11-storage.yml
@@ -1,216 +1,216 @@
---
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: storage
 data:
   config.yml: |
     storage:
       cls: local
       db: postgresql:///?service=swh
       objstorage:
         cls: remote
         url: http://objstorage:5003/
       journal_writer:
         cls: kafka
         args:
           brokers:
             - kafka
           prefix: swh.journal.objects
           client_id: swh.storage.master
   entrypoint-init-db.sh: |
     #!/bin/bash
 
     set -e
 
     echo -n "waiting for database availability"
     set +e
     ko=1
     while [[ $ko -gt 0 ]]; do PGCONNECT_TIMEOUT=2 psql --list &>/dev/null;ko=$?; echo -n .; sleep 0.5; done
     echo
     set -e
 
     echo Init swh-storage database
 
     echo Creating extensions...
     swh db init-admin --db-name ${PGDATABASE} storage
 
     echo Initializing the database...
     swh db init --db-name ${PGDATABASE} storage
 
   entrypoint.sh: |
     #!/bin/bash
 
     set -e
 
     echo "${PGHOST}:5432:${PGDATABASE}:${PGUSER}:${PGPASSWORD}" >> ~/.pgpass
     cat >> ~/.pg_service.conf <<EOF
     [${PGDATABASE}]
     dbname=${PGDATABASE}
     host=${PGHOST}
     port=5432
     user=${PGUSER}
     EOF
 
     echo Starting the swh-storage API server
     exec gunicorn --bind 0.0.0.0:5002 \
           --reload \
           --threads 4 \
           --workers 2 \
           --log-level DEBUG \
           --timeout 3600 \
           --config 'python:swh.core.api.gunicorn_config' \
           'swh.storage.api.server:make_app_from_configfile()'
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: storage
   labels:
     app: storage
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: storage
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: storage
     spec:
       initContainers:
         - name: storage-init
           image: swh/storage:latest
           imagePullPolicy: Always
           command:
             - /entrypoint.sh
           env:
           - name: PGHOST
             value: "storage-db"
           - name: PGUSER
             valueFrom:
               configMapKeyRef:
                 name: storage-db
                 key: POSTGRES_USER
           - name: PGPASSWORD
             valueFrom:
               secretKeyRef:
                 name: storage-db
                 key: POSTGRES_PASSWORD
           - name: PGDATABASE
             valueFrom:
               configMapKeyRef:
                 name: storage-db
                 key: POSTGRES_DB
           - name: SWH_CONFIG_FILENAME
             value: /etc/softwareheritage/config.yml
           volumeMounts:
             - name: db-password
               mountPath: /run/secrets/postgres-password
               subPath: POSTGRES_PASSWORD
               readOnly: true
             - name: config
               mountPath: /etc/softwareheritage/config.yml
               subPath: config.yml
               readOnly: true
             - name: config
               mountPath: /entrypoint.sh
               subPath: entrypoint-init-db.sh
               readOnly: true
       containers:
       - name: storage
         image: swh/storage:latest
         imagePullPolicy: Always
         command:
           - /entrypoint.sh
         ports:
         - containerPort: 5002
         env:
         - name: PORT
           value: "5002"
         - name: STATSD_HOST
           value: "prometheus-statsd-exporter"
         - name: STATSD_PORT
           value: "9125"
         - name: POSTGRES_PASSWORD_FILE
           value: "/run/secrets/postgres-password"
         - name: PGHOST
           value: "storage-db"
         - name: PGUSER
           valueFrom:
             configMapKeyRef:
               name: storage-db
               key: POSTGRES_USER
         - name: PGPASSWORD
           valueFrom:
             secretKeyRef:
               name: storage-db
               key: POSTGRES_PASSWORD
         - name: PGDATABASE
           valueFrom:
             configMapKeyRef:
               name: storage-db
               key: POSTGRES_DB
         - name: SWH_CONFIG_FILENAME
           value: /etc/softwareheritage/config.yml
         volumeMounts:
           - name: db-password
             mountPath: /run/secrets/postgres-password
             subPath: POSTGRES_PASSWORD
             readOnly: true
           - name: config
             mountPath: /etc/softwareheritage/config.yml
             subPath: config.yml
             readOnly: true
           - name: config
             mountPath: /entrypoint.sh
             subPath: entrypoint.sh
             readOnly: true
         resources:
           requests:
             memory: "512Mi"
             cpu: "250m"
           limits:
             memory: "1024Mi"
             cpu: "500m"
       volumes:
         - name: config
           configMap:
             name: storage
             defaultMode: 0777
         - name: db-password
           secret:
             secretName: storage-db
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: storage
 spec:
   type: ClusterIP
   selector:
     app: storage
   ports:
     - port: 5002
       targetPort: 5002
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: storage
 spec:
   rules:
   - host: storage.default
     http:
       paths:
       - path: /
         pathType: Prefix
         backend:
           service:
             name: storage
             port:
               number: 5002
diff --git a/kubernetes/15-scheduler-db.yml b/kubernetes/15-scheduler-db.yml
new file mode 100644
index 0000000..81ef08b
--- /dev/null
+++ b/kubernetes/15-scheduler-db.yml
@@ -0,0 +1,129 @@
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: scheduler-db-pv
+spec:
+  capacity:
+    storage: 10Gi
+  volumeMode: Filesystem
+  accessModes:
+  - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Delete
+  storageClassName: scheduler-db
+  local:
+    path: /srv/softwareheritage/dev/scheduler-db
+  nodeAffinity:
+    required:
+      nodeSelectorTerms:
+      - matchExpressions:
+        # TODO adapt for your needs
+        - key: kubernetes.io/os
+          operator: In
+          values:
+          - linux
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: scheduler-db-pvc
+spec:
+  accessModes:
+  - ReadWriteOnce
+  storageClassName: scheduler-db
+  resources:
+    requests:
+      storage: 10Gi
+
+---
+## TODO Change this to your real postgresql password
+apiVersion: v1
+kind: Secret
+metadata:
+  name: scheduler-db
+type: Opaque
+stringData:
+  POSTGRES_PASSWORD: swh
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: scheduler-db
+data:
+  # property-like keys; each key maps to a simple value
+  POSTGRES_USER: swh
+  POSTGRES_DB: swh-scheduler
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: scheduler-db
+  labels:
+    app: scheduler-db
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: scheduler-db
+  template:
+    metadata:
+      labels:
+        app: scheduler-db
+    spec:
+      containers:
+      - name: scheduler-db
+        image: postgres:13.0
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 5432
+        args:
+          - "-c"
+          - "shared_buffers=512MB"
+          - "-c"
+          - "effective_cache_size=512MB"
+          - "-c"
+          - "random_page_cost=1.5"
+          - "-c"
+          - "max_wal_size=512MB"
+        env:
+          - name: POSTGRES_USER
+            valueFrom:
+              configMapKeyRef:
+                name: scheduler-db
+                key: POSTGRES_USER
+          - name: POSTGRES_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: scheduler-db
+                key: POSTGRES_PASSWORD
+          - name: POSTGRES_DB
+            valueFrom:
+              configMapKeyRef:
+                name: scheduler-db
+                key: POSTGRES_DB
+        volumeMounts:
+        - mountPath: "/var/lib/postgresql"
+          name: scheduler-db-pvc
+        resources:
+          requests:
+            memory: "512Mi"
+            cpu: "250m"
+          limits:
+            memory: "1024Mi"
+            cpu: "500m"
+      volumes:
+        - name: scheduler-db-pvc
+          persistentVolumeClaim:
+            claimName: scheduler-db-pvc
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: scheduler-db
+spec:
+  type: ClusterIP
+  selector:
+    app: scheduler-db
+  ports:
+    - port: 5432
+      targetPort: 5432
diff --git a/kubernetes/11-storage.yml b/kubernetes/20-scheduler.yml
similarity index 66%
copy from kubernetes/11-storage.yml
copy to kubernetes/20-scheduler.yml
index 0562916..122d9b5 100644
--- a/kubernetes/11-storage.yml
+++ b/kubernetes/20-scheduler.yml
@@ -1,216 +1,201 @@
---
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: storage
+  name: scheduler
 data:
   config.yml: |
-    storage:
+    scheduler:
       cls: local
-      db: postgresql:///?service=swh
-      objstorage:
-        cls: remote
-        url: http://objstorage:5003/
-      journal_writer:
-        cls: kafka
-        args:
-          brokers:
-            - kafka
-          prefix: swh.journal.objects
-          client_id: swh.storage.master
+      db: postgresql:///?service=swh-scheduler
+
+    celery:
+      task_broker: amqp://guest:guest@amqp/%2f
+      broker_transport_options:
+        max_retries: 1
   entrypoint-init-db.sh: |
     #!/bin/bash
 
     set -e
 
     echo -n "waiting for database availability"
     set +e
     ko=1
     while [[ $ko -gt 0 ]]; do PGCONNECT_TIMEOUT=2 psql --list &>/dev/null;ko=$?; echo -n .; sleep 0.5; done
     echo
     set -e
 
-    echo Init swh-storage database
+    echo Init swh-scheduler database
 
     echo Creating extensions...
-    swh db init-admin --db-name ${PGDATABASE} storage
+    swh db init-admin --db-name ${PGDATABASE} scheduler
 
     echo Initializing the database...
-    swh db init --db-name ${PGDATABASE} storage
-
+    swh db init --db-name ${PGDATABASE} scheduler
   entrypoint.sh: |
     #!/bin/bash
 
     set -e
 
     echo "${PGHOST}:5432:${PGDATABASE}:${PGUSER}:${PGPASSWORD}" >> ~/.pgpass
     cat >> ~/.pg_service.conf <<EOF
     [${PGDATABASE}]
     dbname=${PGDATABASE}
     host=${PGHOST}
     port=5432
     user=${PGUSER}
     EOF
 
-    echo Starting the swh-storage API server
-    exec gunicorn --bind 0.0.0.0:5002 \
-          --reload \
-          --threads 4 \
-          --workers 2 \
-          --log-level DEBUG \
-          --timeout 3600 \
-          --config 'python:swh.core.api.gunicorn_config' \
-          'swh.storage.api.server:make_app_from_configfile()'
+    echo Starting the swh-scheduler API server
+    exec gunicorn --bind 0.0.0.0:5008 \
+         --log-level DEBUG \
+         --threads 4 \
+         --workers 2 \
+         --reload \
+         --timeout 3600 \
+         --config 'python:swh.core.api.gunicorn_config' \
+         'swh.scheduler.api.server:make_app_from_configfile()'
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: storage
+  name: scheduler
   labels:
-    app: storage
+    app: scheduler
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: storage
+      app: scheduler
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
-        app: storage
+        app: scheduler
     spec:
       initContainers:
-        - name: storage-init
-          image: swh/storage:latest
+        - name: scheduler-init
+          image: swh/scheduler:latest
           imagePullPolicy: Always
           command:
             - /entrypoint.sh
           env:
           - name: PGHOST
-            value: "storage-db"
+            value: "scheduler-db"
           - name: PGUSER
             valueFrom:
               configMapKeyRef:
-                name: storage-db
+                name: scheduler-db
                 key: POSTGRES_USER
           - name: PGPASSWORD
             valueFrom:
               secretKeyRef:
-                name: storage-db
+                name: scheduler-db
                 key: POSTGRES_PASSWORD
           - name: PGDATABASE
             valueFrom:
               configMapKeyRef:
-                name: storage-db
+                name: scheduler-db
                 key: POSTGRES_DB
           - name: SWH_CONFIG_FILENAME
             value: /etc/softwareheritage/config.yml
           volumeMounts:
             - name: db-password
               mountPath: /run/secrets/postgres-password
               subPath: POSTGRES_PASSWORD
               readOnly: true
             - name: config
               mountPath: /etc/softwareheritage/config.yml
               subPath: config.yml
               readOnly: true
             - name: config
               mountPath: /entrypoint.sh
               subPath: entrypoint-init-db.sh
               readOnly: true
       containers:
-      - name: storage
-        image: swh/storage:latest
+      - name: scheduler
+        image: swh/scheduler:latest
         imagePullPolicy: Always
         command:
           - /entrypoint.sh
         ports:
-        - containerPort: 5002
+        - containerPort: 5008
         env:
         - name: PORT
-          value: "5002"
+          value: "5008"
         - name: STATSD_HOST
           value: "prometheus-statsd-exporter"
         - name: STATSD_PORT
           value: "9125"
-        - name: POSTGRES_PASSWORD_FILE
-          value: "/run/secrets/postgres-password"
         - name: PGHOST
-          value: "storage-db"
+          value: "scheduler-db"
         - name: PGUSER
           valueFrom:
             configMapKeyRef:
-              name: storage-db
+              name: scheduler-db
               key: POSTGRES_USER
         - name: PGPASSWORD
           valueFrom:
             secretKeyRef:
-              name: storage-db
+              name: scheduler-db
               key: POSTGRES_PASSWORD
         - name: PGDATABASE
           valueFrom:
             configMapKeyRef:
-              name: storage-db
+              name: scheduler-db
               key: POSTGRES_DB
         - name: SWH_CONFIG_FILENAME
           value: /etc/softwareheritage/config.yml
         volumeMounts:
           - name: db-password
             mountPath: /run/secrets/postgres-password
             subPath: POSTGRES_PASSWORD
             readOnly: true
           - name: config
             mountPath: /etc/softwareheritage/config.yml
             subPath: config.yml
             readOnly: true
           - name: config
             mountPath: /entrypoint.sh
             subPath: entrypoint.sh
             readOnly: true
-        resources:
-          requests:
-            memory: "512Mi"
-            cpu: "250m"
-          limits:
-            memory: "1024Mi"
-            cpu: "500m"
       volumes:
         - name: config
           configMap:
-            name: storage
+            name: scheduler
             defaultMode: 0777
         - name: db-password
           secret:
-            secretName: storage-db
+            secretName: scheduler-db
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: storage
+  name: scheduler
 spec:
   type: ClusterIP
   selector:
-    app: storage
+    app: scheduler
   ports:
-    - port: 5002
-      targetPort: 5002
+    - port: 5008
+      targetPort: 5008
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: storage
+  name: scheduler
 spec:
   rules:
-  - host: storage.default
+  - host: scheduler.default
     http:
       paths:
       - path: /
         pathType: Prefix
         backend:
           service:
-            name: storage
+            name: scheduler
             port:
-              number: 5002
+              number: 5008
diff --git a/kubernetes/Readme.md b/kubernetes/Readme.md
index 9661377..ef15895 100644
--- a/kubernetes/Readme.md
+++ b/kubernetes/Readme.md
@@ -1,134 +1,190 @@
 ## Prerequisite
 
 ### Directories
 
 ```
-# sudo mkdir -p /srv/softwareheritage-kube/dev/storage-db
-# sudo mkdir -p /srv/softwareheritage-kube/dev/objects
+# sudo mkdir -p /srv/softwareheritage-kube/objects
+# sudo mkdir -p /srv/softwareheritage-kube/storage-db
+# sudo mkdir -p /srv/softwareheritage-kube/scheduler-db
 ```
 Must match the content of `05-storage-db.yaml`
 
 ### Registry
 
 - Add the following line on your `/etc/hosts` file. It's needed to be able to
   push the image to it from docker
 ```
 127.0.0.1 registry.default
 ```
 - Start the registry in kubernetes
 ```
 # cd kubernetes
 # kubectl apply -f registry/00-registry.yml
 ```
 
 ## Build the base image
 
 ```
 # cd docker
 # docker build --no-cache -t swh/stack .
 
 # docker tag swh/stack:latest registry.default/swh/stack:latest
 # docker push registry.default/swh/stack:latest
 
 ```
 
 ## start the objstorage
 
 - start the service
 ```
 # cd kubernetes
 
 # kubectl apply -f 10-objstorage.yml
 configmap/objstorage created
 persistentvolume/objstorage-pv created
 persistentvolumeclaim/objstorage-pvc created
 deployment.apps/objstorage created
 service/objstorage created
 ```
 - test it
 ```
 # kubectl get pods
 NAME                                   READY   STATUS    RESTARTS   AGE
 registry-deployment-7595868dc8-657ps   1/1     Running   0          46m
 objstorage-8587d58b68-76jbn            1/1     Running   0          12m
 
 # kubectl get services objstorage
 NAME         TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)    AGE
 objstorage   ClusterIP   10.43.185.191   <none>        5003/TCP   17m
 
 # curl http://$(kubectl get services objstorage -o jsonpath='{.spec.clusterIP}'):5003
 SWH Objstorage API server%
 ```
 
 ## Start the storage
 
 - Start the db
 ```
 # cd kubernetes
 
 # kubectl apply -f 05-storage-db.yml
 persistentvolume/storage-db-pv created
 persistentvolumeclaim/storage-db-pvc created
 secret/storage-db created
 configmap/storage-db created
 deployment.apps/storage-db created
 service/storage-db created
 
 # kubectl get pods
 NAME                                   READY   STATUS    RESTARTS   AGE
 registry-deployment-7595868dc8-657ps   1/1     Running   0          46m
 objstorage-8587d58b68-76jbn            1/1     Running   0          15m
 storage-db-64b7f8b684-48n7w            1/1     Running   0          4m52s
 
 # kubectl get services storage-db
 NAME         TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)    AGE
 storage-db   ClusterIP   10.43.213.178   <none>        5432/TCP   8m19s
 ```
 - Start the storage
 ```
 # cd kubernetes
 
 # kubectl apply -f 11-storage.yml
 configmap/storage created
 deployment.apps/storage created
 service/storage created
 ```
 
 - Test the service
 ```
 # kubectl get pods
 NAME                                   READY   STATUS    RESTARTS   AGE
 registry-deployment-7595868dc8-657ps   1/1     Running   0          49m
 storage-db-64b7f8b684-48n7w            1/1     Running   0          7m40s
 storage-6b759fb974-w9rzj               1/1     Running   0          66s
 
 # kubectl get services storage
 NAME      TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)    AGE
 storage   ClusterIP   10.43.212.116   <none>        5002/TCP   2m24s
 
 # curl http://$(kubectl get services storage -o jsonpath='{.spec.clusterIP}'):5002
 <html>
 <head><title>Software Heritage storage server</title></head>
 <body>
 <p>You have reached the
 <a href="https://www.softwareheritage.org/">Software Heritage</a>
 storage server.<br />
 See its
 <a href="https://docs.softwareheritage.org/devel/swh-storage/">documentation
 and API</a> for more information</p>
 </body>
 </html>
 ```
 
+## Start the scheduler
+
+- Start the db
+
+```
+# cd kubernetes
+
+# kubectl apply -f 15-scheduler-db.yml
+persistentvolume/scheduler-db-pv unchanged
+persistentvolumeclaim/scheduler-db-pvc created
+secret/scheduler-db configured
+configmap/scheduler-db unchanged
+deployment.apps/scheduler-db unchanged
+service/scheduler-db unchanged
+
+# kubectl get services scheduler-db
+NAME           TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)    AGE
+scheduler-db   ClusterIP   10.43.115.249   <none>        5433/TCP   110s
+```
+
+- Test the service
+
+```
+# kubectl apply -f 20-scheduler.yml
+configmap/scheduler created
+deployment.apps/scheduler created
+service/scheduler created
+ingress.networking.k8s.io/scheduler created
+
+# kubectl get services scheduler
+NAME        TYPE        CLUSTER-IP     EXTERNAL-IP   PORT(S)    AGE
+scheduler   ClusterIP   10.43.218.74   <none>        5008/TCP   23s
+
+# kubectl get pods              NAME                                  READY   STATUS    RESTARTS   AGE
+registry-deployment-5f6894c5b-9wkmr   1/1     Running   0          28m
+objstorage-5b87c549b6-f6jvc           1/1     Running   0          12m
+storage-db-79bfbff68-mg7fr            1/1     Running   0          107s
+storage-6bfcb87b6-7s7t8               1/1     Running   0          87s
+scheduler-db-666c8dc8b4-qxm9d         1/1     Running   0          73s
+scheduler-595f944854-hbsj4            1/1     Running   0          62s
+
+# curl http://$(kubectl get services scheduler -o jsonpath='{.spec.clusterIP}'):5008
+<html>
+<head><title>Software Heritage scheduler RPC server</title></head>
+<body>
+<p>You have reached the
+<a href="https://www.softwareheritage.org/">Software Heritage</a>
+scheduler RPC server.<br />
+See its
+<a href="https://docs.softwareheritage.org/devel/swh-scheduler/">documentation
+and API</a> for more information</p>
+</body>
+</html>%
+```
+
 ## Development
 
 ### Skaffold
 
 To start the development environment using skaffold, use the following command:
 
 ```
 skaffold  --default-repo registry.default dev
 ```
 
 It will build the images, deploy them on the local registry and start the services.
 It will monitor the projects to detect the changes and restart the containers when needed
diff --git a/skaffold.yaml b/skaffold.yaml
index bb0e86b..51c4507 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -1,28 +1,36 @@
 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
 deploy:
   kubectl:
     manifests:
     - kubernetes/01-journal.yml
     - kubernetes/05-storage-db.yml
     - kubernetes/10-objstorage.yml
     - kubernetes/11-storage.yml
+    - kubernetes/15-scheduler-db.yml
+    - kubernetes/20-scheduler.yml