diff --git a/.woodpecker/build-arm.yml b/.woodpecker/build-arm.yml
index aa0f7f5..7a9aaec 100644
--- a/.woodpecker/build-arm.yml
+++ b/.woodpecker/build-arm.yml
@@ -11,13 +11,13 @@ steps:
     environment:
       REGISTRY_HOST:
         from_secret: registry_host
-      HARBOR_USER:
-        from_secret: harbor_user
-      HARBOR_TOKEN:
-        from_secret: harbor_token
+      REGISTRY_USER:
+        from_secret: registry_user
+      REGISTRY_TOKEN:
+        from_secret: registry_token
     commands:
-      - echo "$HARBOR_TOKEN" | docker login "$REGISTRY_HOST" -u "$HARBOR_USER" --password-stdin
-      - if [ "$CI_COMMIT_BRANCH" = "main" ]; then export TAG=arm; else export TAG=${CI_COMMIT_BRANCH}-arm; fi
+      - echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin
+      - export TAG=${CI_COMMIT_BRANCH}-arm
       - export BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
       - |
         docker build -f Dockerfile \
@@ -25,21 +25,15 @@ steps:
           --label org.opencontainers.image.revision=$CI_COMMIT_SHA \
           --label org.opencontainers.image.created=$BUILD_DATE \
           --label org.opencontainers.image.source=$CI_REPO_URL \
-          -t $REGISTRY_HOST/loader:$TAG .
-      - docker push $REGISTRY_HOST/loader:$TAG
-      - docker save $REGISTRY_HOST/loader:$TAG -o loader-image.tar
+          -t $REGISTRY_HOST/azaion/loader:$TAG .
+      - docker push $REGISTRY_HOST/azaion/loader:$TAG
+      - docker save $REGISTRY_HOST/azaion/loader:$TAG -o loader-image.tar
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   - name: publish-artifact
     image: python:3.11-slim
     commands:
       - pip install --no-cache-dir boto3==1.40.9 cryptography==44.0.2 requests==2.32.4
-      - |
-        if [ "$CI_COMMIT_BRANCH" = "main" ]; then
-          export PUBLISH_DEV_STAGE=main
-          export TAG=arm
-        else
-          export PUBLISH_DEV_STAGE=$CI_COMMIT_BRANCH
-          export TAG=${CI_COMMIT_BRANCH}-arm
-        fi
+      - export PUBLISH_DEV_STAGE=$CI_COMMIT_BRANCH
+      - export TAG=${CI_COMMIT_BRANCH}-arm
       - python scripts/publish_artifact.py --file loader-image.tar --resource-name loader --dev-stage "$PUBLISH_DEV_STAGE" --architecture arm64 --version "$CI_COMMIT_SHA"