diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef20c65efc56eac0bd521730c9d6d122f6db751f..de832edcd5b576aeaabd8f13451ef5d71e524aab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,6 @@ prepare_secrets:
   image: alpine:latest
   script:
     - cp $ENV_FILE .env # Also provide env file
-    - export RHOST=$CI_JOB_STAGE-$CI_ENVIRONMENT_NAME-$CI_COMMIT_SHA
-    - sed -i "s/REDIS_HOST=/REDIS_HOST=$HELM_RELEASE_NAME/g" .env
   artifacts:
     paths:
       - .env
@@ -86,7 +84,7 @@ review:
   services: 
     - redis:latest
   variables:
-    HELM_UPGRADE_EXTRA_ARGS: --set redisHost="$CI_JOB_STAGE-$CI_ENVIRONMENT_NAME-$CI_COMMIT_SHA" --set service.externalPort=80 --set service.internalPort=80 --set service.commonName= --set ingress.tls.enabled=false --set ingress.annotations.kubernetes\.io/tls-acme="false" --set ingress.annotations.nginx\.ingress\.kubernetes\.io/ssl-redirect="false"
+    HELM_UPGRADE_EXTRA_ARGS: --set service.externalPort=80 --set service.internalPort=80 --set service.commonName= --set ingress.tls.enabled=false --set ingress.annotations.kubernetes\.io/tls-acme="false" --set ingress.annotations.nginx\.ingress\.kubernetes\.io/ssl-redirect="false"
     ROLLOUT_RESOURCE_TYPE: deployment
     
 production:
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 31f503e091a0d6888771cadf1d46e81ec0da2ca8..0e9474472f73440d41032de90387177ae3f850ac 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -48,6 +48,12 @@ spec:
           value: {{ .Values.gitlab.envName }}
         - name: GITLAB_ENVIRONMENT_URL
           value: {{ .Values.gitlab.envURL }}
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: REDIS_SERVICE_NAME
+          value: {{ template "fullname" . }}-redis
         ports:
         - name: "{{ .Values.service.name }}"
           containerPort: {{ .Values.service.internalPort }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 0138b9949f84b8f4eb157f096d52fc4253781054..a53604d4c971be8f529cc2737c4883113be16ec8 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -2,7 +2,6 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 replicaCount: 1
-commitSha: 123456
 image:
   repository: gitlab.example.com/group/project
   tag: stable
diff --git a/service-configs/start.sh b/service-configs/start.sh
index 1c9857581afb225eeffec8829112ec053dd7708c..7e57f29c09e740f2e23ace96794f721211c2427f 100755
--- a/service-configs/start.sh
+++ b/service-configs/start.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Set the redis hostname
+sed -i "s/REDIS_HOST=/REDIS_HOST=${REDIS_SERVICE_NAME}.${POD_NAMESPACE}/g" .env
+
 /etc/init.d/php7.3-fpm start
 /etc/init.d/nginx start