diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index dc0abb6..23489d7 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -99,7 +99,7 @@ jobs:
           push: true
           tags: |
             docker.savin.nyc/${{ github.event.repository.name }}:nightly
-            docker.savin.nyc/${{ github.event.repository.name }}:${{ steps.vars.outputs.COMMIT_SHA_SHORT }}
+            docker.savin.nyc/${{ github.event.repository.name }}:${{ steps.version_step.outputs.COMMIT_SHA_SHORT }}
 #            ${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
 #            latest
 #          build-args: |
@@ -119,7 +119,7 @@ jobs:
              -H 'Content-Type: application/json' \
              -H 'Authorization: Basic ${{ echo -n "secrets.SECRET_USERNAME:secrets.SECRET_PASSWORD" | base64 }}' \
              -H 'Authorization: token ${{ secrets.GHA_TOKEN }}' \
-             -d '{"ref":"${{ github.ref }}","inputs":{"Version":"${{ steps.vars.outputs.COMMIT_SHA_SHORT }}","Env":"${{ github.ref_name}}"}}'
+             -d '{"ref":"${{ github.ref }}","inputs":{"Version":"${{ steps.version_step.outputs.COMMIT_SHA_SHORT }}","Env":"${{ github.ref_name}}"}}'
         shell: bash
 #      - name: Auto Deploy (Dev)
 ##        if: ${{ contains(github.ref, 'develop') and env.AUTO_DEPLOY_DEV == 'true' }}