diff --git a/.woodpecker/publish-release-plz-image.yml b/.woodpecker/publish-release-plz-image.yml
index 0d3ce54..aa915f2 100644
--- a/.woodpecker/publish-release-plz-image.yml
+++ b/.woodpecker/publish-release-plz-image.yml
@@ -1,16 +1,17 @@
 when:
   event: [push, manual]
   branch: main
-  path: ["release-plz/base.Dockerfile"]
+  path:
+    ["release-plz/base.Dockerfile", ".woodpecker/publish-release-plz-image.yml"]
 
 steps:
-  publish:
-    image: plugins/kaniko
+  build-latest-container:
+    image: woodpeckerci/plugin-docker-buildx:6.0.3
     settings:
-      repo: jasterv/release-plz
-      tags: 0.3.156,0.3,latest
-      username:
-        from_secret: DOCKERHUB_USERNAME
+      registry: codeberg.org
+      username: ${CI_REPO_OWNER}
       password:
-        from_secret: DOCKERHUB_PASSWORD
-      dockerfile: release-plz/base.Dockerfile
+        from_secret: CONTAINER_REGISTRY_TOKEN
+      repo: codeberg.org/jasterv/release-plz
+      dockerfile: "release-plz/base.Dockerfile"
+      tags: 0.3.156,0.3,latest
diff --git a/.woodpecker/publish-rust-ci-image.yml b/.woodpecker/publish-rust-ci-image.yml
index fe19694..8443041 100644
--- a/.woodpecker/publish-rust-ci-image.yml
+++ b/.woodpecker/publish-rust-ci-image.yml
@@ -1,16 +1,16 @@
 when:
   event: [push, manual]
   branch: main
-  path: ["rust/Dockerfile"]
+  path: ["rust/Dockerfile", ".woodpecker/publish-rust-ci-image.yml"]
 
 steps:
-  publish:
-    image: plugins/kaniko
+  build-latest-container:
+    image: woodpeckerci/plugin-docker-buildx:6.0.3
     settings:
-      repo: jasterv/rust-ci
-      tags: 1.93,latest
-      username:
-        from_secret: DOCKERHUB_USERNAME
+      registry: codeberg.org
+      username: ${CI_REPO_OWNER}
       password:
-        from_secret: DOCKERHUB_PASSWORD
-      dockerfile: rust/Dockerfile
+        from_secret: CONTAINER_REGISTRY_TOKEN
+      repo: codeberg.org/jasterv/rust-ci
+      dockerfile: "rust/Dockerfile"
+      tags: 1.93,latest
diff --git a/.woodpecker/publish-rust-magic-release-image.yml b/.woodpecker/publish-rust-magic-release-image.yml
index 526a538..923c235 100644
--- a/.woodpecker/publish-rust-magic-release-image.yml
+++ b/.woodpecker/publish-rust-magic-release-image.yml
@@ -9,13 +9,13 @@ when:
     ]
 
 steps:
-  publish:
-    image: plugins/kaniko
+  build-latest-container:
+    image: woodpeckerci/plugin-docker-buildx:6.0.3
     settings:
-      repo: jasterv/rust-magic-release
-      tags: 1.93,latest
-      username:
-        from_secret: DOCKERHUB_USERNAME
+      registry: codeberg.org
+      username: ${CI_REPO_OWNER}
       password:
-        from_secret: DOCKERHUB_PASSWORD
-      dockerfile: rust/magic-release.Dockerfile
+        from_secret: CONTAINER_REGISTRY_TOKEN
+      repo: codeberg.org/jasterv/rust-magic-release
+      dockerfile: "rust/magic-release.Dockerfile"
+      tags: 1.93,latest