diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82567b98f979e1c5213cc322d4895c5f86dbafe4..153ce6de108bf8c7cdea83ae865071a147cb5085 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,7 @@ stages:
   - build
 
 variables:
-  CONTAINER_IMAGE: gitlab-registry.eps.surrey.ac.uk/noc/kubectl
-  CONTAINER_TAG: helm
+  CONTAINER_IMAGE_TAG: helm
 
 build:
   image:
@@ -20,8 +19,7 @@ build:
   tags:
     - noc-group-24-44
   script:
-    - docker login -u noc -p yDXtzxsCdG9mBG1KF2Ef gitlab-registry.eps.surrey.ac.uk
-    - docker build -t ${CONTAINER_IMAGE} .
-    - docker tag ${CONTAINER_IMAGE} ${CONTAINER_IMAGE}:${CONTAINER_TAG}
-    - docker push ${CONTAINER_IMAGE}:${CONTAINER_TAG}
-
+    - docker login -u ${REGISTRY_USERNAME} -p ${REGISTRY_DEPLOY_TOKEN} ${CI_REGISTRY}
+    - docker build -t ${CI_REGISTRY_IMAGE} .
+    - docker tag ${CI_REGISTRY_IMAGE} ${CI_REGISTRY_IMAGE}:${CONTAINER_IMAGE_TAG}
+    - docker push ${CI_REGISTRY_IMAGE}:${CONTAINER_IMAGE_TAG}