diff --git a/docker-compose.api.yml b/docker-compose.api.yml
index 140f762..0eb31db 100644
--- a/docker-compose.api.yml
+++ b/docker-compose.api.yml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
   api:
     build: .
-    container_name: rp-api
+    container_name: ${RP_API_CONTAINER_NAME:-rp-api}
     ports:
       - "3000:3000" # API
     volumes:
diff --git a/docker-compose.db.yml b/docker-compose.db.yml
index e3852f2..79064a7 100644
--- a/docker-compose.db.yml
+++ b/docker-compose.db.yml
@@ -1,6 +1,6 @@
 services:
   db:
-    container_name: rp-db
+    container_name: ${RP_DB_CONTAINER_NAME:-rp-db}
     image: supabase/postgres:15.8.1.060
     restart: unless-stopped
     volumes:
@@ -29,7 +29,7 @@ services:
       ]
 
   meta:
-    container_name: rp-meta
+    container_name: ${RP_META_CONTAINER_NAME:-rp-meta}
     image: supabase/postgres-meta:v0.89.0
     restart: unless-stopped
     depends_on:
@@ -44,7 +44,7 @@ services:
       PG_META_DB_PASSWORD: ${POSTGRES_PASSWORD}
 
   studio:
-    container_name: rp-studio
+    container_name: ${RP_STUDIO_CONTAINER_NAME:-rp-studio}
     image: supabase/studio:2025.05.19-sha-3487831
     restart: unless-stopped
     ports:
@@ -75,7 +75,7 @@ services:
       AUTH_JWT_SECRET: ${JWT_SECRET}
 
   rest:
-    container_name: rp-rest
+    container_name: ${RP_REST_CONTAINER_NAME:-rp-rest}
     image: postgrest/postgrest:v12.2.12
     restart: unless-stopped
     depends_on:
@@ -92,7 +92,7 @@ services:
     command: ["postgrest"]
 
   kong:
-    container_name: rp-kong
+    container_name: ${RP_KONG_CONTAINER_NAME:-rp-kong}
     image: kong:2.8.1
     restart: unless-stopped
     ports:
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 8630e90..7663215 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,10 +1,9 @@
-version: "3.8"
-
 services:
   db:
     extends:
       file: docker-compose.db.yml
       service: db
+    container_name: ${RP_DB_CONTAINER_NAME:-rp-test-db}
     networks:
       - rp-network
 
@@ -12,6 +11,7 @@ services:
     extends:
       file: docker-compose.db.yml
       service: kong
+    container_name: ${RP_KONG_CONTAINER_NAME:-rp-test-kong}
     networks:
       - rp-network
 
@@ -19,16 +19,18 @@ services:
     extends:
       file: docker-compose.db.yml
       service: rest
+    container_name: ${RP_REST_CONTAINER_NAME:-rp-test-rest}
     networks:
       - rp-network
 
   test:
     build: .
-    container_name: rp-test
+    container_name: ${RP_TEST_CONTAINER_NAME:-rp-test}
     tty: true
     stdin_open: true
     volumes:
       - .:/app
+      - /app/node_modules
     environment:
       - NODE_ENV=TESTING
       - POSTGRES_HOST=db
diff --git a/package.json b/package.json
index 6bba1b9..d5759ec 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
         "verify": "yarn build && yarn lint:check && yarn format:check",
         "test": "jest --config=testing/jest.config.ts",
         "test:watch": "jest --config=testing/jest.config.ts --watch",
-        "test:docker": "docker compose -f docker-compose.test.yml run --rm test yarn test",
+        "test:docker": "sh -c 'trap \"docker compose -p rp-api-test -f docker-compose.test.yml down -v --remove-orphans\" EXIT; docker compose -p rp-api-test -f docker-compose.test.yml run --rm test yarn test'",
         "logs": "docker compose logs -f api",
         "shell": "docker compose exec api sh",
         "restart": "docker compose restart api"