diff --git a/camtiler/application.yml b/camtiler/application.yml
index 7605fb8..e79a7f4 100644
--- a/camtiler/application.yml
+++ b/camtiler/application.yml
@@ -113,12 +113,12 @@ spec:
         revisionHistoryLimit: 0
         replicas: 1
 
-        # Make sure we do not congest the network during rollout
         strategy:
           type: RollingUpdate
           rollingUpdate:
-            maxSurge: 0
-            maxUnavailable: 1
+            # Swap following two with replicas: 2
+            maxSurge: 1
+            maxUnavailable: 0
         selector:
           matchLabels:
             app.kubernetes.io/name: foobar
@@ -196,7 +196,7 @@ spec:
                 requiredDuringSchedulingIgnoredDuringExecution:
                   - labelSelector:
                       matchExpressions:
-                        - key: app
+                        - key: app.kubernetes.io/name
                           operator: In
                           values:
                             - foobar
diff --git a/camtiler/camera-tiler.yml b/camtiler/camera-tiler.yml
index 7f6d275..6bb5b49 100644
--- a/camtiler/camera-tiler.yml
+++ b/camtiler/camera-tiler.yml
@@ -90,6 +90,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: camtiler
+      component: camera-tiler
   podMetricsEndpoints:
     - port: http
   podTargetLabels: