diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c9de0c017ba88d8438a7a4335b3d40f2dae9b5d..20ccce0ddfdcb45049af34f36bf138e7983b6f07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 stages:
   - prepare
+  - build
 
 prepare_node:
   stage: prepare
@@ -14,7 +15,7 @@ prepare_node:
       - public/css/all.css
   cache:
     # Cache per Branch
-    key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
+    key: "node-$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
     paths:
       - node_modules
   only:
@@ -30,6 +31,9 @@ prepare_composer:
     paths:
       - vendor
   cache:
-    key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
+    key: "composer-$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
     paths:
-      - vendor
\ No newline at end of file
+      - vendor
+
+include:
+  - template: Jobs/Build.gitlab-ci.yml
\ No newline at end of file