diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d9b08861..5ed82703 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,8 +3,8 @@ name: KtMongo
 services:
   mongo:
     # When downgrading the version, run
-    #  docker compose -p ktmongo rm -v
+    #  docker compose rm -v
     # (all data will be lost)
-    image: "mongo:8.0.6"
+    image: "mongo:7.0.31"
     ports:
       - "27017:27017"
-- 
2.51.2


From 9ef5908ee04b806bc41fb6a947b51e23fdbbb365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?=
 <ivan.canet@gmail.com>
Date: Wed, 18 Mar 2026 22:55:20 +0100
Subject: [PATCH 2/5] build(idea): Simplify run configurations

---
 .idea/runConfigurations/Check.xml            |  5 ++++-
 .idea/runConfigurations/Check__JVM_only_.xml |  6 ++++--
 .idea/runConfigurations/MongoDB.xml          | 12 ------------
 .idea/startup.xml                            |  8 --------
 4 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 .idea/runConfigurations/MongoDB.xml
 delete mode 100644 .idea/startup.xml

diff --git a/.idea/runConfigurations/Check.xml b/.idea/runConfigurations/Check.xml
index bab2591d..66086f5c 100644
--- a/.idea/runConfigurations/Check.xml
+++ b/.idea/runConfigurations/Check.xml
@@ -17,10 +17,13 @@
     </ExternalSystemSettings>
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
     <DebugAllEnabled>false</DebugAllEnabled>
     <RunAsTest>true</RunAsTest>
+    <GradleProfilingDisabled>false</GradleProfilingDisabled>
+    <GradleCoverageDisabled>false</GradleCoverageDisabled>
     <method v="2">
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="MongoDB" run_configuration_type="docker-deploy" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="External services" run_configuration_type="docker-deploy" />
     </method>
   </configuration>
 </component>
diff --git a/.idea/runConfigurations/Check__JVM_only_.xml b/.idea/runConfigurations/Check__JVM_only_.xml
index 026288f7..d07d03c9 100644
--- a/.idea/runConfigurations/Check__JVM_only_.xml
+++ b/.idea/runConfigurations/Check__JVM_only_.xml
@@ -23,6 +23,8 @@
     <RunAsTest>true</RunAsTest>
     <GradleProfilingDisabled>false</GradleProfilingDisabled>
     <GradleCoverageDisabled>false</GradleCoverageDisabled>
-    <method v="2" />
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="External services" run_configuration_type="docker-deploy" />
+    </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/runConfigurations/MongoDB.xml b/.idea/runConfigurations/MongoDB.xml
deleted file mode 100644
index bb7f2e6f..00000000
--- a/.idea/runConfigurations/MongoDB.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="MongoDB" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-    <deployment type="docker-compose.yml">
-      <settings>
-        <option name="composeProjectName" value="ktmongo" />
-        <option name="envFilePath" value="" />
-        <option name="sourceFilePath" value="docker/docker-compose.yml" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/startup.xml b/.idea/startup.xml
deleted file mode 100644
index 5994d1a8..00000000
--- a/.idea/startup.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectStartupSharedConfiguration">
-    <configurations>
-      <configuration id="Docker.MongoDB" name="MongoDB" />
-    </configurations>
-  </component>
-</project>
\ No newline at end of file
-- 
2.51.2


From c6d5d2a12a09d27d463ffec023950eecf622e777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?=
 <ivan.canet@gmail.com>
Date: Sun, 22 Mar 2026 14:51:57 +0100
Subject: [PATCH 3/5] ci(gitlab): Stop testing MongoDB 8.x

See https://gitlab.com/opensavvy/ktmongo/-/work_items/116
---
 .gitlab-ci.main.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.main.kts b/.gitlab-ci.main.kts
index 47544b9c..98edefd9 100755
--- a/.gitlab-ci.main.kts
+++ b/.gitlab-ci.main.kts
@@ -1,7 +1,7 @@
 #!/usr/bin/env kotlin
 
 /*
- * Copyright (c) 2025, OpenSavvy and contributors.
+ * Copyright (c) 2025-2026, OpenSavvy and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,7 +112,7 @@ fun Job.nativeIosArm64() {
 
 // endregion
 
-val supportedMongoDB = listOf("6.0.26", "7.0.25", "8.2.1")
+val supportedMongoDB = listOf("6.0.26", "7.0.25")
 
 gitlabCi {
 	val build by stage()
-- 
2.51.2


From 9baea3db6836cdf7462e9be5175ef00bd7beb233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?=
 <ivan.canet@gmail.com>
Date: Sun, 22 Mar 2026 14:52:26 +0100
Subject: [PATCH 4/5] ci(gitlab): Drop support for MongoDB 6.x

MongoDB officially doesn't support these versions anymore.
---
 .gitlab-ci.main.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.main.kts b/.gitlab-ci.main.kts
index 98edefd9..dedfc921 100755
--- a/.gitlab-ci.main.kts
+++ b/.gitlab-ci.main.kts
@@ -112,7 +112,7 @@ fun Job.nativeIosArm64() {
 
 // endregion
 
-val supportedMongoDB = listOf("6.0.26", "7.0.25")
+val supportedMongoDB = listOf("7.0.25")
 
 gitlabCi {
 	val build by stage()
-- 
2.51.2


From 35174a59136dd14d46de8550603fecaf3edba9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?=
 <ivan.canet@gmail.com>
Date: Sun, 22 Mar 2026 14:52:44 +0100
Subject: [PATCH 5/5] ci(gitlab): Test with MongoDB 7.0.31

---
 .gitlab-ci.main.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.main.kts b/.gitlab-ci.main.kts
index dedfc921..f1440046 100755
--- a/.gitlab-ci.main.kts
+++ b/.gitlab-ci.main.kts
@@ -112,7 +112,7 @@ fun Job.nativeIosArm64() {
 
 // endregion
 
-val supportedMongoDB = listOf("7.0.25")
+val supportedMongoDB = listOf("7.0.31")
 
 gitlabCi {
 	val build by stage()