diff --git a/.github/workflows/cd-push.yml b/.github/workflows/cd-push.yml
index d322b718..ec411374 100644
--- a/.github/workflows/cd-push.yml
+++ b/.github/workflows/cd-push.yml
@@ -21,8 +21,11 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Step Short SHA
-        run: echo "::set-output short_sha=${GITHUB_SHA::8}"
+      - name: Compute Short SHA
+        uses: benjlevesque/short-sha@v1.2
+        id: short-sha
+        with:
+          length: 7
 
       - name: Build and Push latest
         uses: docker/build-push-action@v2
@@ -31,4 +34,4 @@ jobs:
           tags: |
             bigbluebutton/greenlight:master
             bigbluebutton/greenlight:latest
-          build-args: version_code=${{ steps.vars.outputs.short_sha  }}
+          build-args: version_code=${{ steps.short-sha.outputs.sha }}
diff --git a/.github/workflows/cd-release.yml b/.github/workflows/cd-release.yml
index a33fbeb5..c335710a 100644
--- a/.github/workflows/cd-release.yml
+++ b/.github/workflows/cd-release.yml
@@ -27,5 +27,5 @@ jobs:
           tags: |
             bigbluebutton/greenlight:latest
             bigbluebutton/greenlight:v2
-            bigbluebutton/greenlight:${{ GITHUB_REF##*/ }}
-          build-args: version_code=${{ GITHUB_REF##*/release- }}
+            bigbluebutton/greenlight:${{ github.event.release.tag_name }}
+          build-args: version_code=${{ github.event.release.tag_name }}