diff --git a/k8s/auth-service/values-prod.yaml b/k8s/auth-service/values-prod.yaml
index 0eecca5c8e..966b57665a 100644
--- a/k8s/auth-service/values-prod.yaml
+++ b/k8s/auth-service/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-auth-api
-  tag: prod-ae9b1fab-1706224159
+  tag: prod-0daa6308-1706226127
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/auth-service/values-stage.yaml b/k8s/auth-service/values-stage.yaml
index 889bece30b..b885f502f4 100644
--- a/k8s/auth-service/values-stage.yaml
+++ b/k8s/auth-service/values-stage.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-auth-api
-  tag: stage-f47db6d2-1706169741
+  tag: stage-9c5e5eb9-1706226064
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/data-proxy/values-prod.yaml b/k8s/data-proxy/values-prod.yaml
index 2acae9a73b..669c8b2d97 100644
--- a/k8s/data-proxy/values-prod.yaml
+++ b/k8s/data-proxy/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-data-proxy-api
-  tag: prod-ae9b1fab-1706224159
+  tag: prod-0daa6308-1706226127
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/device-registry/values-prod.yaml b/k8s/device-registry/values-prod.yaml
index 40da4cfda5..eb6a73a2d7 100644
--- a/k8s/device-registry/values-prod.yaml
+++ b/k8s/device-registry/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-device-registry-api
-  tag: prod-ae9b1fab-1706224159
+  tag: prod-0daa6308-1706226127
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/gp-model/values-prod.yaml b/k8s/gp-model/values-prod.yaml
index 27c35745a4..3207a0b0f5 100644
--- a/k8s/gp-model/values-prod.yaml
+++ b/k8s/gp-model/values-prod.yaml
@@ -6,7 +6,7 @@ app:
   namespace: production
   configMap: env-gp-model-production
 images:
-  tag: prod-ae9b1fab-1706224159
+  tag: prod-0daa6308-1706226127
   repositories:
     cronJob: eu.gcr.io/airqo-250220/airqo-gp-model-job
     brokerConsumer: eu.gcr.io/airqo-250220/airqo-gp-model-broker-consumer
diff --git a/k8s/predict/values-prod.yaml b/k8s/predict/values-prod.yaml
index 9487b17f67..a5771ba9f7 100644
--- a/k8s/predict/values-prod.yaml
+++ b/k8s/predict/values-prod.yaml
@@ -7,7 +7,7 @@ images:
     predictJob: eu.gcr.io/airqo-250220/airqo-predict-job
     trainJob: eu.gcr.io/airqo-250220/airqo-train-job
     predictPlaces: eu.gcr.io/airqo-250220/airqo-predict-places-air-quality
-  tag: prod-ae9b1fab-1706224159
+  tag: prod-0daa6308-1706226127
 api:
   name: airqo-prediction-api
   label: prediction-api
diff --git a/k8s/workflows/values-prod.yaml b/k8s/workflows/values-prod.yaml
index 99a345bc74..5063363144 100644
--- a/k8s/workflows/values-prod.yaml
+++ b/k8s/workflows/values-prod.yaml
@@ -9,7 +9,7 @@ images:
   repositories:
     initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom
     containers: eu.gcr.io/airqo-250220/airqo-workflows
-  tag: prod-ae9b1fab-1706224159
+  tag: prod-0daa6308-1706226127
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/src/device-registry/utils/create-grid.js b/src/device-registry/utils/create-grid.js
index f5f16764cc..af3694e29c 100644
--- a/src/device-registry/utils/create-grid.js
+++ b/src/device-registry/utils/create-grid.js
@@ -267,27 +267,27 @@ const createGrid = {
         }
 
         // Remove old grid_ids from sites
-        // const pullResponse = await SiteModel(tenant).updateMany(
-        //   {
-        //     _id: { $in: batchSiteIds },
-        //     grids: { $ne: grid_id.toString() },
-        //   },
-        //   {
-        //     $pull: { grids: { $ne: grid_id.toString() } },
-        //   }
-        // );
-
-        // Remove the Grid from Sites which no longer have devices deployed to them
         const pullResponse = await SiteModel(tenant).updateMany(
           {
-            _id: { $nin: batchSiteIds }, // Select sites not in batchSiteIds
-            grids: { $in: [grid_id.toString()] }, // Select sites that contain the grid_id
+            _id: { $in: batchSiteIds },
+            grids: { $ne: grid_id.toString() },
           },
           {
-            $pull: { grids: grid_id.toString() }, // Remove grid_id from the selected sites
+            $pull: { grids: { $ne: grid_id.toString() } },
           }
         );
 
+        // Remove the Grid from Sites which no longer have devices deployed to them
+        // const pullResponse = await SiteModel(tenant).updateMany(
+        //   {
+        //     _id: { $nin: batchSiteIds }, // Select sites not in batchSiteIds
+        //     grids: { $in: [grid_id.toString()] }, // Select sites that contain the grid_id
+        //   },
+        //   {
+        //     $pull: { grids: grid_id.toString() }, // Remove grid_id from the selected sites
+        //   }
+        // );
+
         logObject("pullResponse", pullResponse);
 
         // Check if pull operation was successful