diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c29292ea..07a3c771 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,12 +46,14 @@ jobs:
             CI_TAG="ci"
           fi
           echo "TAG=${CI_TAG}" >> $GITHUB_ENV
+          echo "IMAGE_TAG=${CI_TAG}" >> $GITHUB_ENV
           echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
 
       - name: Print Tag info
         run: |
           echo "BRANCH: ${BRANCH}"
           echo "TAG: ${TAG}"
+          echo "IMAGE_TAG: ${TAG}"
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ce9196f7..c0e95439 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,6 +28,7 @@ jobs:
       - name: Set Tag
         run: |
           IMAGE_TAG="${GITHUB_REF#refs/*/v}"
+          echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
           echo "TAG=${IMAGE_TAG}" >> $GITHUB_ENV
           echo "RELEASE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
 
diff --git a/scripts/push b/scripts/push
index fc61fd36..9bc5fe32 100755
--- a/scripts/push
+++ b/scripts/push
@@ -27,14 +27,14 @@ function pushBuildx() {
   BUILD_TAG="latest"
   TARGET_IMG=${DIMAGE}
 
-# TODO Currently ci builds with commit tag will not be generated,
-# since buildx does not support multiple repo
+  # TODO Currently ci builds with commit tag will not be generated,
+  # since buildx does not support multiple repo
   # if not a release build set the tag and ci image
   if [ -z "${RELEASE_TAG}" ]; then
     return
-#    BUILD_ID=$(git describe --tags --always)
-#    BUILD_TAG="${BRANCH}-${BUILD_ID}"
-#    TARGET_IMG="${DIMAGE}-ci"
+    #BUILD_ID=$(git describe --tags --always)
+    #BUILD_TAG="${BRANCH}-${BUILD_ID}"
+    #TARGET_IMG="${DIMAGE}-ci"
   fi
 
   echo "Tagging and pushing ${DIMAGE}:${TAG} as ${TARGET_IMG}:${BUILD_TAG}"