diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 106a520..4e05530 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,10 +7,6 @@ variables:
   NUGET_PACKAGES_DIRECTORY: '.nuget'
   SOURCE_CODE_PATH: 'ChaosBot/*/'
 
-only:
-  changes:
-    - ChaosBot/**/*
-
 stages:
   - build
   - test
@@ -32,9 +28,15 @@ cache:
 
 before_script:
   - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY'
+  only:
+    changes:
+      - ChaosBot/**/*
 
 build:
   stage: build
+  only:
+    changes:
+      - ChaosBot/**/*
   tags:
   - docker
   - hawkeye
@@ -43,6 +45,9 @@ build:
 
 tests:
   stage: test
+  only:
+    changes:
+      - ChaosBot/**/*
   tags:
   - docker
   - hawkeye