diff --git a/.drone.yml b/.drone.yml
index d6522fa..7369b50 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,267 +20,285 @@ steps:
   image: hoffmannhosting/gluon-builder
   commands:
   - cd gluon
-  - make update
+  - make update 
   environment:
     input_hood: tdf
     input_version: v2018.2.2-1
     GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
     GLUON_TARGET: ar71xx-generic
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
     FORCE_UNSAFE_CONFIGURE: 1
 
 - name: build-ar71xx-generic
   image: hoffmannhosting/gluon-builder
   commands:
   - cd gluon
-  - make -j16
+  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
   environment:
     input_hood: tdf
     input_version: v2018.2.2-1
     GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
     GLUON_TARGET: ar71xx-generic
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
     FORCE_UNSAFE_CONFIGURE: 1
 
-- name: build-ar71xx-tiny
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: ar71xx-tiny
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-ar71xx-nand
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: ar71xx-nand
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-brcm2708-bcm2708
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: brcm2708-bcm2708
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-brcm2708-bcm2709
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: brcm2708-bcm2709
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-mpc85xx-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: mpc85xx-generic
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-x86-generic
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: x86-generic
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-x86-geode
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: x86-geode
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-x86-64
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: x86-64
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-ipq40xx
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: ipq40xx
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-ramips-mt7620
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: ramips-mt7620
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-ramips-mt7621
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: ramips-mt7621
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-ramips-mt76x8
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: ramips-mt76x8
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
-
-- name: build-ramips-rt305x
-  image: hoffmannhosting/gluon-builder
-  commands:
-  - cd gluon
-  - make -j16
-  environment:
-    input_hood: tdf
-    input_version: v2018.2.2-1
-    GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
-    GLUON_TARGET: ramips-rt305x
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
-    FORCE_UNSAFE_CONFIGURE: 1
+#- name: build-ar71xx-tiny
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: ar71xx-tiny
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-ar71xx-nand
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: ar71xx-nand
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-brcm2708-bcm2708
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: brcm2708-bcm2708
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-brcm2708-bcm2709
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: brcm2708-bcm2709
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-mpc85xx-generic
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: mpc85xx-generic
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-x86-generic
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: x86-generic
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-x86-geode
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: x86-geode
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-x86-64
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: x86-64
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-ipq40xx
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: ipq40xx
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-ramips-mt7620
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: ramips-mt7620
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-ramips-mt7621
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: ramips-mt7621
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-ramips-mt76x8
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: ramips-mt76x8
+#    FORCE_UNSAFE_CONFIGURE: 1
+#
+#- name: build-ramips-rt305x
+#  image: hoffmannhosting/gluon-builder
+#  commands:
+#  - cd gluon
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
+#  - make -j16 GLUON_BRANCH=beta GLUON_RELEASE=$input_hood-beta-$input_version GLUON_OUTPUTDIR=output/beta
+#  - make -j16 GLUON_BRANCH=experimental GLUON_RELEASE=$input_hood-experimantal-$input_version GLUON_OUTPUTDIR=output/experimental
+#  environment:
+#    input_hood: tdf
+#    input_version: v2018.2.2-1
+#    GLUON_SITEDIR: /drone/src/site
+#    GLUON_TARGET: ramips-rt305x
+#    FORCE_UNSAFE_CONFIGURE: 1
 #
 #- name: build-sunxi-cortexa7
 #  image: hoffmannhosting/gluon-builder
 #  commands:
 #  - cd gluon
-#  - make -j16
+#  - make -j16 GLUON_BRANCH=stable GLUON_RELEASE=$input_hood-stable-$input_version GLUON_OUTPUTDIR=output/stable
 #  environment:
 #    input_hood: tdf
 #    input_version: v2018.2.2-1
 #    GLUON_SITEDIR: /drone/src/site
-#    GLUON_BRANCH: stable
 #    GLUON_TARGET: sunxi-cortexa7
-#    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
 #    FORCE_UNSAFE_CONFIGURE: 1
 
 - name: make manifest
   image: hoffmannhosting/gluon-builder
   commands:
   - cd gluon
-  - make manifest
+  - make manifest GLUON_BRANCH=stable GLUON_OUTPUTDIR=output/stable
+  - make manifest GLUON_BRANCH=beta GLUON_OUTPUTDIR=output/beta
+  - make manifest GLUON_BRANCH=experimental GLUON_OUTPUTDIR=output/experimental
   environment:
     input_hood: tdf
     input_version: v2018.2.2-1
     GLUON_SITEDIR: /drone/src/site
-    GLUON_BRANCH: stable
     GLUON_TARGET: ramips-rt305x
-    GLUON_RELEASE: $input_hood-$GLUON_BRANCH-$input_version
     FORCE_UNSAFE_CONFIGURE: 1
-
-- 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-tdf.sh
-  #    - rm -rf /srv/fwuploads/troisdorf/tdf/*
-
-- name: copy-firmware-to-update-server
-  image: appleboy/drone-scp
-  settings:
-    host: 46.4.138.183
-    user: fwupload
-    key:
-      from_secret: ssh-update
-    strip_components: 4
-    target: /tmp
-    source: /drone/src/gluon/output/*
-
-- name: slack
-  image: plugins/slack
-  settings:
-    webhook:
-      from_secret: slack_webhook
-    channel: fftdf_firmware
\ No newline at end of file
+#‚
+#‚- 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-tdf.sh
+#‚      - rm -rf /srv/fwuploads/troisdorf/tdf/*
+#‚
+#‚- name: upload stable
+#‚  image: appleboy/drone-scp
+#‚  settings:
+#‚    host: 46.4.138.183
+#‚    user: fwupload
+#‚    key:
+#‚      from_secret: ssh-update
+#‚    strip_components: 4
+#‚    target: /srv/fwuploads/troisdorf/tdf/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: 4
+#‚    target: /srv/fwuploads/troisdorf/tdf/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: 4
+#‚    target: /srv/fwuploads/troisdorf/tdf/experimental
+#‚    source: /drone/src/gluon/output/experimental/images/*
+#‚
+#‚- name: slack
+#‚  image: plugins/slack
+#‚  settings:
+#‚    webhook:
+#‚      from_secret: slack_webhook
+#‚    channel: fftdf_firmware
\ No newline at end of file