diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df483a01..2af09783 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,16 +20,14 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Make docker image
-        working-directory: .
-        run: make docker-build
-
       - name: Add SHORT_SHA env property with commit short sha
-        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-7`" >> $GITHUB_ENV
 
-      - name: Retag docker image
+      - name: Make docker image
         working-directory: .
-        run: docker tag stellar/stellar-etl:${SHORT_SHA} stellar/stellar-etl-dev:${SHORT_SHA}
+        run: make docker-build
+        env:
+          ETLHASH: stellar/stellar-etl-dev:${SHORT_SHA}
 
       - name: Push docker image
         working-directory: .