diff --git a/k8s/analytics/values-prod.yaml b/k8s/analytics/values-prod.yaml
index 6099ca44e5..241d49ec81 100644
--- a/k8s/analytics/values-prod.yaml
+++ b/k8s/analytics/values-prod.yaml
@@ -8,7 +8,7 @@ images:
     celeryWorker: eu.gcr.io/airqo-250220/airqo-analytics-celery-worker
     reportJob: eu.gcr.io/airqo-250220/airqo-analytics-report-job
     devicesSummaryJob: eu.gcr.io/airqo-250220/airqo-analytics-devices-summary-job
-  tag: prod-85d64e95-1734081670
+  tag: prod-875fce3e-1734088534
 api:
   name: airqo-analytics-api
   label: analytics-api
diff --git a/k8s/analytics/values-stage.yaml b/k8s/analytics/values-stage.yaml
index 767a845922..ea1e933536 100644
--- a/k8s/analytics/values-stage.yaml
+++ b/k8s/analytics/values-stage.yaml
@@ -8,7 +8,7 @@ images:
     celeryWorker: eu.gcr.io/airqo-250220/airqo-stage-analytics-celery-worker
     reportJob: eu.gcr.io/airqo-250220/airqo-stage-analytics-report-job
     devicesSummaryJob: eu.gcr.io/airqo-250220/airqo-stage-analytics-devices-summary-job
-  tag: stage-1396ff4a-1734025613
+  tag: stage-40bbbd59-1734088481
 api:
   name: airqo-stage-analytics-api
   label: sta-alytics-api
diff --git a/k8s/auth-service/values-prod.yaml b/k8s/auth-service/values-prod.yaml
index c73fe78329..9b20ee6db7 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-85d64e95-1734081670
+  tag: prod-875fce3e-1734088534
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/device-registry/values-prod.yaml b/k8s/device-registry/values-prod.yaml
index fc468f3431..10e1d25849 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-85d64e95-1734081670
+  tag: prod-875fce3e-1734088534
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/device-registry/values-stage.yaml b/k8s/device-registry/values-stage.yaml
index c24cd08854..fd13e51825 100644
--- a/k8s/device-registry/values-stage.yaml
+++ b/k8s/device-registry/values-stage.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-stage-device-registry-api
-  tag: stage-04fa3ebc-1734023297
+  tag: stage-c54fd122-1734091882
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/exceedance/values-prod-airqo.yaml b/k8s/exceedance/values-prod-airqo.yaml
index c7665b3734..e76a72c5c2 100644
--- a/k8s/exceedance/values-prod-airqo.yaml
+++ b/k8s/exceedance/values-prod-airqo.yaml
@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/airqo-exceedance-job
-  tag: prod-85d64e95-1734081670
+  tag: prod-875fce3e-1734088534
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/exceedance/values-prod-kcca.yaml b/k8s/exceedance/values-prod-kcca.yaml
index cd88bc7f25..5b8964cb9c 100644
--- a/k8s/exceedance/values-prod-kcca.yaml
+++ b/k8s/exceedance/values-prod-kcca.yaml
@@ -4,6 +4,6 @@ app:
   configmap: env-exceedance-production
 image:
   repository: eu.gcr.io/airqo-250220/kcca-exceedance-job
-  tag: prod-85d64e95-1734081670
+  tag: prod-875fce3e-1734088534
 nameOverride: ''
 fullnameOverride: ''
diff --git a/k8s/predict/values-prod.yaml b/k8s/predict/values-prod.yaml
index b68a1b63d4..10a70428d1 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-85d64e95-1734081670
+  tag: prod-875fce3e-1734088534
 api:
   name: airqo-prediction-api
   label: prediction-api
diff --git a/k8s/spatial/values-prod.yaml b/k8s/spatial/values-prod.yaml
index fc96e44b04..70aa0c11a5 100644
--- a/k8s/spatial/values-prod.yaml
+++ b/k8s/spatial/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-spatial-api
-  tag: prod-85d64e95-1734081670
+  tag: prod-875fce3e-1734088534
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/website/values-prod.yaml b/k8s/website/values-prod.yaml
index 50f0486e8d..b211da4f8b 100644
--- a/k8s/website/values-prod.yaml
+++ b/k8s/website/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-website-api
-  tag: prod-85d64e95-1734081670
+  tag: prod-875fce3e-1734088534
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/workflows/values-prod.yaml b/k8s/workflows/values-prod.yaml
index 646afe2360..f7d03f69ac 100644
--- a/k8s/workflows/values-prod.yaml
+++ b/k8s/workflows/values-prod.yaml
@@ -10,7 +10,7 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-redis
     containers: eu.gcr.io/airqo-250220/airqo-workflows
-  tag: prod-85d64e95-1734081670
+  tag: prod-875fce3e-1734088534
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/k8s/workflows/values-stage.yaml b/k8s/workflows/values-stage.yaml
index d26574bcd5..9ee4d99d8c 100644
--- a/k8s/workflows/values-stage.yaml
+++ b/k8s/workflows/values-stage.yaml
@@ -10,7 +10,7 @@ images:
     initContainer: eu.gcr.io/airqo-250220/airqo-stage-workflows-xcom
     redisContainer: eu.gcr.io/airqo-250220/airqo-stage-redis
     containers: eu.gcr.io/airqo-250220/airqo-stage-workflows
-  tag: stage-db819b80-1734014196
+  tag: stage-40bbbd59-1734088481
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}
diff --git a/src/device-registry/config/global/mappings.js b/src/device-registry/config/global/mappings.js
index 01bc44ae97..f9c4b62e6a 100644
--- a/src/device-registry/config/global/mappings.js
+++ b/src/device-registry/config/global/mappings.js
@@ -38,11 +38,15 @@ const mappings = {
     NETWORKS: ["metone", "usembassy"],
     COMBINATIONS: {
       NETWORK_PAIRS: [
-        ["metone", "usembassy", "us_embassy"],
+        ["metone", "usembassy", "us_embassy", "us-embassy"],
         ["kcca", "clarity"],
         ["urbanbetter", "airbeam", "urban_better"],
       ],
-      GROUP_PAIRS: [["metone", "usembassy"], ["kcca", "clarity"]],
+      GROUP_PAIRS: [
+        ["us-embassy", "usembassy", "us_embassy"],
+        ["kcca", "kampala"],
+        ["urbanbetter", "urban_better", "urban-better"],
+      ],
       STATUS_PAIRS: [
         ["active", "enabled", "running"],
         ["inactive", "disabled"],