diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0f285c2..d7b36d0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -36,8 +36,8 @@ jobs:
       - name: Run KtLint
         run: ./gradlew ktlintCheck
 
-      - name: Start Docker Compose services
-        run: ./gradlew composeUp
+      - name: Start CI Docker Compose services
+        run: ./gradlew composeUp -Pci
 
       - name: Run tests
         run: ./gradlew test --no-daemon
diff --git a/build.gradle.kts b/build.gradle.kts
index 76cdd3d..d34eee9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -45,7 +45,15 @@ tasks.withType<Test>().configureEach {
 }
 
 dockerCompose {
-  useComposeFiles.set(listOf("docker/docker-compose-test.yaml"))
+  val composeFile =
+    if (project.hasProperty("ci")) {
+      // Use docker-compose-ci.yaml for the CI
+      "docker/docker-compose-ci.yaml"
+    } else {
+      // Use docker-compose-test.yaml for local tests
+      "docker/docker-compose-test.yaml"
+    }
+  useComposeFiles.set(listOf(composeFile))
   setProjectName("event-demo-test")
 }
 
diff --git a/docker/docker-compose-ci.yaml b/docker/docker-compose-ci.yaml
new file mode 100644
index 0000000..4e7dcfb
--- /dev/null
+++ b/docker/docker-compose-ci.yaml
@@ -0,0 +1,6 @@
+name: event-demo-test
+include:
+  - path:
+    - parts/docker-compose-databases.yaml
+    - parts/docker-compose-databases-expose.yaml
+    - parts/docker-compose-traefik.yaml
\ No newline at end of file