diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1ee6c9..f183c60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,8 @@ variables:
   BACKEND_CONTAINER_REPO:         "substrate-telemetry-backend"
   FRONTEND_CONTAINER_REPO:        "substrate-telemetry-frontend"
   KUBE_NAMESPACE:                 "substrate-telemetry"
-  BACKEND_IMAGE_FULL_NAME:        "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}"
-  BACKEND_IMAGE_LATEST_TAG:       "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:latest"
-  FRONTEND_IMAGE_FULL_NAME:       "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}"
-  FRONTEND_IMAGE_LATEST_TAG:      "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:latest"
+  BACKEND_IMAGE_FULL_NAME:        "${CONTAINER_REGISTRY}/${BACKEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}-beta"
+  FRONTEND_IMAGE_FULL_NAME:       "${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}:${CI_COMMIT_SHORT_SHA}-beta"
 
 stages:
   - dockerize
@@ -32,6 +30,7 @@ stages:
       echo "Using Helm `helm version --short`"
       helm repo add parity https://paritytech.github.io/helm-charts/
       helm repo update
+      curl -sS $HELM_VALUES_FILE > values-parity.yaml
     - helm upgrade
         --install
         --atomic
@@ -42,7 +41,7 @@ stages:
         --set image.backend.tag="${CI_COMMIT_SHORT_SHA}"
         --set image.frontend.repository="${CONTAINER_REGISTRY}/${FRONTEND_CONTAINER_REPO}"
         --set image.frontend.tag="${CI_COMMIT_SHORT_SHA}"
-        --values $HELM_VALUES_FILE
+        --values values-parity.yaml
         $KUBE_NAMESPACE parity/substrate-telemetry
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
@@ -56,13 +55,11 @@ dockerize-backend:
     - echo "Building image $BACKEND_IMAGE_FULL_NAME"
     - buildah bud
       --format=docker
-      --tag "$BACKEND_IMAGE_FULL_NAME"
-      --tag "$BACKEND_IMAGE_LATEST_TAG" ./backend/
+      --tag "$BACKEND_IMAGE_FULL_NAME" ./backend/
     - echo ${Docker_Hub_Pass_Parity} |
         buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io
     - |-
       buildah push --format=v2s2 "$BACKEND_IMAGE_FULL_NAME"
-      buildah push --format=v2s2 "$BACKEND_IMAGE_LATEST_TAG"
 
 dockerize-frontend:
   <<:                     *dockerize
@@ -70,13 +67,11 @@ dockerize-frontend:
     - echo "Building image $FRONTEND_IMAGE_FULL_NAME"
     - buildah bud
       --format=docker
-      --tag "$FRONTEND_IMAGE_FULL_NAME"
-      --tag "$FRONTEND_IMAGE_LATEST_TAG" ./frontend/
+      --tag "$FRONTEND_IMAGE_FULL_NAME" ./frontend/
     - echo ${Docker_Hub_Pass_Parity} |
         buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io
     - |-
       buildah push --format=v2s2 "$FRONTEND_IMAGE_FULL_NAME"
-      buildah push --format=v2s2 "$FRONTEND_IMAGE_LATEST_TAG"
 
 deploy-parity-stg:
   stage:                  staging