diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml
index 2f19829129..adc17aacee 100644
--- a/.github/workflows/release-docker.yml
+++ b/.github/workflows/release-docker.yml
@@ -50,6 +50,10 @@ jobs:
         run: |
           DOCKER_REPOSITORY=nocodb
           DOCKER_BUILD_TAG=${{ github.event.inputs.tag || inputs.tag }}
+          DOCKER_BUILD_LATEST_TAG=latest
+          if [[ "$DOCKER_BUILD_TAG" =~ "-beta." ]]; then
+            DOCKER_BUILD_LATEST_TAG=$(echo $DOCKER_BUILD_TAG | awk -F '-beta.' '{print $1}')-beta.latest
+          fi
           if [[ ${{ github.event.inputs.targetEnv || inputs.targetEnv }} == 'DEV' ]]; then
             if [[ ${{ github.event.inputs.currentVersion || inputs.currentVersion || 'N/A' }} != 'N/A' ]]; then
               DOCKER_BUILD_TAG=${{ github.event.inputs.currentVersion || inputs.currentVersion }}-${{ github.event.inputs.tag || inputs.tag }}
@@ -62,8 +66,10 @@ jobs:
           fi
           echo "DOCKER_REPOSITORY=${DOCKER_REPOSITORY}" >> $GITHUB_OUTPUT
           echo "DOCKER_BUILD_TAG=${DOCKER_BUILD_TAG}" >> $GITHUB_OUTPUT
+          echo "DOCKER_BUILD_LATEST_TAG=${DOCKER_BUILD_LATEST_TAG}" >> $GITHUB_OUTPUT
           echo DOCKER_REPOSITORY: ${DOCKER_REPOSITORY}
           echo DOCKER_BUILD_TAG: ${DOCKER_BUILD_TAG}
+          echo DOCKER_BUILD_LATEST_TAG: ${DOCKER_BUILD_LATEST_TAG}
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -134,7 +140,7 @@ jobs:
           push: true
           tags: |
             nocodb/${{ steps.get-docker-repository.outputs.DOCKER_REPOSITORY }}:${{ steps.get-docker-repository.outputs.DOCKER_BUILD_TAG }}
-            nocodb/${{ steps.get-docker-repository.outputs.DOCKER_REPOSITORY }}:latest
+            nocodb/${{ steps.get-docker-repository.outputs.DOCKER_REPOSITORY }}:${{ steps.get-docker-repository.outputs.DOCKER_BUILD_LATEST_TAG }}
 
         # Temp fix
         # https://github.com/docker/build-push-action/issues/252