diff --git a/.woodpecker.yml b/.woodpecker.yml
index 7c40070..1e1fe20 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,22 +1,29 @@
 # SPDX-FileCopyrightText: 2023 Tobias Schmidl
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
-
+---
+variables:
+  - &repo 'git.schmidl.dev/schtobia/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
+#      output: type=oci,dest=${CI_REPO_OWNER}-buildimage.tar
+
   publish-next-agent:
     image: woodpeckerci/plugin-docker-buildx
+    group: publish
     secrets: [docker_username, docker_password]
     settings:
-      repo: git.schmidl.dev/${CI-REPO_OWNER}/buildimage
+      repo: *repo
+      registry: git.schmidl.dev
       dockerfile: dockerfile
       platforms: linux/amd64,linux/arm64/v8
     when:
-      branch: ${CI_REPO_DEFAULT_BRANCH}
+      branch: master
       event: push
+...