diff --git a/ci/k8s/deployment.yml b/ci/k8s/deployment.yml
index 4d26125deb..71d70162be 100644
--- a/ci/k8s/deployment.yml
+++ b/ci/k8s/deployment.yml
@@ -22,6 +22,21 @@ spec:
       annotations:
         prometheus.io/scrape: 'true'
     spec:
+      tolerations:
+        - key: "akvo-app"
+          operator: "Equal"
+          value: "rsr-dedicated"
+          effect: "NoSchedule"
+      affinity:
+        nodeAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 1
+              preference:
+                matchExpressions:
+                  - key: "akvo-app"
+                    operator: "In"
+                    values:
+                      - "rsr-dedicated"
       containers:
       - name: rsr-nginx
         image: eu.gcr.io/akvo-lumen/rsr-nginx:${TRAVIS_COMMIT}
@@ -91,7 +106,7 @@ spec:
             path: /healthz
             port: 8000
           initialDelaySeconds: 30
-          timeoutSeconds: 1
+          timeoutSeconds: 5
           failureThreshold: 12
           periodSeconds: 10
         readinessProbe:
@@ -99,7 +114,7 @@ spec:
             path: /healthz
             port: 8000
           initialDelaySeconds: 30
-          timeoutSeconds: 1
+          timeoutSeconds: 5
           failureThreshold: 12
           periodSeconds: 10
         volumeMounts: