diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07e8b95..302f26d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,12 +29,6 @@ variables:
   FORCE_DEPLOY:               ""        # boolean: true or false - triggers the deploy-production stage
   FORCE_DOCKER_TAG:           ""        # choose an existing docker tag to be deployed (e.g. v1.2.3)
 
-  # Vault variables (Optional)
-  VAULT_SERVER_URL:           "https://vault.parity-mgmt-vault.parity.io"
-  VAULT_AUTH_PATH:            "gitlab-parity-io-jwt"
-  VAULT_AUTH_ROLE:            "cicd_gitlab_parity_${CI_PROJECT_NAME}"
-
-
 default:
   before_script:
     - |-
@@ -61,15 +55,6 @@ stages:
 
 
 # Pipeline Job Templates:
-.vault-secrets:           &vault-secrets
-  secrets:
-    DOCKER_HUB_USER:
-      vault:              cicd/gitlab/parity/DOCKER_HUB_USER@kv
-      file:               false
-    DOCKER_HUB_PASS:
-      vault:              cicd/gitlab/parity/DOCKER_HUB_PASS@kv
-      file:               false
-
 .dockerize:               &dockerize
   stage:                  build
   image:                  quay.io/buildah/stable
@@ -86,8 +71,8 @@ stages:
         --format=docker \
         --tag "$CONTAINER_REPO:$DOCKER_IMAGE_TAG" "$DOCKERFILE_DIRECTORY"
       fi
-    - echo ${DOCKER_HUB_PASS} |
-        buildah login --username ${DOCKER_HUB_USER} --password-stdin docker.io
+    - echo ${Docker_Hub_Pass_Parity} |
+        buildah login --username ${Docker_Hub_User_Parity} --password-stdin docker.io
     - |-
       echo pushing "$CONTAINER_REPO:$DOCKER_IMAGE_TAG"
       if [[ $BUILD_LATEST_IMAGE ]]; then
@@ -148,14 +133,12 @@ build-backend:
     CONTAINER_REPO:       "docker.io/parity/substrate-telemetry-backend"
     DOCKERFILE_DIRECTORY: "./backend/"
   <<:                     *dockerize
-  <<:                     *vault-secrets
 
 build-frontend:
   variables:
     CONTAINER_REPO:       "docker.io/parity/substrate-telemetry-frontend"
     DOCKERFILE_DIRECTORY: "./frontend/"
   <<:                     *dockerize
-  <<:                     *vault-secrets
 
 deploy-staging:
   variables: