diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index ec0f653..a5cd69c 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -11,8 +11,6 @@ variables:
       - FORCE_UNSAFE_CONFIGURE=1
       - GLUON_TARGET=${TARGET}
       - GLUON_DEPRECATED=1
-    when:
-      event: tag
 
 workspace:
   base: /build
@@ -39,17 +37,14 @@ pipeline:
     <<: *default
     commands:
       - cd gluon
-      - if [ -z $CI_COMMIT_TAG ]; then export input_version=dev; fi
-      - echo $input_version
-      - echo $CI_COMMIT_BRANCH
-      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${CI_COMMIT_BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${CI_COMMIT_BRANCH} GLUON_OUTPUTDIR=output/${CI_COMMIT_BRANCH}
+      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${BRANCH} GLUON_OUTPUTDIR=output/${BRANCH}
 
   list_images:
     <<: *default
     commands:
-      - mkdir -p gluon/output/${CI_COMMIT_BRANCH}/images/factory
-      - echo "${TARGET}" > gluon/output/${CI_COMMIT_BRANCH}/images/factory/${TARGET}
-      - ls -alh gluon/output/${CI_COMMIT_BRANCH}/images/factory
+      - mkdir -p gluon/output/${BRANCH}/images/factory
+      - echo "${TARGET}" > gluon/output/${BRANCH}/images/factory/${TARGET}
+      - ls -alh gluon/output/${BRANCH}/images/factory
 
   upload:
     image: appleboy/drone-scp
@@ -59,8 +54,8 @@ pipeline:
       key:
         from_secret: ssh-key
       strip_components: 2
-      target: /srv/fwuploads-testing/troisdorf/multi/incoming/
-      source: gluon/output/${CI_COMMIT_BRANCH}/*
+      target: /srv/fwuploads-testing/troisdorf/multi/next/
+      source: gluon/output/${BRANCH}/*
     when:
       event: tag
 
diff --git a/.woodpecker/cleanup.yml b/.woodpecker/cleanup.yml
deleted file mode 100644
index e84f2f1..0000000
--- a/.woodpecker/cleanup.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-platform: linux/arm64
-
-skip_clone: true
-
-workspace:
-  base: /build
-
-pipeline:
-  cleanup:
-    image: appleboy/drone-ssh
-    settings:
-      host: 46.4.138.183
-      username: fwupload
-      key:
-        from_secret: ssh-key
-      port: 22
-      command_timeout: 120m
-      script:
-        - ls -alh /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
-        - rm -rf /srv/fwuploads-testing/troisdorf/multi/${CI_COMMIT_BRANCH}/
-        - mkdir /srv/fwuploads-testing/troisdorf/multi/${CI_COMMIT_BRANCH}/
-        - mv /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}/* /srv/fwuploads-testing/troisdorf/multi/${CI_COMMIT_BRANCH}/
-
-depends_on:
-  - build
diff --git a/.woodpecker/test.yml b/.woodpecker/next.yml
similarity index 76%
rename from .woodpecker/test.yml
rename to .woodpecker/next.yml
index f6fa525..95eee90 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/next.yml
@@ -13,6 +13,7 @@ variables:
       - GLUON_DEPRECATED=1
     when:
       event: push
+      branch: next
 
 workspace:
   base: /build
@@ -24,6 +25,7 @@ clone:
       recursive: true
     when:
       event: push
+      branch: next
 
 pipeline:
   make_update:
@@ -41,10 +43,7 @@ pipeline:
     <<: *default
     commands:
       - cd gluon
-      - if [ -z $CI_COMMIT_TAG ]; then export input_version=dev; fi
-      - echo $input_version
-      - echo $CI_COMMIT_BRANCH
-      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${CI_COMMIT_BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${CI_COMMIT_BRANCH} GLUON_OUTPUTDIR=output/${CI_COMMIT_BRANCH}
+      - make -j$(nproc) GLUON_AUTOUPDATER_BRANCH=${CI_COMMIT_BRANCH} GLUON_AUTOUPDATER_ENABLED=1 GLUON_RELEASE=$input_version-${CI_COMMIT_BRANCH} GLUON_OUTPUTDIR=output/next
 
   list_images:
     <<: *default
@@ -53,6 +52,17 @@ pipeline:
       - echo "${TARGET}" > gluon/output/${CI_COMMIT_BRANCH}/images/factory/${TARGET}
       - ls -alh gluon/output/${CI_COMMIT_BRANCH}/images/factory
 
+  publish:
+    image: woodpeckerci/plugin-gitea-release
+    settings:
+        base_url: https://git.freifunk-rhein-sieg.net
+        files:
+          - gluon/output/next/*
+        api_key:
+          from_secret: api_key
+        target: next
+        prerelease: true
+
 matrix:
   TARGET:
-    - ath79-generic
\ No newline at end of file
+    - ramips-mt7621
\ No newline at end of file
diff --git a/.woodpecker/prepare.yml b/.woodpecker/prepare.yml
index aa7acb8..7b02069 100644
--- a/.woodpecker/prepare.yml
+++ b/.woodpecker/prepare.yml
@@ -14,7 +14,10 @@ pipeline:
       port: 22
       command_timeout: 120m
       script:
-        - rm -rf /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
-        - mkdir -p /srv/fwuploads-testing/troisdorf/multi/incoming/${CI_COMMIT_BRANCH}
+        - rm -rf /srv/fwuploads-testing/troisdorf/multi/next/*
+        - mkdir -p /srv/fwuploads-testing/troisdorf/multi/next/stable
+        - mkdir -p /srv/fwuploads-testing/troisdorf/multi/next/beta
+        - mkdir -p /srv/fwuploads-testing/troisdorf/multi/next/experimental
     when:
+      branch: stable
       event: tag