diff --git a/.woodpecker/containers-packaging.yaml b/.woodpecker/containers-packaging.yaml
index 3f41ba2..17c945b 100644
--- a/.woodpecker/containers-packaging.yaml
+++ b/.woodpecker/containers-packaging.yaml
@@ -16,10 +16,10 @@ steps:
   biboumi-package-image:
     image: woodpeckerci/plugin-docker-buildx
     settings:
-      repo: codeberg.org/biboumi/ci-package
+      repo: codeberg.org/biboumi/ci-package-${PACKAGING_IMAGE}
       registry: codeberg.org
       dockerfile: docker/packaging/${PACKAGING_IMAGE}/Dockerfile
-      tag: ${PACKAGING_IMAGE}
+      tag: latest
       username: bibou
       password:
         from_secret: codeberg_token
diff --git a/.woodpecker/containers-test.yaml b/.woodpecker/containers-test.yaml
index 3f7fe3c..76acd13 100644
--- a/.woodpecker/containers-test.yaml
+++ b/.woodpecker/containers-test.yaml
@@ -17,10 +17,10 @@ steps:
   biboumi-test-image:
     image: woodpeckerci/plugin-docker-buildx
     settings:
-      repo: codeberg.org/biboumi/ci-test
+      repo: codeberg.org/biboumi/ci-test-${TEST_IMAGE}
       registry: codeberg.org
       dockerfile: docker/test/${TEST_IMAGE}/Dockerfile
-      tag: ${TEST_IMAGE}
+      tag: latest
       username: bibou
       password:
         from_secret: codeberg_token
diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml
new file mode 100644
index 0000000..c89535e
--- /dev/null
+++ b/.woodpecker/test.yaml
@@ -0,0 +1,24 @@
+when:
+  event: [push, tag, pull_request]
+  path: ['CMakeLists.txt', 'src/**/*', 'tests/**/*', '.woodpecker/test.yaml']
+
+labels:
+  platform: linux/amd64
+
+steps:
+  build-fedora:
+    image: codeberg.org/biboumi/ci-test-fedora:latest
+    commands:
+      - mkdir build/
+      - cd build/
+      - cmake ..
+      - make everything -j$(nproc || echo 1)
+
+  test-fedora:
+    depends_on: [build-fedora]
+    image: codeberg.org/biboumi/ci-test-fedora:latest
+    commands:
+      - cd build/
+      - make check_junit || true; make check
+      # e2e is still broken (12/89 fails) for now
+      # - make e2e