diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 43336b13e8..227c75738e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -39,9 +39,8 @@ jobs:
   build:
     uses: ./.github/workflows/multi-build-arch.yml
     with:
-      registry: docker.io
-      registry_username: ubicloud
-      image_name: "ubicloud/windmill-test"
+      registry: ${{ env.REGISTRY }}
+      image_name: ${{ env.IMAGE_NAME }}
       fetch_depth: 0
       push_image: true
       build_runner_cpus: 16
diff --git a/.github/workflows/multi-build-arch.yml b/.github/workflows/multi-build-arch.yml
index 422a1af425..70bb532dd8 100644
--- a/.github/workflows/multi-build-arch.yml
+++ b/.github/workflows/multi-build-arch.yml
@@ -96,12 +96,12 @@ jobs:
           tags: ${{ inputs.metadata_tags }}
           labels: ${{ inputs.metadata_labels }}
 
-      - name: Log in to registry
+      - name: Login to registry
         uses: docker/login-action@v3
         with:
           registry: ${{ inputs.registry }}
-          username: ${{ inputs.registry_username }}
-          password: ${{ secrets.REGISTRY_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push by digest
         id: build