diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b6d828..011cd61 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,2 @@
-variables:
-  DOCKER_IMAGE: registry.forge.hefr.ch/team-raclette/project-softweng/gateway:latest
-
-default:
-  image: $DOCKER_IMAGE
-
-stages:
-  - build-docker
-
-# This job runs only when Dockerfile changes
-docker-build:
-  image: docker:latest
-  stage: build-docker
-  services:
-    - docker:dind
-  script:
-    - docker build -t $DOCKER_IMAGE -f gateway/Dockerfile .
-    - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
-    - docker push $DOCKER_IMAGE
-  rules:
-    - if: $GITLAB_CI == 'false' # Only run in GitLab CI
-      when: never
-    - changes:
-        - gateway/Dockerfile
-        - gateway/src/*
+include:
+  - local: gateway/.gitlab-ci.yml
\ No newline at end of file
diff --git a/gateway/.gitlab-ci.yml b/gateway/.gitlab-ci.yml
new file mode 100644
index 0000000..9144490
--- /dev/null
+++ b/gateway/.gitlab-ci.yml
@@ -0,0 +1,24 @@
+variables:
+  DOCKER_IMAGE: registry.forge.hefr.ch/team-raclette/project-softweng/gateway:latest
+
+default:
+  image: $DOCKER_IMAGE
+
+stages:
+  - build-docker
+
+# This job runs only when Dockerfile changes
+docker-build:
+  image: docker:latest
+  stage: build-docker
+  services:
+    - docker:dind
+  script:
+    - docker build -t $DOCKER_IMAGE -f gateway/Dockerfile .
+    - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
+    - docker push $DOCKER_IMAGE
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_COMMIT_BRANCH == 'main'
+    - changes:
+        - gateway/Dockerfile
+        - gateway/src/*