diff --git a/.github/workflows/deploy-frontend-pr-previews.yml b/.github/workflows/deploy-frontend-pr-previews.yml
index b477dadaa1..548a9e004b 100644
--- a/.github/workflows/deploy-frontend-pr-previews.yml
+++ b/.github/workflows/deploy-frontend-pr-previews.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - staging
 
+env:
+  REGISTRY_URL: gcr.io
+  PROJECT_ID: airqo-250220
+
 jobs:
   branch-name:
     name: Format branch name string
@@ -117,6 +121,8 @@ jobs:
           cd netmanager/
           docker build --tag ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/netmanager-pr-previews:${{ github.sha }} ./
           docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/netmanager-pr-previews:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/netmanager-pr-previews:${{ github.sha }} ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/netmanager-pr-previews:latest
+          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/netmanager-pr-previews:latest
 
       - name: Deploy to Cloud Run
         run: |-
@@ -133,20 +139,6 @@ jobs:
             --command="/bin/sh","-c","cat /etc/env/.env >> /etc/environment; nginx -g 'daemon off;'" \
             --allow-unauthenticated
 
-      - name: Update corresponding helm values file
-        uses: fjogeleit/yaml-update-action@main
-        with:
-          valueFile: "k8s/netmanager/values-dev.yaml"
-          updateFile: true
-          branch: deployment/argocd
-          message: "Update (dev)netmanager image for PR:${{ needs.branch-name.outputs.lowercase }}"
-          createPR: false
-          changes: |
-            {
-              "image.repository": "${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/netmanager-pr-previews",
-              "image.tag": "${{ github.sha }}"
-            }
-
       - name: Get preview service url
         id: preview-url
         run: |
@@ -216,6 +208,8 @@ jobs:
           cd calibrate/
           docker build --tag ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:${{ github.sha }} .
           docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:${{ github.sha }} ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:latest
+          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews:latest
 
       - name: Deploy to Cloud Run
         run: |-
@@ -232,20 +226,6 @@ jobs:
             --command="/bin/sh","-c","cat /etc/env/.env >> /etc/environment; nginx -g 'daemon off;'" \
             --allow-unauthenticated
 
-      - name: Update corresponding helm values file
-        uses: fjogeleit/yaml-update-action@main
-        with:
-          valueFile: "k8s/calibrate/values-dev.yaml"
-          updateFile: true
-          branch: deployment/argocd
-          message: "Update (dev)calibrate app image for PR:${{ needs.branch-name.outputs.lowercase }}"
-          createPR: false
-          changes: |
-            {
-              "image.repository": "${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/calibrate-app-pr-previews",
-              "image.tag": "${{ github.sha }}"
-            }
-
       - name: Get preview service url
         id: preview-url
         run: |
@@ -306,6 +286,8 @@ jobs:
           cd platform/
           docker build --tag ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/next-platform-pr-previews:${{ github.sha }} .
           docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/next-platform-pr-previews:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/next-platform-pr-previews:${{ github.sha }} ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/next-platform-pr-previews:latest
+          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/next-platform-pr-previews:latest
 
       - name: Deploy to Cloud Run
         run: |-
@@ -320,20 +302,6 @@ jobs:
             --memory=256Mi \
             --allow-unauthenticated
 
-      - name: Update corresponding helm values file
-        uses: fjogeleit/yaml-update-action@main
-        with:
-          valueFile: "k8s/platform/values-dev.yaml"
-          updateFile: true
-          branch: deployment/argocd
-          message: "Update (dev)next platform image for PR:${{ needs.branch-name.outputs.lowercase }}"
-          createPR: false
-          changes: |
-            {
-              "image.repository": "${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/next-platform-pr-previews",
-              "image.tag": "${{ github.sha }}"
-            }
-
       - name: Get preview service url
         id: preview-url
         run: |
@@ -391,6 +359,8 @@ jobs:
           cd docs/
           docker build --tag ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/docs-pr-previews:${{ github.sha }} .
           docker push ${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/docs-pr-previews:${{ github.sha }}
+          docker tag ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/docs-pr-previews:${{ github.sha }} ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/docs-pr-previews:latest
+          docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/pr-previews/docs-pr-previews:latest
 
       - name: Deploy to Cloud Run
         run: |-
@@ -405,20 +375,6 @@ jobs:
             --memory=256Mi \
             --allow-unauthenticated
 
-      - name: Update corresponding helm values file
-        uses: fjogeleit/yaml-update-action@main
-        with:
-          valueFile: "k8s/docs/values-dev.yaml"
-          updateFile: true
-          branch: deployment/argocd
-          message: "Update (dev)docs app image for PR:${{ needs.branch-name.outputs.lowercase }}"
-          createPR: false
-          changes: |
-            {
-              "image.repository": "${{ secrets.REGISTRY_URL }}/${{ secrets.PROJECT_ID }}/pr-previews/docs-pr-previews",
-              "image.tag": "${{ github.sha }}"
-            }
-
       - name: Get preview service url
         id: preview-url
         run: |
diff --git a/k8s/calibrate/charts/.gitkeep b/k8s/calibrate/charts/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/k8s/calibrate/templates/tests/test-connection.yaml b/k8s/calibrate/templates/tests/test-connection.yaml
new file mode 100644
index 0000000000..b1586c4461
--- /dev/null
+++ b/k8s/calibrate/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "calibrate-app.fullname" . }}-test-connection"
+  labels:
+{{ include "calibrate-app.labels" . | indent 4 }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args:  ['{{ include "calibrate-app.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/k8s/calibrate/values-dev.yaml b/k8s/calibrate/values-dev.yaml
index 32937a7049..b4a96494ad 100644
--- a/k8s/calibrate/values-dev.yaml
+++ b/k8s/calibrate/values-dev.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: gcr.io/airqo-250220/airqo-dev-calibrate-app
+  repository: gcr.io/airqo-250220/pr-previews/calibrate-app-pr-previews
   pullPolicy: Always
   tag: latest
 
diff --git a/k8s/docs/charts/.gitkeep b/k8s/docs/charts/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/k8s/docs/templates/tests/test-connection.yaml b/k8s/docs/templates/tests/test-connection.yaml
new file mode 100644
index 0000000000..a933c654de
--- /dev/null
+++ b/k8s/docs/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "airqo-docs.fullname" . }}-test-connection"
+  labels:
+{{ include "airqo-docs.labels" . | indent 4 }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args:  ['{{ include "airqo-docs.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/k8s/docs/values-dev.yaml b/k8s/docs/values-dev.yaml
index 82b753ca71..43284c10a6 100644
--- a/k8s/docs/values-dev.yaml
+++ b/k8s/docs/values-dev.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: gcr.io/airqo-250220/airqo-dev-docs
+  repository: gcr.io/airqo-250220/pr-previews/docs-pr-previews
   pullPolicy: Always
   tag: latest
 
diff --git a/k8s/docs/values-stage.yaml b/k8s/docs/values-stage.yaml
index 74fa05e057..2ebd05c8c6 100644
--- a/k8s/docs/values-stage.yaml
+++ b/k8s/docs/values-stage.yaml
@@ -1,13 +1,9 @@
-# Default values for airqo-docs.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
 replicaCount: 1
 
 image:
   repository: gcr.io/airqo-250220/airqo-stage-docs
   pullPolicy: Always
-  tag: latest
+  tag: stage-090ad16f-1667922055
 
 imagePullSecrets: []
 nameOverride: ""
@@ -53,7 +49,6 @@ autoscaling:
   # targetMemoryUtilizationPercentage: 80
 
 nodeSelector: {}
-
 tolerations: []
 
 affinity:
diff --git a/k8s/netmanager/values-dev.yaml b/k8s/netmanager/values-dev.yaml
index 5fff9866f2..44178a90a5 100644
--- a/k8s/netmanager/values-dev.yaml
+++ b/k8s/netmanager/values-dev.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: airqo-dev-platform-frontend
+  repository: gcr.io/airqo-250220/pr-previews/netmanager-pr-previews
   tag: latest
   pullPolicy: Always
 
diff --git a/k8s/netmanager/values-stage.yaml b/k8s/netmanager/values-stage.yaml
index ef752637cc..248b5fe337 100644
--- a/k8s/netmanager/values-stage.yaml
+++ b/k8s/netmanager/values-stage.yaml
@@ -3,25 +3,20 @@
 # Declare variables to be passed into your templates.
 
 replicaCount: 2
-
 image:
   repository: gcr.io/airqo-250220/airqo-stage-platform-frontend
-  tag: latest
+  tag: stage-45ddd0db-1667922355
   pullPolicy: Always
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
-
 service:
   type: NodePort
   nodePort: 31101
   targetPort: 80
   port: 80
-
 ingress:
   enabled: false
-
 nodeSelector: {}
 torelations: {}
 
diff --git a/k8s/platform/charts/.gitkeep b/k8s/platform/charts/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/k8s/platform/templates/tests/test-connection.yaml b/k8s/platform/templates/tests/test-connection.yaml
new file mode 100644
index 0000000000..20e7a84822
--- /dev/null
+++ b/k8s/platform/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "platform.fullname" . }}-test-connection"
+  labels:
+{{ include "platform.labels" . | indent 4 }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args:  ['{{ include "platform.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/k8s/platform/values-dev.yaml b/k8s/platform/values-dev.yaml
index c42c2a4396..70c007c828 100644
--- a/k8s/platform/values-dev.yaml
+++ b/k8s/platform/values-dev.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: gcr.io/airqo-250220/airqo-dev-next-platform
+  repository: gcr.io/airqo-250220/pr-previews/next-platform-pr-previews
   pullPolicy: Always
   tag: latest