diff --git a/.drone.yml b/.drone.yml
index 420f0ec..1cd6452 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,347 +1,199 @@
 global-variables:
-  input_version: &input_version v2020.1
+  env: &env
+    image: hoffmannhosting/gluon-builder
+    environment:
+      input_version: v2020.1
+      GLUON_SITEDIR: /drone/src/site
+      FORCE_UNSAFE_CONFIGURE: 1
+
+  gluon: &gluon
+    <<: *env
+    commands:
+      - cd gluon
+      - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
+      - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
+      - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
+
+  upload: &upload
+    image: appleboy/drone-scp
+    settings:
+      host: 46.4.138.183
+      user: fwupload
+      key:
+        from_secret: ssh-update
+      strip_components: 6
+    when:
+      branch: master
 
 kind: pipeline
+type: docker
 name: gluon-build
 
 clone:
   depth: 50
 
-steps:
-- name: submodules
-  image: docker:git
-  commands:
-  - git submodule update --recursive --init
+steps: &steps
+  - name: submodules
+    image: docker:git
+    commands:
+    - git submodule update --recursive --init
 
-- name: change site to multi
-  image: docker:git
-  commands:
-  - cd site
-  - git checkout multidomain
+  - name: change site to multi
+    image: docker:git
+    commands:
+    - cd site
+    - git checkout multidomain
 
-- name: make update
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make update 
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ar71xx-generic
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: make update
+    <<: *env
+    commands:
+    - cd gluon
+    - make update
+    environment:
+      GLUON_TARGET: ar71xx-generic
 
-- name: build-ath79-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ath79-generic
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-ath79-generic
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ath79-generic
 
-- name: build-ar71xx-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ar71xx-generic
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-ar71xx-generic
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ar71xx-generic
 
-- name: build-ar71xx-tiny
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ar71xx-tiny
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-ar71xx-tiny
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ar71xx-tiny
 
-- name: build-ar71xx-nand
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ar71xx-nand
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-ar71xx-nand
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ar71xx-nand
 
-- name: build-brcm2708-bcm2708
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: brcm2708-bcm2708
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-brcm2708-bcm2708
+    <<: *gluon
+    environment:
+      GLUON_TARGET: brcm2708-bcm2708
 
-- name: build-brcm2708-bcm2709
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: brcm2708-bcm2709
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-brcm2708-bcm2709
+    <<: *gluon
+    environment:
+      GLUON_TARGET: brcm2708-bcm2709
 
-- name: build-mpc85xx-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: mpc85xx-generic
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-mpc85xx-generic
+    <<: *gluon
+    environment:
+      GLUON_TARGET: mpc85xx-generic
 
-- name: build-mpc85xx-p1020
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: mpc85xx-p1020
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-mpc85xx-p1020
+    <<: *gluon
+    environment:
+      GLUON_TARGET: mpc85xx-p1020
 
-- name: build-x86-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: x86-generic
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-x86-generic
+    <<: *gluon
+    environment:
+      GLUON_TARGET: x86-generic
 
-- name: build-x86-geode
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: x86-geode
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-x86-geode
+    <<: *gluon
+    environment:
+      GLUON_TARGET: x86-geode
 
-- name: build-x86-64
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: x86-64
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-x86-64
+    <<: *gluon
+    environment:
+      GLUON_TARGET: x86-64
 
-- name: build-ipq40xx-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ipq40xx-generic
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-ipq40xx-generic
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ipq40xx-generic
 
-- name: ipq806x-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ipq806x-generic
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: ipq806x-generic
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ipq806x-generic
 
-- name: build-ramips-mt7620
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ramips-mt7620
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-ramips-mt7620
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ramips-mt7620
 
-- name: build-ramips-mt7621
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ramips-mt7621
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-ramips-mt7621
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ramips-mt7621
 
-- name: build-ramips-mt76x8
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ramips-mt76x8
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-ramips-mt76x8
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ramips-mt76x8
 
-- name: build-ramips-rt305x
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: ramips-rt305x
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: build-ramips-rt305x
+    <<: *gluon
+    environment:
+      GLUON_TARGET: ramips-rt305x
 
-- name: lantiq-xway
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: lantiq-xway
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: lantiq-xway
+    <<: *gluon
+    environment:
+      GLUON_TARGET: lantiq-xway
 
-- name: lantiq-xrx200
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j4 GLUON_BRANCH=stable GLUON_RELEASE=$input_version-stable GLUON_OUTPUTDIR=output/stable
-  - make -j4 GLUON_BRANCH=beta GLUON_RELEASE=$input_version-beta GLUON_OUTPUTDIR=output/beta
-  - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_TARGET: lantiq-xrx200
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: lantiq-xrx200
+    <<: *gluon
+    environment:
+      GLUON_TARGET: lantiq-xrx200
 
-- name: make manifest
-  image: hoffmannhosting/gluon-builder
-  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
-  - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp
-  environment:
-    input_version: *input_version
-    GLUON_SITEDIR: /drone/src/site
-    FORCE_UNSAFE_CONFIGURE: 1
+  - name: 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
+    - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental GLUON_RELEASE=$input_version-exp
 
-- 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/*
-      - mkdir /srv/fwuploads/troisdorf/multi/stable
-      - mkdir /srv/fwuploads/troisdorf/multi/beta
-      - mkdir /srv/fwuploads/troisdorf/multi/experimental
+#  - 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/*
+#        - mkdir /srv/fwuploads/troisdorf/multi/stable
+#        - mkdir /srv/fwuploads/troisdorf/multi/beta
+#        - mkdir /srv/fwuploads/troisdorf/multi/experimental
+#    when:
+#      branch: master
 
-- name: upload stable
-  image: appleboy/drone-scp
-  settings:
-    host: 46.4.138.183
-    user: fwupload
-    key:
-      from_secret: ssh-update
-    strip_components: 6
-    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
-  image: appleboy/drone-scp
-  settings:
-    host: 46.4.138.183
-    user: fwupload
-    key:
-      from_secret: ssh-update
-    strip_components: 6
-    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/*
 
-- name: upload experimental
-  image: appleboy/drone-scp
-  settings:
-    host: 46.4.138.183
-    user: fwupload
-    key:
-      from_secret: ssh-update
-    strip_components: 6
-    target: /srv/fwuploads/troisdorf/multi/experimental
-    source: /drone/src/gluon/output/experimental/images/*
-
-- name: slack
-  image: plugins/slack
-  settings:
-    webhook:
-      from_secret: slack_webhook
-    channel: fftdf_firmware
+  - name: upload experimental
+    <<: *upload
+    settings:
+      target: /srv/fwuploads/troisdorf/multi/experimental
+      source: /drone/src/gluon/output/experimental/images/*
 
+  - name: slack
+    image: plugins/slack
+    settings:
+      webhook:
+        from_secret: slack_webhook
+      channel: fftdf_firmware