diff --git a/.github/workflows/api-ee.yaml b/.github/workflows/api-ee.yaml
index e77a80565..db1653376 100644
--- a/.github/workflows/api-ee.yaml
+++ b/.github/workflows/api-ee.yaml
@@ -43,7 +43,7 @@ jobs:
       id: build-image
       env:
         DOCKER_REPO: ${{ secrets.EE_REGISTRY_URL }}
-        IMAGE_TAG: ${{ github.sha }}-ee
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
       run: |
         cd api
@@ -91,7 +91,7 @@ jobs:
       env:
         DOCKER_REPO: ${{ secrets.EE_REGISTRY_URL }}
         # We're not passing -ee flag, because helm will add that.
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
 
     # - name: Debug Job
diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
index 2f11de7e4..6aac079cd 100644
--- a/.github/workflows/api.yaml
+++ b/.github/workflows/api.yaml
@@ -42,7 +42,7 @@ jobs:
       id: build-image
       env:
         DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
       run: |
         cd api
@@ -90,7 +90,7 @@ jobs:
         helm template openreplay -n app openreplay -f vars.yaml -f /tmp/image_override.yaml --set ingress-nginx.enabled=false --set skipMigration=true --no-hooks | kubectl apply -n app -f -
       env:
         DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
 
     # - name: Debug Job
diff --git a/.github/workflows/frontend.yaml b/.github/workflows/frontend.yaml
index 4b2d9cd93..0d2c31a72 100644
--- a/.github/workflows/frontend.yaml
+++ b/.github/workflows/frontend.yaml
@@ -41,7 +41,7 @@ jobs:
       id: build-image
       env:
         DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
       run: |
         set -x
@@ -84,7 +84,7 @@ jobs:
         helm template openreplay -n app openreplay -f vars.yaml -f /tmp/image_override.yaml --set ingress-nginx.enabled=false --set skipMigration=true --no-hooks | kubectl apply -n app -f -
       env:
         DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
 
 
@@ -130,7 +130,7 @@ jobs:
       env:
         DOCKER_REPO: ${{ secrets.EE_REGISTRY_URL }}
         # We're not passing -ee flag, because helm will add that.
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
 
     # - name: Debug Job
diff --git a/.github/workflows/utilities.yaml b/.github/workflows/utilities.yaml
index 8a1e5b457..29e5d1938 100644
--- a/.github/workflows/utilities.yaml
+++ b/.github/workflows/utilities.yaml
@@ -36,7 +36,7 @@ jobs:
       id: build-image
       env:
         DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
       run: |
         cd utilities
@@ -53,7 +53,7 @@ jobs:
         bash kube-install.sh --app utilities
       env:
         DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
 
     # - name: Debug Job
diff --git a/.github/workflows/workers-ee.yaml b/.github/workflows/workers-ee.yaml
index d1b06a9fb..352b43842 100644
--- a/.github/workflows/workers-ee.yaml
+++ b/.github/workflows/workers-ee.yaml
@@ -49,7 +49,7 @@ jobs:
       id: build-image
       env:
         DOCKER_REPO: ${{ secrets.EE_REGISTRY_URL }}
-        IMAGE_TAG: ${{ github.sha }}-ee
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
       run: |
         #
@@ -96,7 +96,7 @@ jobs:
     - name: Deploying to kuberntes
       env:
         # We're not passing -ee flag, because helm will add that.
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
       run: |
         #
         # Deploying image to environment.
diff --git a/.github/workflows/workers.yaml b/.github/workflows/workers.yaml
index 2f215470b..bade2586e 100644
--- a/.github/workflows/workers.yaml
+++ b/.github/workflows/workers.yaml
@@ -49,7 +49,7 @@ jobs:
       id: build-image
       env:
         DOCKER_REPO: ${{ secrets.OSS_REGISTRY_URL }}
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
         ENVIRONMENT: staging
       run: |
         #
@@ -95,7 +95,7 @@ jobs:
 
     - name: Deploying to kuberntes
       env:
-        IMAGE_TAG: ${{ github.sha }}
+        IMAGE_TAG: ${{env.GITHUB_REF_NAME}}_${{ github.sha }}
       run: |
         #
         # Deploying image to environment.