diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b39b4d35f1e54729599cd238373e26c6d3cce45d..6a815ce64167649545ce8fb8e37061e1681df4b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,35 +1,40 @@
 variables:
   GLUON_BRANCH: "nightly"
 
-before_script:
-  - bash build/before.sh
-
 stages:
+  - prepare
   - build
   - sign
   - deploy
 
+prepare-job:
+  stage: prepare
+  tags:
+    - firmware
+  script:
+  - bash build/before.sh
+
 ar71xx-generic:
   stage: build
   tags:
     - firmware
   script:
     - bash build/build-ar71xx-generic.sh
-    
+
 #ar71xx-nand:
 #  stage: build
 #  tags:
 #    - firmware
 #  script:
 #    - bash build/build-ar71xx-nand.sh
-    
+
 sign:
   stage: deploy
   tags:
     - firmware
   script:
     - bash build/sign.sh
-    
+
 deploy:
   stage: deploy
   tags: