diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2b5fc8089..84f76de5b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,13 +81,11 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Sanitize Owner and Platform name
+      - name: Set lower case owner name
         run: |
           echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
-          echo "PLATFORM=$(echo '${PLATFORM}' | sed 's|/|-|g')" >>${GITHUB_ENV}
         env:
           OWNER: ${{ github.repository_owner }}
-          PLATFORM: ${{ matrix.platform }}
       - name: Build architecture specific images
         uses: docker/build-push-action@v5
         with:
@@ -100,8 +98,8 @@ jobs:
           build-args: |
             COMMIT_TAG=${{ github.sha }}
           tags: |
-            fallenbagel/jellyseerr:develop-${{ env.PLATFORM }}
-            ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop-${{ env.PLATFORM }}
+            fallenbagel/jellyseerr:develop-${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}
+            ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop-${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}
           cache-from: type=gha,scope=${{ matrix.platform }}
           cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
           provenance: false