diff --git a/.github/workflows/publish-container.yml b/.github/workflows/publish-container.yml
index 3198c28..4a327b8 100644
--- a/.github/workflows/publish-container.yml
+++ b/.github/workflows/publish-container.yml
@@ -13,10 +13,11 @@ on:
 
 env:
   REGISTRY: ghcr.io
+  USER: alwatr
 
 jobs:
   build:
-    if: github.repository_owner == 'alwatr'
+    if: github.repository_owner == 'Alwatr'
 
     name: Build & Publish Containers
     runs-on: ubuntu-latest
@@ -98,7 +99,7 @@ jobs:
         uses: docker/login-action@v3.0.0
         with:
           registry: ${{env.REGISTRY}}
-          username: ${{github.repository_owner}}
+          username: ${{env.USER}}
           password: ${{secrets.GITHUB_TOKEN}}
 
       - name: 🚀 Build and push container image
@@ -109,8 +110,8 @@ jobs:
           context: ./${{matrix.path}}
           push: ${{github.event_name != 'pull_request'}}
           tags: |
-            ${{env.REGISTRY}}/${{github.repository_owner}}/${{matrix.name}}:${{matrix.version.short}}
-            ${{env.REGISTRY}}/${{github.repository_owner}}/${{matrix.name}}:${{matrix.version.full}}
+            ${{env.REGISTRY}}/${{env.USER}}/${{matrix.name}}:${{matrix.version.short}}
+            ${{env.REGISTRY}}/${{env.USER}}/${{matrix.name}}:${{matrix.version.full}}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           build-args: |
@@ -122,5 +123,5 @@ jobs:
         env:
           COSIGN_EXPERIMENTAL: 'true'
         run: |
-          cosign sign --yes "${{env.REGISTRY}}/${{github.repository_owner}}/${{matrix.name}}:${{matrix.version.short}}@${{steps.build_and_push.outputs.digest}}"
-          cosign sign --yes "${{env.REGISTRY}}/${{github.repository_owner}}/${{matrix.name}}:${{matrix.version.full}}@${{steps.build_and_push.outputs.digest}}"
+          cosign sign --yes "${{env.REGISTRY}}/${{env.USER}}/${{matrix.name}}:${{matrix.version.short}}@${{steps.build_and_push.outputs.digest}}"
+          cosign sign --yes "${{env.REGISTRY}}/${{env.USER}}/${{matrix.name}}:${{matrix.version.full}}@${{steps.build_and_push.outputs.digest}}"