diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml
index dace85007..f678d444a 100644
--- a/.github/workflows/build_and_push_docker_images.yaml
+++ b/.github/workflows/build_and_push_docker_images.yaml
@@ -324,6 +324,8 @@ jobs:
         working-directory: source
         run: |
           if [ ${{ matrix.build_elixir }} = 'with_elixir' ]; then
-            export IS_ELIXIR=yes
+            is_latest=false
+          else
+            is_latest="${{ needs.prepare.outputs.IS_DOCKER_LATEST }}"
           fi
-          scripts/docker-create-push-manifests.sh "${{ steps.meta.outputs.tags }}" "${{ needs.prepare.outputs.IS_DOCKER_LATEST }}"
+          scripts/docker-create-push-manifests.sh "${{ steps.meta.outputs.tags }}" "$is_latest"
diff --git a/scripts/docker-create-push-manifests.sh b/scripts/docker-create-push-manifests.sh
index b101b1653..7c67ae788 100755
--- a/scripts/docker-create-push-manifests.sh
+++ b/scripts/docker-create-push-manifests.sh
@@ -18,7 +18,7 @@ docker manifest create "${img_march}" \
 docker manifest push "${img_march}"
 
 # PUSH latest if it is a release build
-if [ "$IsPushLatest" = "true" -a "${IS_ELIXIR:-no}" = "no" ]; then
+if [ "$IsPushLatest" = "true" ]; then
     img_latest=$(echo "$img_arm64" | cut -d: -f 1):latest
     docker manifest create "${img_latest}" \
         --amend "$img_amd64_digest" \