diff --git a/Makefile b/Makefile
index a151abda..4d7aab37 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ test-js:
 .PHONY: test-js
 
 test-codeception:
-	@docker compose run codeception run
+	@docker compose run --rm codeception run
 .PHONY: test-codeception
 
 vendor: $(DOCROOT)vendor/autoload.php
diff --git a/docker-compose.yml b/docker-compose.yml
index 0fa2f003..6cb4a0b1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
 services:
 
   web:
+    container_name: codepoints-web
     build:
       context: .
       dockerfile: dev/Dockerfile
@@ -17,7 +18,8 @@ services:
       - vite
 
   db:
-    image: mariadb:10.3
+    container_name: codepoints-db
+    image: mariadb:10.6
     volumes:
       - ./dev/db_data:/var/lib/mysql
     environment:
@@ -27,15 +29,18 @@ services:
       - MARIADB_PASSWORD=codepts
 
   vite:
+    container_name: codepoints-vite
     build:
       context: .
       dockerfile: dev/vite.Dockerfile
+    init: true
     ports:
       - 5173:5173
     volumes:
       - .:/app
 
   codeception:
+    container_name: codepoints-codeception
     image: codeception/codeception
     volumes:
       - .:/project