diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4b4dd7..a1eafcd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,7 @@
+stages:
+  - gateway-build
+  - web-app-build
+
 include:
   - local: gateway/.gitlab-ci.yml
   - local: web-app/.gitlab-ci.yml
\ No newline at end of file
diff --git a/gateway/.gitlab-ci.yml b/gateway/.gitlab-ci.yml
index 9144490..4fddc9d 100644
--- a/gateway/.gitlab-ci.yml
+++ b/gateway/.gitlab-ci.yml
@@ -5,12 +5,12 @@ default:
   image: $DOCKER_IMAGE
 
 stages:
-  - build-docker
+  - gateway-build
 
 # This job runs only when Dockerfile changes
-docker-build:
+gateway-docker-build:
   image: docker:latest
-  stage: build-docker
+  stage: gateway-build
   services:
     - docker:dind
   script:
diff --git a/web-app/.gitlab-ci.yml b/web-app/.gitlab-ci.yml
index d4977c0..e6b3cba 100644
--- a/web-app/.gitlab-ci.yml
+++ b/web-app/.gitlab-ci.yml
@@ -5,11 +5,11 @@ default:
   image: $DOCKER_IMAGE
 
 stages:
-  - build-docker
+  - web-app-build
 
-docker-build:
+web-app-docker-build:
   image: docker:latest
-  stage: build-docker
+  stage: web-app-build
   services:
     - docker:dind
   script: