diff --git a/.github/workflows/tooljet-release-docker-image-build.yml b/.github/workflows/tooljet-release-docker-image-build.yml
index a358e62c0e..131d33c619 100644
--- a/.github/workflows/tooljet-release-docker-image-build.yml
+++ b/.github/workflows/tooljet-release-docker-image-build.yml
@@ -21,19 +21,19 @@ jobs:
 
     steps:
       - name: Checkout code to main
-        if: "contains(github.event.release.tag_name, '-ce-beta')"
+        if: "!contains(github.event.release.tag_name, 'ce-lts')"
         uses: actions/checkout@v2
         with:
           ref: refs/heads/main
 
       - name: Checkout code to LTS-2.50
-        if: "startsWith(github.event.release.tag_name, '2.50') && contains(github.event.release.tag_name, '-ce-lts')"
+        if: "contains(github.event.release.tag_name, '2.50')"
         uses: actions/checkout@v2
         with:
           ref: refs/heads/lts-2.50
 
       - name: Checkout code to LTS-3.0
-        if: "startsWith(github.event.release.tag_name, '3') && contains(github.event.release.tag_name, '-ce-lts')"
+        if: "contains(github.event.release.tag_name, '-ce-lts')"
         uses: actions/checkout@v2
         with:
           ref: refs/heads/lts-3.0
@@ -60,20 +60,20 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push Docker image for beta tag
-        if: "contains(github.event.release.tag_name, '-ce-beta')"
+        if: "!contains(github.event.release.tag_name, '-ce-lts')"
         uses: docker/build-push-action@v4
         with:
           context: .
           file: docker/production.Dockerfile
           push: true
-          tags: tooljet/tooljet-ce:${{ github.event.release.tag_name }},tooljet/tooljet-ce:ce-beta-latest
+          tags: tooljet/tooljet-ce:${{ github.event.release.tag_name }},tooljet/tooljet-ce:ce-latest
           platforms: linux/amd64
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push Docker image for LTS 2.50 tag
-        if:  "startsWith(github.event.release.tag_name, '2.50') && contains(github.event.release.tag_name, '-ce-lts')"
+        if:  "contains(github.event.release.tag_name, '2.50')"
         uses: docker/build-push-action@v4
         with:
           context: .
@@ -86,7 +86,7 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push Docker image for LTS 3.0 tag
-        if: "startsWith(github.event.release.tag_name, '3') && contains(github.event.release.tag_name, '-ce-lts')"
+        if: "contains(github.event.release.tag_name, '-ce-lts')"
         uses: docker/build-push-action@v4
         with:
           context: .