diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 9b8bc51..5e80314 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -3,6 +3,18 @@ when:
   - event: tag
   - event: push
 
+matrix:
+  CONTAINER_NAME:
+  - aiosmtpd
+  - git
+  - pnpm
+  - pnpm-deb
+  - podman
+  - podman-geo
+  - python-git
+  - uv
+  - uv-geo
+
 steps:
   container_build_publish:
     image: quay.io/podman/stable:latest
@@ -21,21 +33,10 @@ steps:
       org: philorg
       registry_token:
         from_secret: registry_token
-    matrix:
-      container_name:
-      - aiosmtpd
-      - git
-      - pnpm
-      - pnpm-deb
-      - podman
-      - podman-geo
-      - python-git
-      - uv
-      - uv-geo
     commands:
       # Login at the registry
       - podman login -u __token__ --password $registry_token $registry
       # Build the container images
-      - podman build --volume=/var/lib/containers:/var/lib/containers --tag $registry/$org/${container_name}:latest -f Containerfile.${container_name}
+      - podman build --volume=/var/lib/containers:/var/lib/containers --tag $registry/$org/${CONTAINER_NAME}:latest -f Containerfile.${CONTAINER_NAME}
       # Push the image
-      - podman push $registry/$org/$container_name:latest
+      - podman push $registry/$org/${CONTAINER_NAME}:latest