diff --git a/.woodpecker.yml b/.woodpecker.yml
index 00223a4..e1a87be 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -2,12 +2,14 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 ---
+variables:
+  - &repo git.schmidl.dev/${CI-REPO_OWNER}/buildimage
 steps:
   docker-build:
     image: woodpeckerci/plugin-docker-buildx
     group: build
     settings:
-      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+      repo: *repo
       registry: git.schmidl.dev
       dry_run: true
 #      output: type=oci,dest=${CI_REPO_OWNER}-buildimage.tar
@@ -17,10 +19,10 @@ steps:
     group: publish
     secrets: [docker_username, docker_password]
     settings:
-      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+      repo: *repo
       dockerfile: dockerfile
       platforms: linux/amd64,linux/arm64/v8
     when:
-      branch: ${CI_REPO_DEFAULT_BRANCH}
+      branch: master
       event: push
 ...