diff --git a/.drone.yml b/.drone.yml
index 3f47423..a131f92 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,6 +15,8 @@ global-variables:
       - make -j4 GLUON_BRANCH=experimental GLUON_RELEASE=$input_version-exp GLUON_OUTPUTDIR=output/experimental
 
   upload: &upload
+    when:
+      branch: master
     image: appleboy/drone-scp
     settings:
       host: 46.4.138.183
@@ -22,8 +24,6 @@ global-variables:
       key:
         from_secret: ssh-update
       strip_components: 6
-    when:
-      branch: master
 
 kind: pipeline
 type: docker
@@ -147,31 +147,31 @@ steps: &steps
     environment:
       GLUON_TARGET: lantiq-xrx200
 
-#  - name: make manifest
-#    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
-##     when:
-##       branch: master
-#
+  - name: make manifest
+    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
+    when:
+      branch: master
+    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: upload stable
     <<: *upload
     settings: