diff --git a/.github/workflows/cd-push.yml b/.github/workflows/cd-push.yml
index f1b5172407..2749d252b5 100644
--- a/.github/workflows/cd-push.yml
+++ b/.github/workflows/cd-push.yml
@@ -21,13 +21,16 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - uses: benjlevesque/short-sha@v1.2
+        id: short-sha
+        with:
+          length: 7
+
       - name: Build and Push latest
         uses: docker/build-push-action@v2
-        env: 
-          SHORT_SHA: ${GITHUB_SHA::8}
         with:
           push: true
           tags: |
             bigbluebutton/greenlight:master
             bigbluebutton/greenlight:latest
-          build-args: version_code=${SHORT_SHA}
+          build-args: version_code=${{ steps.short-sha.outputs.sha }}