diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 55fa7a3..912ec9b 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -18,16 +18,35 @@ steps:
       - pnpm publish --no-git-checks
     failure: ignore
 
-  container_build_release_push:
-    #image: docker.io/maltegrosse/woodpecker-buildah:0.0.12
-    image: code.philo.ydns.eu/philorg/woodpecker-buildah
-    settings:
-      registry: code.philo.ydns.eu
-      repository: philorg/test-woodpecker-webapp
-      tags: ${CI_COMMIT_SHA}
-      architectures: amd64
-      context: Containerfile
-      username:
-        from_secret: registry_username
-      password:
-        from_secret: registry_password
+  build_publish:
+    image: quay.io/podman/stable:latest
+    # Caution: This image is built daily. It might fill up your image store quickly.
+    pull: true
+    # Fill in the trusted checkbox in Woodpecker's settings as well
+    privileged: true
+    environment:
+      registry_token:
+        from_secret: registry_token
+    commands:
+      # Login at the registry
+      - podman login -u __token__ --password $registry_token
+      # 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  .
+      # 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
+
+  #  container_build_release_push:
+  #    #image: docker.io/maltegrosse/woodpecker-buildah:0.0.12
+  #    image: code.philo.ydns.eu/philorg/woodpecker-buildah
+  #    settings:
+  #      registry: code.philo.ydns.eu
+  #      repository: philorg/test-woodpecker-webapp
+  #      tags: ${CI_COMMIT_SHA}
+  #      architectures: amd64
+  #      context: Containerfile
+  #      username:
+  #        from_secret: registry_username
+  #      password:
+  #        from_secret: registry_password