diff --git a/.github/actions/build-push-image/action.yml b/.github/actions/build-push-image/action.yml
index 103e7dae..cb11ca29 100644
--- a/.github/actions/build-push-image/action.yml
+++ b/.github/actions/build-push-image/action.yml
@@ -6,10 +6,15 @@ inputs:
   image-name:
     description: "image name (without registry)"
     required: true
+  ghcr-token:
+    description: "GitHub token for GHCR authentication"
+    required: true
   username:
+    description: "DockerHub username"
     required: false
     default: ""
   password:
+    description: "DockerHub password"
     required: false
     default: ""
 outputs:
@@ -20,13 +25,13 @@ outputs:
 runs:
   using: "composite"
   steps:
-    # GHCR login (using GITHUB_TOKEN - automatically available)
+    # GHCR login
     - name: Login to GHCR
       uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
-        password: ${{ github.token }}
+        password: ${{ inputs.ghcr-token }}
 
     - name: Set image version
       id: version
diff --git a/.github/workflows/build-publish-images.yml b/.github/workflows/build-publish-images.yml
index 4771c3d0..6acf4102 100644
--- a/.github/workflows/build-publish-images.yml
+++ b/.github/workflows/build-publish-images.yml
@@ -478,6 +478,7 @@ jobs:
         with:
           image-name: "test-teyrchain"
           dockerfile: "docker/dockerfiles/test-teyrchain_injected.Dockerfile"
+          ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           username: ${{ secrets.PEZKUWI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.PEZKUWI_DOCKERHUB_PASSWORD }}
 
@@ -504,6 +505,7 @@ jobs:
         with:
           image-name: "pezkuwi-debug"
           dockerfile: "docker/dockerfiles/pezkuwi/pezkuwi_injected_debug.Dockerfile"
+          ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           username: ${{ secrets.PEZKUWI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.PEZKUWI_DOCKERHUB_PASSWORD }}
 
@@ -530,6 +532,7 @@ jobs:
         with:
           image-name: "colander"
           dockerfile: "docker/dockerfiles/collator_injected.Dockerfile"
+          ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           username: ${{ secrets.PEZKUWI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.PEZKUWI_DOCKERHUB_PASSWORD }}
 
@@ -556,6 +559,7 @@ jobs:
         with:
           image-name: "malus"
           dockerfile: "docker/dockerfiles/malus_injected.Dockerfile"
+          ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           username: ${{ secrets.PEZKUWI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.PEZKUWI_DOCKERHUB_PASSWORD }}
 
@@ -582,6 +586,7 @@ jobs:
         with:
           image-name: "bizinikiwi"
           dockerfile: "docker/dockerfiles/bizinikiwi_injected.Dockerfile"
+          ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           username: ${{ secrets.PEZKUWI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.PEZKUWI_DOCKERHUB_PASSWORD }}
 
@@ -633,6 +638,7 @@ jobs:
         with:
           image-name: "bridges-zombienet-tests"
           dockerfile: "docker/dockerfiles/bridges_zombienet_tests_injected.Dockerfile"
+          ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           username: ${{ secrets.PEZKUWI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.PEZKUWI_DOCKERHUB_PASSWORD }}
 
@@ -659,6 +665,7 @@ jobs:
         with:
           image-name: "pezkuwi-teyrchain-debug"
           dockerfile: "docker/dockerfiles/pezkuwi-teyrchain/pezkuwi-teyrchain-debug_unsigned_injected.Dockerfile"
+          ghcr-token: ${{ secrets.GITHUB_TOKEN }}
           username: ${{ secrets.PEZKUWI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.PEZKUWI_DOCKERHUB_PASSWORD }}