diff --git a/.woodpecker/builder.yml b/.woodpecker/cron-docker-builder.yml
similarity index 100%
rename from .woodpecker/builder.yml
rename to .woodpecker/cron-docker-builder.yml
diff --git a/.woodpecker/build.yml b/.woodpecker/push-next.yml
similarity index 60%
rename from .woodpecker/build.yml
rename to .woodpecker/push-next.yml
index e9b9fc8b..066d2944 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/push-next.yml
@@ -1,17 +1,21 @@
 steps:
 
-  build:
+  todo_check:
+    # INFO: https://woodpecker-ci.org/plugins/TODO-Checker
+    image: codeberg.org/epsilon_02/todo-checker:1.1
     when:
       - event: push
-        branch: [main, next]
-    image: git.kemitix.net/kemitix/git-next-builder:latest
-    environment:
-      CARGO_TERM_COLOR: always
+        branch: next
+    settings:
+      # git-next-woodpecker-todo-checker - read:issue
+      repository_token: '776a3b928b852472c2af727a360c85c00af64b9f'
+      prefix_regex:	"(#|//) (TODO|FIXME): "
+      debug: false
 
   lint:
     when:
       - event: push
-        branch: [main, next]
+        branch: next
     image: git.kemitix.net/kemitix/git-next-builder:latest
     environment:
       CARGO_TERM_COLOR: always
@@ -20,10 +24,18 @@ steps:
       - cargo fmt --all -- --check
       - cargo clippy -- -D warnings -W clippy::nursery -W clippy::unwrap_used -W clippy::expect_used
 
+  build:
+    when:
+      - event: push
+        branch: next
+    image: git.kemitix.net/kemitix/git-next-builder:latest
+    environment:
+      CARGO_TERM_COLOR: always
+
   test:
     when:
       - event: push
-        branch: [main, next]
+        branch: next
     image: git.kemitix.net/kemitix/git-next-builder:latest
     environment:
       CARGO_TERM_COLOR: always
diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml
deleted file mode 100644
index a3292540..00000000
--- a/.woodpecker/release.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-# INFO: https://woodpecker-ci.org/plugins/Gitea%20Release
-steps:
-
-  publish:
-    when:
-      - event: tag
-        ref: refs/tags/v*
-    image: docker.io/woodpeckerci/plugin-gitea-release:0.3.1
-    settings:
-      base_url: https://git.kemitix.net
-      api_key:
-        from_secret: FORGEJO_RELEASE_PLUGIN
-      target: main
-      prerelease: true
diff --git a/.woodpecker/docker.yml b/.woodpecker/tag-created.yml
similarity index 53%
rename from .woodpecker/docker.yml
rename to .woodpecker/tag-created.yml
index 5ff15c66..3fce0fc7 100644
--- a/.woodpecker/docker.yml
+++ b/.woodpecker/tag-created.yml
@@ -1,10 +1,23 @@
-# INFO: https://woodpecker-ci.org/plugins/Docker%20Buildx
 steps:
 
+  publish-to-forgejo:
+    when:
+      - event: tag
+        ref: refs/tags/v*
+    # INFO: https://woodpecker-ci.org/plugins/Gitea%20Release
+    image: docker.io/woodpeckerci/plugin-gitea-release:0.3.1
+    settings:
+      base_url: https://git.kemitix.net
+      api_key:
+        from_secret: FORGEJO_RELEASE_PLUGIN
+      target: main
+      prerelease: true
+
   docker-build:
     when:
       - event: tag
         ref: refs/tags/v*
+    # INFO: https://woodpecker-ci.org/plugins/Docker%20Buildx
     image: docker.io/woodpeckerci/plugin-docker-buildx:3.2.1
     settings:
       username: kemitix
diff --git a/.woodpecker/todo-check.yml b/.woodpecker/todo-check.yml
deleted file mode 100644
index 34143bae..00000000
--- a/.woodpecker/todo-check.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# INFO: https://woodpecker-ci.org/plugins/TODO-Checker
-steps:
-
-  todo_check:
-    image: codeberg.org/epsilon_02/todo-checker:1.1
-    when:
-      - event: push
-        branch: [main, next]
-    settings:
-      # git-next-woodpecker-todo-checker - read:issue
-      repository_token: '776a3b928b852472c2af727a360c85c00af64b9f'
-      prefix_regex:	"(#|//) (TODO|FIXME): "
-      debug: false