diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 415edf5..4c7487a 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -10,8 +10,6 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME_APP: ${{ github.repository }}-app
-  IMAGE_NAME_WEB: ${{ github.repository }}-web
 
 jobs:
   build:
@@ -35,6 +33,10 @@ jobs:
           fi
           echo "value=$version" >> "$GITHUB_OUTPUT"
 
+      - name: Normalize repository name
+        id: repo_name
+        run: echo "value=${GITHUB_REPOSITORY,,}" >> "$GITHUB_OUTPUT"
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -54,7 +56,7 @@ jobs:
           push: ${{ github.event_name == 'push' }}
           build-args: |
             NEXTCLOUD_VERSION=${{ steps.nextcloud_version.outputs.value }}
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_APP }}:latest
+          tags: ${{ env.REGISTRY }}/${{ steps.repo_name.outputs.value }}-app:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
@@ -64,6 +66,6 @@ jobs:
           context: .docker/web
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name == 'push' }}
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_WEB }}:latest
+          tags: ${{ env.REGISTRY }}/${{ steps.repo_name.outputs.value }}-web:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max