diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 5b41d2ec955e..8463c8b465cc 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -600,9 +600,9 @@ jobs:
         docker push rocketchat/${{ matrix.service }}-service:${IMAGE_TAG}
 
         if [[ $GITHUB_REF == refs/tags/* ]]; then
-          if echo "$GIT_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
+          if echo "$IMAGE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
             RELEASE="latest"
-          elif echo "$GIT_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
+          elif echo "$IMAGE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
             RELEASE="release-candidate"
           fi