diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d25b0441..99001a62 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -36,6 +36,7 @@ jobs:
           git push --force
 
   unit-test:
+    needs: [Init]
     env:
       COVER: true
     runs-on: ubuntu-20.04
@@ -75,11 +76,39 @@ jobs:
         ./.github/workflows/test.sh
 
   docker:
+    needs: [Init]
     runs-on: ubuntu-20.04
     steps:
+    - uses: actions/checkout@v2
 
-    - name: Check out code
-      uses: actions/checkout@v2
+    - name: Import Secrets
+      id: secrets
+      uses: hashicorp/vault-action@v2.3.1
+      with:
+        url: ${{ secrets.VAULT_HOST }}
+        method: approle
+        roleId: ${{ secrets.VAULT_ROLE_ID }}
+        secretId: ${{ secrets.VAULT_SECRET_ID }}
+        exportEnv: true
+        secrets: |
+          devops/data/docker-repos/hsdp-edi endPoint | HSDP_DOCKER_REGISTRY ;
+          devops/data/docker-repos/hsdp-edi user | HSDP_DOCKER_USER ;
+          devops/data/docker-repos/hsdp-edi password | HSDP_DOCKER_PASSWORD ;
+          devops/data/github/users/sal-devops token | GITHUB_TOKEN ;
+
+    - name: Extract branch name
+      uses: vazco/github-actions-branch-name@v1
+      id: branch
+
+    - name: Set env variables
+      run: |
+        new_version=`cat VERSION`
+        echo "New version is: $new_version"
+        echo "VERSION=$new_version" >> "$GITHUB_ENV"
+        echo "CI_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi/edi-foundation-oauth2-proxy:${new_version}-alpha" >> "$GITHUB_ENV"
+        echo "CI_LATEST_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi/edi-foundation-oauth2-proxy:latest" >> "$GITHUB_ENV"
+        echo "BRANCH_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi/edi-foundation-oauth2-proxy:${{ steps.branch.outputs.branch_name }}-${new_version}" >> "$GITHUB_ENV"
+        echo "RC_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi/edi-foundation-oauth2-proxy:${new_version}-rc" >> "$GITHUB_ENV"
 
     - name: Docker Build
       run: |
@@ -89,9 +118,13 @@ jobs:
       run: |
           docker login --username '${{ secrets.DOCKER_USER }}' --password '${{ secrets.DOCKER_PSWD }}'  '${{ secrets.DOCKER_REPO }}' 
         
-    - name: Docker tag & Push
+    - name: Docker tag 
       run: |
-          docker tag  '${{ secrets.DOCKER_REPO }}'/oauth2-proxy:latest '${{ secrets.DOCKER_REPO }}'/edi-foundation-oauth2-proxy:${{ github.sha }}
-          docker tag  '${{ secrets.DOCKER_REPO }}'/oauth2-proxy:latest '${{ secrets.DOCKER_REPO }}'/edi-foundation-oauth2-proxy:latest
-          docker push '${{ secrets.DOCKER_REPO }}'/edi-foundation-oauth2-proxy:${{ github.sha }}
-          docker push '${{ secrets.DOCKER_REPO }}'/edi-foundation-oauth2-proxy:latest
\ No newline at end of file
+          docker tag  '${{ secrets.DOCKER_REPO }}'/oauth2-proxy:latest ${{ env.BRANCH_IMAGE }}
+          docker push ${{ env.BRANCH_IMAGE }}
+
+    - name: Docker Push
+      if: github.ref == 'refs/heads/edi-foundation-integration'
+      run: |
+        docker tag ${{ env.BRANCH_IMAGE }} ${{ env.CI_IMAGE }}
+        docker push ${{ env.CI_IMAGE }}
\ No newline at end of file