diff --git a/.woodpecker.yml b/.woodpecker.yml
index aabaa22..bb00609 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -33,169 +33,67 @@ global-variables:
       - grep -rl +iw kernel/mac80211/Makefile | xargs sed -i s/+iw/+iw-full/g
       - grep -r iw-full *
 
-kind: pipeline
-type: docker
-name: gluon-build
-
 clone:
-  depth: 50
+ git:
+   image: woodpeckerci/plugin-git
+   settings:
+     recursive: true
 
-steps: &steps
-  - name: submodules
+pipeline:
+  site-multidomain:
     image: docker:git
     commands:
-    - git submodule update --recursive --init
-
-  - name: change site to multi
-    image: docker:git
-    commands:
-    - cd site
-    - git checkout multidomain
-
-  - name: make update
+      - cd site
+      - git checkout multidomain
+  
+  make_update:
     <<: *env
     commands:
-    - cd gluon
-    - make update
+      - cd gluon
+      - make update
     environment:
       GLUON_TARGET: ar71xx-generic
 
-  - name: patch iw to iw-full
+  patch_iw:
     <<: *patch
 
-  - name: build-ath79-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ath79-generic
-
-  - name: build-ar71xx-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ar71xx-generic
-
-  - name: build-ar71xx-tiny
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ar71xx-tiny
-
-  - name: build-ar71xx-nand
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ar71xx-nand
-
-  - name: build-brcm2708-bcm2708
-    <<: *gluon
-    environment:
-      GLUON_TARGET: brcm2708-bcm2708
-
-  - name: build-brcm2708-bcm2709
-    <<: *gluon
-    environment:
-      GLUON_TARGET: brcm2708-bcm2709
-
-  - name: build-mpc85xx-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: mpc85xx-generic
-
-  - name: build-mpc85xx-p1020
-    <<: *gluon
-    environment:
-      GLUON_TARGET: mpc85xx-p1020
-
-  - name: build-x86-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: x86-generic
-
-  - name: build-x86-geode
-    <<: *gluon
-    environment:
-      GLUON_TARGET: x86-geode
-
-  - name: build-x86-64
-    <<: *gluon
-    environment:
-      GLUON_TARGET: x86-64
-
-  - name: build-ipq40xx-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ipq40xx-generic
-
-  - name: ipq806x-generic
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ipq806x-generic
-
-  - name: build-ramips-mt7620
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ramips-mt7620
-
-  - name: build-ramips-mt7621
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ramips-mt7621
-
-  - name: build-ramips-mt76x8
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ramips-mt76x8
-
-  - name: build-ramips-rt305x
-    <<: *gluon
-    environment:
-      GLUON_TARGET: ramips-rt305x
-
-  - name: lantiq-xway
-    <<: *gluon
-    environment:
-      GLUON_TARGET: lantiq-xway
-
-  - name: lantiq-xrx200
-    <<: *gluon
-    environment:
-      GLUON_TARGET: lantiq-xrx200
-
-  - name: make manifest
+  make_manifest:
     <<: *env
     commands:
-    - cd gluon
-    - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable
-    - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta
-# Don´t build Experimental. The Experimental Firmware is in another Branch
-#    - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp
+      - cd gluon
+      - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable GLUON_RELEASE=$input_version-stable
+      - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta GLUON_RELEASE=$input_version-beta
 
-  - name: backup-old-firmware
-    image: appleboy/drone-ssh
-    settings:
-      host: 46.4.138.183
-      username: fwupload
-      key:
-        from_secret: ssh-update
-      port: 22
-      command_timeout: 120m
-      script:
-        #- ./rsync-backup-multi.sh
-        - rm -rf /srv/fwuploads/troisdorf/multi/stable
-        - rm -rf /srv/fwuploads/troisdorf/multi/beta
-        - mkdir /srv/fwuploads/troisdorf/multi/stable
-        - mkdir /srv/fwuploads/troisdorf/multi/beta
-    when:
-      branch: multidomain
+#steps: &steps
+  #- name: backup-old-firmware
+  #  image: appleboy/drone-ssh
+  #  settings:
+  #    host: 46.4.138.183
+  #    username: fwupload
+  #    key:
+  #      from_secret: ssh-update
+  #    port: 22
+  #    command_timeout: 120m
+  #    script:
+  #      #- ./rsync-backup-multi.sh
+  #      - rm -rf /srv/fwuploads/troisdorf/multi/stable
+  #      - rm -rf /srv/fwuploads/troisdorf/multi/beta
+  #      - mkdir /srv/fwuploads/troisdorf/multi/stable
+  #      - mkdir /srv/fwuploads/troisdorf/multi/beta
+  #  when:
+  #    branch: multidomain
 
-  - name: upload stable
-    <<: *upload
-    settings:
-      target: /srv/fwuploads/troisdorf/multi/stable
-      source: /drone/src/gluon/output/stable/images/*
+  #- name: upload stable
+  #  <<: *upload
+  #  settings:
+  #    target: /srv/fwuploads/troisdorf/multi/stable
+  #    source: /drone/src/gluon/output/stable/images/*
 
-  - name: upload beta
-    <<: *upload
-    settings:
-      target: /srv/fwuploads/troisdorf/multi/beta
-      source: /drone/src/gluon/output/beta/images/*
+  #- name: upload beta
+  #  <<: *upload
+  #  settings:
+  #    target: /srv/fwuploads/troisdorf/multi/beta
+  #    source: /drone/src/gluon/output/beta/images/*
 
 # Don´t build Experimental. The Experimental Firmware is in another Branch
 #  - name: upload experimental