diff --git a/deploy/k8s/controller-deployment.yaml b/deploy/k8s/controller-deployment.yaml
index 44adffc..423a229 100644
--- a/deploy/k8s/controller-deployment.yaml
+++ b/deploy/k8s/controller-deployment.yaml
@@ -25,14 +25,16 @@ spec:
       serviceAccountName: cloudstack-csi-controller
       affinity:
         podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: "app.kubernetes.io/name"
-                operator: In
-                values:
-                - cloudstack-csi-controller
-            topologyKey: "kubernetes.io/hostname"
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: "app.kubernetes.io/name"
+                  operator: In
+                  values:
+                  - cloudstack-csi-controller
+              topologyKey: "kubernetes.io/hostname"
         nodeAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
@@ -59,7 +61,7 @@ spec:
 
       containers:
         - name: cloudstack-csi-controller
-          image: cloudstack-csi-driver
+          image: ghcr.io/shapeblue/cloudstack-csi-driver:master
           imagePullPolicy: Always
           args:
             - "controller"
diff --git a/deploy/k8s/node-daemonset.yaml b/deploy/k8s/node-daemonset.yaml
index 665312b..1b92092 100644
--- a/deploy/k8s/node-daemonset.yaml
+++ b/deploy/k8s/node-daemonset.yaml
@@ -36,7 +36,7 @@ spec:
 
       containers:
         - name: cloudstack-csi-node
-          image: cloudstack-csi-driver
+          image: ghcr.io/shapeblue/cloudstack-csi-driver:master
           imagePullPolicy: IfNotPresent
           args:
             - "node"