diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ba740711dad8037388f85679907165d7c64c157..c055102f9b4d5b143a9b9e9234dab01fb63ce9c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,14 +30,15 @@ build:image:
     - docker:dind
   stage: build
   image: docker:git
-  only:
-    refs:
-      - pushes
-    changes:
-      - Dockerfile
-      - .dockerignore
-      - bin/*
-      - config/*
+  rules:
+    - if: "$CI_PIPELINE_SOURCE == 'push'"
+      changes:
+        compare_to: $CI_DEFAULT_BRANCH
+        paths:
+          - Dockerfile
+          - .dockerignore
+          - bin/docker
+          - config/*
   script:
     # When building the image, we want to push into the container registry of
     # the project CI runs in, instead of a fixed one. This ensures that on
@@ -72,7 +73,7 @@ merge:foss:
     variables:
       - $MERGE_FOSS == '1'
   script:
-    - bash /app/bin/merge-train foss
+    - bash /builds/gitlab-org/merge-train/bin/merge-train foss
   # Since the schedule pipeline runs every 3 hours, and the job timeout is 70 minutes,
   # This job only has time for 1 retry
   retry: 1
@@ -99,7 +100,7 @@ merge:security:
     - if: '$MERGE_SECURITY'
       when: always
   script:
-    - bash /app/bin/merge-train security
+    - bash /builds/gitlab-org/merge-train/bin/merge-train security
   resource_group: 'merge_security-$SOURCE_PROJECT-$TARGET_PROJECT-$SOURCE_BRANCH-$TARGET_BRANCH'
   cache:
     paths:
diff --git a/Dockerfile b/Dockerfile
index 975a3a0ea758eb1c0fa4fdcef8132372c77e8bf8..f82b617b6a7fe418a4a12543842614e9675c5c20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,5 +12,3 @@ RUN apk add --update git openssh bash git-lfs
 RUN git config --global user.name 'GitLab Bot' && \
     git config --global user.email gitlab-bot@gitlab.com && \
     git lfs install
-
-ADD . /app/