diff --git a/.gitignore b/.gitignore
index c54a879d4..5a09c1fd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,8 @@
 *.db
 *.db-journal
 docker-compose.override.yml
+docker-compose.local.yml
+docker-compose.tmp.yml
 
 # Binaries for programs and plugins
 *.exe
diff --git a/docker-compose.drone.yml b/docker-compose.drone.yml
index 6a0f4b381..f210e6894 100644
--- a/docker-compose.drone.yml
+++ b/docker-compose.drone.yml
@@ -140,7 +140,7 @@ services:
       DRONE_TARGET_BRANCH:
 
   mariadb:
-    image: mariadb:10.5
+    image: mariadb:10.6
     command: mysqld --port=4001 --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
     expose:
       - "4001"
diff --git a/docker-compose.yml b/docker-compose.yml
index b4dee46ba..2aaa18f76 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -79,7 +79,7 @@ services:
       - "go-mod:/go/pkg/mod"
 
   mariadb:
-    image: mariadb:10.5
+    image: mariadb:10.6
     command: mysqld --port=4001 --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
     expose:
       - "4001"
diff --git a/docker/examples/arm64/docker-compose.yml b/docker/examples/arm64/docker-compose.yml
index 3a156cecf..7c9cc2c00 100644
--- a/docker/examples/arm64/docker-compose.yml
+++ b/docker/examples/arm64/docker-compose.yml
@@ -110,7 +110,7 @@ services:
   # environment variable names.
   mariadb:
     restart: unless-stopped
-    image: arm64v8/mariadb:10.5
+    image: arm64v8/mariadb:10.6
     security_opt:
       - seccomp:unconfined
       - apparmor:unconfined
diff --git a/docker/examples/armv7/docker-compose.yml b/docker/examples/armv7/docker-compose.yml
index d1efa1578..cb408d256 100644
--- a/docker/examples/armv7/docker-compose.yml
+++ b/docker/examples/armv7/docker-compose.yml
@@ -102,7 +102,7 @@ services:
 
   mariadb:
     restart: unless-stopped
-    image: lscr.io/linuxserver/mariadb
+    image: lscr.io/linuxserver/mariadb:latest
     security_opt:
       - seccomp:unconfined
       - apparmor:unconfined
diff --git a/docker/examples/cloud/docker-compose.yml b/docker/examples/cloud/docker-compose.yml
index d6c58e149..a9400b49d 100644
--- a/docker/examples/cloud/docker-compose.yml
+++ b/docker/examples/cloud/docker-compose.yml
@@ -180,7 +180,7 @@ services:
 
   mariadb:
     restart: always
-    image: mariadb:10.5
+    image: mariadb:10.6
     container_name: mariadb
     security_opt:
       - seccomp:unconfined
diff --git a/docker/examples/docker-compose.yml b/docker/examples/docker-compose.yml
index f6d0c21c2..f210e6e89 100644
--- a/docker/examples/docker-compose.yml
+++ b/docker/examples/docker-compose.yml
@@ -108,7 +108,7 @@ services:
 
   mariadb:
     restart: unless-stopped
-    image: mariadb:10.5
+    image: mariadb:10.6
     security_opt:
       - seccomp:unconfined
       - apparmor:unconfined
diff --git a/docker/examples/macos/docker-compose.yml b/docker/examples/macos/docker-compose.yml
index 4f3ed8881..c770f612e 100644
--- a/docker/examples/macos/docker-compose.yml
+++ b/docker/examples/macos/docker-compose.yml
@@ -87,7 +87,7 @@ services:
 
   mariadb:
     restart: unless-stopped
-    image: mariadb:10.5
+    image: mariadb:10.6
     security_opt:
       - seccomp:unconfined
       - apparmor:unconfined
diff --git a/docker/examples/scheduler/docker-compose.yml b/docker/examples/scheduler/docker-compose.yml
index 98878331a..d78718a78 100644
--- a/docker/examples/scheduler/docker-compose.yml
+++ b/docker/examples/scheduler/docker-compose.yml
@@ -100,7 +100,7 @@ services:
 
   mariadb:
     restart: unless-stopped
-    image: mariadb:10.5
+    image: mariadb:10.6
     container_name: mariadb
     security_opt:
       - seccomp:unconfined
diff --git a/docker/examples/windows/docker-compose.yml b/docker/examples/windows/docker-compose.yml
index 74e9767fd..5fe052883 100644
--- a/docker/examples/windows/docker-compose.yml
+++ b/docker/examples/windows/docker-compose.yml
@@ -89,7 +89,7 @@ services:
 
   mariadb:
     restart: unless-stopped
-    image: mariadb:10.5
+    image: mariadb:10.6
     security_opt:
       - seccomp:unconfined
       - apparmor:unconfined