diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 920721b..53a26c2 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -25,17 +25,20 @@ steps:
     # Fill in the trusted checkbox in Woodpecker's settings as well
     privileged: true
     environment:
+      registry: code.philo.ydns.eu
+      org: philorg
+      container_name: test-woodpecker-webapp
       registry_token:
         from_secret: registry_token
     commands:
       # Login at the registry
-      - podman login -u __token__ --password $registry_token
+      - podman login -u __token__ --password $registry_token $registry
       # Build the container image
-      - podman build --tag code.philo.ydns.eu/philorg/test-woodpecker-webapp:latest --tag code.philo.ydns.eu/philorg/test-woodpecker-webapp:$CI_COMMIT_SHA  .
+      - podman build --tag $registry/$org/$package_name:latest --tag $registry/$org/$package_name:$CI_COMMIT_SHA  .
       # Push the image
-      #- podman push --sign-by-sigstore-private-key ./key.private code.philo.ydns.eu/philorg/test-woodpecker-webapp/<image_name>:latest
-      - podman push code.philo.ydns.eu/philorg/test-woodpecker-webapp:latest
-      - podman push code.philo.ydns.eu/philorg/test-woodpecker-webapp:$CI_COMMIT_SHA
+      #- podman push --sign-by-sigstore-private-key ./key.private code.philo.ydns.eu/$org/$package_name:latest
+      - podman push $registry/$org/$package_name:latest
+      - podman push $registry/$org/$package_name:$CI_COMMIT_SHA
 
   #  container_build_release_push:
   #    #image: docker.io/maltegrosse/woodpecker-buildah:0.0.12