diff --git a/.github/workflows/build-and-push-images.yml b/.github/workflows/build-and-push-images.yml
index 94011e036f6..065b10ccc64 100644
--- a/.github/workflows/build-and-push-images.yml
+++ b/.github/workflows/build-and-push-images.yml
@@ -99,7 +99,7 @@ jobs:
 
             # If image_tag is empty, resolve to the short commit hash of the branch
             if [[ -z "$IMAGE_TAG" ]]; then
-              COMMIT_SHORT=$(gh api "repos/${{ github.repository }}/commits/${BRANCH}" --jq '.sha[:7]')
+              COMMIT_SHORT=$(gh api "repos/${{ github.repository }}/commits/${BRANCH}" --jq '.sha[:9]')
               IMAGE_TAG="$COMMIT_SHORT"
               echo "No image tag specified - using short commit hash: $IMAGE_TAG"
             fi
diff --git a/.github/workflows/create-release-candidate.yml b/.github/workflows/create-release-candidate.yml
index d15f415a906..3f2fca55a33 100644
--- a/.github/workflows/create-release-candidate.yml
+++ b/.github/workflows/create-release-candidate.yml
@@ -85,7 +85,7 @@ jobs:
           fi
 
           COMMIT_HASH=$(git rev-parse "$TAG_NAME")
-          COMMIT_SHORT=$(git rev-parse --short "$TAG_NAME")
+          COMMIT_SHORT=$(git rev-parse "$TAG_NAME" | cut -c1-9)
           RC_DIR="${VERSION}-RC${RC_NUM}"
           SRC_TARBALL="apache-texera-${VERSION}-src.tar.gz"
           COMPOSE_TARBALL="apache-texera-${VERSION}-docker-compose.tar.gz"