diff --git a/.woodpecker/.feature.yml b/.woodpecker/.feature.yml
index 621d342..95851b4 100644
--- a/.woodpecker/.feature.yml
+++ b/.woodpecker/.feature.yml
@@ -1,10 +1,13 @@
-pipeline:
+steps:
   build-and-push:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: "${CI_REPO_OWNER##mu-}/mu-${CI_REPO_NAME}"
       tags: "feature-${CI_COMMIT_BRANCH##feature/}"
-    secrets: [docker_username, docker_password]
-    when:
-      event: push
-      branch: feature/*
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+when:
+  - event: push
+    branch: [feature/*]
diff --git a/.woodpecker/.latest.yml b/.woodpecker/.latest.yml
index 5d2a13c..9782649 100644
--- a/.woodpecker/.latest.yml
+++ b/.woodpecker/.latest.yml
@@ -1,10 +1,13 @@
-pipeline:
+steps:
   build-and-push:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: "${CI_REPO_OWNER##mu-}/mu-${CI_REPO_NAME}"
       tags: latest
-    secrets: [docker_username, docker_password]
-    when:
-      event: push
-      branch: [master, main]
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+when:
+  - event: push
+    branch: [master, main]
diff --git a/.woodpecker/.tag.yml b/.woodpecker/.tag.yml
index d844f19..0f7669c 100644
--- a/.woodpecker/.tag.yml
+++ b/.woodpecker/.tag.yml
@@ -1,10 +1,13 @@
-pipeline:
+steps:
   release:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: "${CI_REPO_OWNER##mu-}/mu-${CI_REPO_NAME}"
       tags: "${CI_COMMIT_TAG##v}"
-    secrets: [ docker_username, docker_password ]
-    when:
-      event: tag
-      tag: v*
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+when:
+  - event: tag
+    ref: refs/tags/v*