diff --git a/kubernetes/05-storage-db.yml b/kubernetes/05-storage-db.yml
index a62ddf1..f842e17 100644
--- a/kubernetes/05-storage-db.yml
+++ b/kubernetes/05-storage-db.yml
@@ -1,125 +1,131 @@
 ---
 apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: storage-db-pv
 spec:
   capacity:
     storage: 10Gi
   volumeMode: Filesystem
   accessModes:
   - ReadWriteOnce
   persistentVolumeReclaimPolicy: Delete
   storageClassName: storage-db
   local:
-    path: /srv/softwareheritage/dev/storage-db
+    path: /srv/softwareheritage-kube/dev/storage-db
   nodeAffinity:
     required:
       nodeSelectorTerms:
       - matchExpressions:
         # TODO adapt for your needs
         - key: kubernetes.io/os
           operator: In
           values:
           - linux
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: storage-db-pvc
 spec:
   accessModes:
   - ReadWriteOnce
   storageClassName: storage-db
   resources:
     requests:
       storage: 10Gi
-
 ---
 ## TODO Change this to your real postgresql password
 apiVersion: v1
 kind: Secret
 metadata:
   name: storage-db
 type: Opaque
 # data:
 #   POSTGRES_PASSWORD: |
 #         "echo 'strong password' | base64"
 stringData:
   POSTGRES_PASSWORD: swh
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: storage-db
 data:
   # property-like keys; each key maps to a simple value
   POSTGRES_USER: swh
   POSTGRES_DB: swh
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: storage-db
   labels:
     app: storage-db
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: storage-db
   template:
     metadata:
       labels:
         app: storage-db
     spec:
       containers:
       - name: storage-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: storage-db
                 key: POSTGRES_USER
           - name: POSTGRES_PASSWORD
             valueFrom:
               secretKeyRef:
                 name: storage-db
                 key: POSTGRES_PASSWORD
           - name: POSTGRES_DB
             valueFrom:
               configMapKeyRef:
                 name: storage-db
                 key: POSTGRES_DB
         volumeMounts:
         - mountPath: "/var/lib/postgresql"
           name: storage-db-pvc
+        resources:
+          requests:
+            memory: "512Mi"
+            cpu: "250m"
+          limits:
+            memory: "1024Mi"
+            cpu: "500m"
       volumes:
         - name: storage-db-pvc
           persistentVolumeClaim:
             claimName: storage-db-pvc
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: storage-db
 spec:
   type: ClusterIP
   selector:
     app: storage-db
   ports:
     - port: 5432
       targetPort: 5432
diff --git a/kubernetes/10-objstorage.yml b/kubernetes/10-objstorage.yml
index 6490d56..062db97 100644
--- a/kubernetes/10-objstorage.yml
+++ b/kubernetes/10-objstorage.yml
@@ -1,155 +1,162 @@
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: objstorage
 data:
   config.yml: |
     objstorage:
       cls: pathslicing
       args:
         root: "/srv/softwareheritage/objects"
         slicing: 0:5
     client_max_size: 1073741824
   entrypoint.sh: |
     #!/bin/bash
 
     set -e
 
     # source /srv/softwareheritage/utils/pyutils.sh
     # setup_pip
 
     # echo Installed Python packages:
     # pip list
 
     echo Starting the swh-objstorage API server
     exec gunicorn --bind 0.0.0.0:5003 \
       --worker-class aiohttp.worker.GunicornWebWorker \
       --log-level DEBUG \
       --threads 4 \
       --workers 2 \
       --reload \
       --timeout 3600 \
       --config 'python:swh.core.api.gunicorn_config' \
       'swh.objstorage.api.server:make_app_from_configfile()'
 ---
 apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: objstorage-pv
 spec:
   capacity:
     storage: 10Gi
   volumeMode: Filesystem
   accessModes:
   - ReadWriteOnce
   persistentVolumeReclaimPolicy: Delete
   storageClassName: objstorage-pv
   local:
     path: /srv/softwareheritage-kube/objects
   nodeAffinity:
     required:
       nodeSelectorTerms:
       - matchExpressions:
         # TODO adapt for your needs
         - key: kubernetes.io/os
           operator: In
           values:
           - linux
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: objstorage-pvc
 spec:
   accessModes:
   - ReadWriteOnce
   storageClassName: objstorage-pv
   resources:
     requests:
       storage: 10Gi
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: objstorage
   labels:
     app: objstorage
 spec:
   replicas: 1
   selector:
     matchLabels:
       app: objstorage
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 1
   template:
     metadata:
       labels:
         app: objstorage
     spec:
       containers:
       - name: objstorage
         image: swh/objstorage:latest
         command: 
           - /entrypoint.sh
         ports:
         - containerPort: 5003
         env:
         - name: PORT
           value: "5003"
         - name: STATSD_HOST
           value: "prometheus-statsd-exporter"
         - name: STATSD_PORT
           value: "9125"
         - name: SWH_CONFIG_FILENAME
           value: /etc/softwareheritage/config.yml
         volumeMounts:
         - mountPath: "/srv/softwareheritage/objects"
           name: objstorage-pvc
         - 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: objstorage
             defaultMode: 0777
         - name: objstorage-pvc
           persistentVolumeClaim:
             claimName: objstorage-pvc
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: objstorage
 spec:
   type: ClusterIP
   selector:
     app: objstorage
   ports:
     - port: 5003
       targetPort: 5003
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: objstorage
 spec:
   rules:
   - host: objstorage.default
     http:
       paths:
       - path: /
         pathType: Prefix
         backend:
           service:
             name: objstorage
             port: 
               number: 5003