diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b2d0b1fda3cfffba046eee39466bcb5df033b5b..02a460a55d168dd68322ad43fba0ac1ce9553bfa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,6 @@ stages:
 
 variables:
   DOCKER_DRIVER: overlay2
-  GCLOUD_ENV: edge
   KUBERNETES_CPU_REQUEST: 3
   KUBERNETES_CPU_LIMIT: 5
   KUBERNETES_MEMORY_REQUEST: 2Gi
@@ -293,7 +292,7 @@ release:gitlab-docker:
     - 705-upgrade-to-corda-4-4
   dependencies: []
 
-deploy:edge:
+.base_deploy:
   image:
     name: nimmaj/cordite-gcloud-alpine:latest
   stage: deploy
@@ -307,11 +306,25 @@ deploy:edge:
     - ./etc/deploy/upgradeGkeEnv.sh ${CI_PIPELINE_ID} ${GCLOUD_ENV}
   tags:
     - kubernetes
+  dependencies:
+    - build:jar
+
+deploy:edge:
+  extends: .base_deploy
+  variables:
+    GCLOUD_ENV: "edge"
   only:
     - master
     - 705-upgrade-to-corda-4-4
-  dependencies:
-    - build:jar
+    - 713-fix-deploy-test-job-in-the-pipeline
+
+deploy:test:
+  extends: .base_deploy
+  variables:
+    GCLOUD_ENV: "test"
+  only:
+    - /v[0-9]+\.[0-9]+\.[0-9]+/
+    - 713-fix-deploy-test-job-in-the-pipeline
 
 int-test:edge:
   stage: int-test
@@ -373,24 +386,7 @@ edge-release-docker:
     - master
   dependencies: []
 
-deploy:test:
-  image:
-    name: nimmaj/cordite-gcloud-alpine:latest
-  stage: deploy
-  script:
-    - echo "${GKE_SERVICE_ACCOUNT_KEY}" > key.json
-    - gcloud auth activate-service-account --key-file=key.json
-    - gcloud config set project cicd-chorum
-    - gcloud config set container/cluster cicd
-    - gcloud config set compute/zone europe-west1-b
-    - gcloud container clusters get-credentials cicd
-    - ./etc/deploy/upgradeGkeEnv.sh ${CI_PIPELINE_ID} test
-  tags:
-    - docker
-  only:
-    - /v[0-9]+\.[0-9]+\.[0-9]+/
-  dependencies:
-    - build:jar
+
 
 int-test:test:
   stage: int-test