diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 01d2b517a..1fcac73d5 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -114,8 +114,8 @@ jobs:
         uses: docker/metadata-action@v6
         with:
           images: |
-            ${{ secrets.DOCKER_USERNAME }}/moviepilot-v3
-            ghcr.io/${{ github.repository }}-v3
+            ${{ secrets.DOCKER_USERNAME }}/moviepilot
+            ghcr.io/${{ github.repository }}
           tags: |
             type=raw,value=beta
 
diff --git a/.github/workflows/build-v3.yml b/.github/workflows/build-v3.yml
index dce0a159d..df39c44ef 100644
--- a/.github/workflows/build-v3.yml
+++ b/.github/workflows/build-v3.yml
@@ -140,6 +140,7 @@ jobs:
             ghcr.io/${{ github.repository }}
           tags: |
             type=raw,value=${{ env.app_version }}
+            type=raw,value=latest
 
       - name: Docker Meta free-threaded
         id: meta_ft
@@ -150,6 +151,7 @@ jobs:
             ghcr.io/${{ github.repository }}-v3t
           tags: |
             type=raw,value=${{ env.app_version }}
+            type=raw,value=latest
 
       - name: Set Up QEMU
         uses: docker/setup-qemu-action@v4
@@ -362,19 +364,6 @@ jobs:
             type=gha,scope=moviepilot-v3t-docker-amd64,version=2
             type=gha,scope=moviepilot-v3t-docker-arm64,version=2
 
-      - name: Promote latest image pair
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        run: |
-          ghcr_repository="${GITHUB_REPOSITORY,,}"
-          for image in \
-            "${DOCKER_USERNAME}/moviepilot-v3t" \
-            "ghcr.io/${ghcr_repository}-v3t"; do
-            docker buildx imagetools create \
-              --tag "${image}:latest" \
-              "${image}:${app_version}"
-          done
-
       - name: Generate Changelog
         id: changelog
         run: |