diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index de4f76f..57aa5d0 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -17,7 +17,8 @@ steps:
     environment:
       BUILDAH_REG: gitea.badhouseplants.net/badhouseplants/container-builder
       REGISTRY_TOKEN:
-        from_secret: registry_token
+        from_secret: GITEA_REGISTRY_TOKEN
+      REGISTRY_USER: devops-bot
     commands:
       - env
       - ./build
diff --git a/build b/build
index da85411..2d24b20 100755
--- a/build
+++ b/build
@@ -25,10 +25,14 @@ echo "23.03.2025"
 apk update
 apk add buildah cni-plugins iptables ip6tables fuse-overlayfs netavark
 
-buildah login -u woody -p $REGISTRY_TOKEN zot.badhouseplants.net
+buildah login -u $REGISTRY_USER -p $REGISTRY_TOKEN zot.badhouseplants.net
 buildah build -t $BUILDAH_REG:$CI_COMMIT_SHA .
-buildah tag $BUILDAH_REG:$CI_COMMIT_SHA $BUILDAH_REG:latest
+
 if [ -z ${BUILD_DEBUG+x} ]; then
-    buildah push $BUILDAH_REG:$CI_COMMIT_SHA;
-    buildah push $BUILDAH_REG:latest;
+  buildah push $BUILDAH_REG:$CI_COMMIT_SHA;
+fi
+
+if [ ${CI_COMMIT_BRANCH} = ${CI_REPO_DEFAULT_BRANCH} ]; then
+  buildah tag $BUILDAH_REG:$CI_COMMIT_SHA $BUILDAH_REG:latest
+  buildah push $BUILDAH_REG:latest;
 fi