diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6f53dde..d79a33f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,8 +21,8 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            ${{ secrets.DOCKER_ORGANIZATION }}/${{ env.IMAGE_NAME }}
-            ${{ vars.REGISTRY_GITHUB }}/${{ env.IMAGE_NAME }}
+            ${{ vars.DOCKER_ORGANIZATION }}/${{ env.IMAGE_NAME }}
+            ${{ vars.REGISTRY_GITHUB }}/${{ github.repository }}
       - name: Build image
         uses: docker/build-push-action@v6
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 213a1ca..0c12303 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -44,8 +44,8 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            ${{ secrets.DOCKER_ORGANIZATION }}/${{ env.IMAGE_NAME }}
-            ${{ vars.REGISTRY_GITHUB }}/${{ env.IMAGE_NAME }}
+            ${{ vars.DOCKER_ORGANIZATION }}/${{ env.IMAGE_NAME }}
+            ${{ vars.REGISTRY_GITHUB }}/${{ github.repository }}
 
       - name: Build and push image
         uses: docker/build-push-action@v6
@@ -59,6 +59,6 @@ jobs:
       - name: Update DockerHub repository description
         uses: peter-evans/dockerhub-description@v5
         with:
-          repository: ${{ secrets.DOCKER_ORGANIZATION }}/${{ env.IMAGE_NAME }}
+          repository: ${{ vars.DOCKER_ORGANIZATION }}/${{ env.IMAGE_NAME }}
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}