diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0573cfc1c0c57332bc27ea8d76213f859cc92f41..5a13391f4bfcfe0cbeefb319619dd32543efb25c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,10 @@
 variables:
     DOCKER_HOST: tcp://docker-dind.gitlab:2375
 
+include:
+  - template: Jobs/Build.gitlab-ci.yml
+  - template: Jobs/Deploy.gitlab-ci.yml
+
 stages:
   - prepare
   - build
@@ -39,16 +43,10 @@ prepare_composer:
     key: "composer-$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
     paths:
       - vendor
-
-include:
-  - template: Jobs/Build.gitlab-ci.yml
     
 build:
   services:
 
-include:
-  - template: Jobs/Deploy.gitlab-ci.yml
-
 review:
   variables:
     HELM_UPGRADE_EXTRA_ARGS: --set service.internalPort=80 --set service.commonName= --set ingress.tls.enabled=false --set ingress.annotations.kubernetes\.io/tls-acme="false" --set ingress.annotations.nginx\.ingress\.kubernetes\.io/ssl-redirect="false"