diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aff2a64670..f8c62b9bec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -122,13 +122,13 @@ commit-linux-debug:
     - cp -r voxygen/shaders commit-build/
     - rm -f commit-linux-debug.tar.bz2
     - tar -cvjSf commit-linux-debug.tar.bz2 commit-build
-  except:
-    - schedules
   artifacts:
     paths:
       - add-docker-gitlab-ci
       - commit-linux-debug.tar.bz2
     expire_in: 1 week
+  except:
+    - schedules
   only:
     refs:
       - master
@@ -150,12 +150,12 @@ commit-windows-debug:
     - cp -r voxygen/shaders commit-build/
     - rm -f commit-windows-debug.zip
     - zip -r commit-windows-debug.zip commit-build
-  except:
-    - schedules
   artifacts:
     paths:
       - commit-windows-debug.zip
     expire_in: 1 week
+  except:
+    - schedules
   only:
     refs:
       - master
@@ -181,13 +181,12 @@ nightly-linux-optimized:
     - cp -r voxygen/shaders nightly-build/
     - rm -f nightly-linux-optimized.tar.bz2
     - tar -cvjSf nightly-linux-optimized.tar.bz2 nightly-build
-  only:
-    - schedules
   artifacts:
     paths:
       - nightly-linux-optimized.tar.bz2
     expire_in: 2 days
   only:
+    - schedules
     refs:
       - master
       - add-docker-gitlab-ci
@@ -208,13 +207,12 @@ nightly-windows-optimized:
     - cp -r voxygen/shaders nightly-build/
     - rm -f nightly-windows-optimized.zip
     - zip -r nightly-windows-optimized.zip nightly-build
-  only:
-    - schedules
   artifacts:
     paths:
       - nightly-windows-optimized.zip
     expire_in: 2 days
   only:
+    - schedules
     refs:
       - master
       - add-docker-gitlab-ci