diff --git a/.drone.yml b/.drone.yml
index a131f92..a1437fc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,8 +15,6 @@ 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
@@ -24,6 +22,8 @@ global-variables:
       key:
         from_secret: ssh-update
       strip_components: 6
+    when:
+      branch: master
 
 kind: pipeline
 type: docker
@@ -155,8 +155,6 @@ steps: &steps
     - 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
@@ -171,6 +169,8 @@ steps: &steps
         - mkdir /srv/fwuploads/troisdorf/multi/stable
         - mkdir /srv/fwuploads/troisdorf/multi/beta
         - mkdir /srv/fwuploads/troisdorf/multi/experimental
+    when:
+      branch: master
 
   - name: upload stable
     <<: *upload