diff --git a/ci/.env.ci b/ci/.env.ci
index 57b6d64..9f665ad 100644
--- a/ci/.env.ci
+++ b/ci/.env.ci
@@ -3,10 +3,10 @@ SERVICE_URL=0.0.0.0
 SERVICE_PORT=5001
 
 # PRISMA
-DATABASE_URL="postgresql://mobicoop:mobicoop@v3-user-db-test:5432/mobicoop?schema=public"
+DATABASE_URL="postgresql://mobicoop:mobicoop@v3-db:5432/mobicoop?schema=public"
 
 # RABBIT MQ
-RMQ_URI=amqp://v3-user-broker:5672
+RMQ_URI=amqp://v3-broker:5672
 
 # MESSAGE BROKER
 BROKER_IMAGE=rabbitmq:3-alpine
@@ -16,6 +16,6 @@ POSTGRES_IMAGE=postgres:15.0
 
 # REDIS
 REDIS_IMAGE=redis:7.0-alpine
-REDIS_HOST=v3-user-redis
+REDIS_HOST=v3-redis
 REDIS_PASSWORD=redis
 REDIS_PORT=6379
diff --git a/ci/wait-up.sh b/ci/wait-up.sh
index b3af114..f29be44 100644
--- a/ci/wait-up.sh
+++ b/ci/wait-up.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 testlog() {
-	docker logs v3-user-db-test | grep -q "database system is ready to accept connections"
+	docker logs v3-db | grep -q "database system is ready to accept connections"
 }
 
 testlog 2> /dev/null
diff --git a/docker-compose.ci.tools.yml b/docker-compose.ci.tools.yml
index ecb90e1..a72f134 100644
--- a/docker-compose.ci.tools.yml
+++ b/docker-compose.ci.tools.yml
@@ -1,30 +1,20 @@
 version: '3.8'
 
 services:
-  v3-user-redis:
-    container_name: v3-user-redis
-    image: ${REDIS_IMAGE}
-    ports:
-      - 6501:6379
-    env_file:
-      - ci/.env.ci
-    networks:
-      - v3-network
-
-  v3-user-db-test:
-    container_name: v3-user-db-test
+  db:
+    container_name: v3-db
     image: ${POSTGRES_IMAGE}
     environment:
       POSTGRES_DB: mobicoop
       POSTGRES_USER: mobicoop
       POSTGRES_PASSWORD: mobicoop
     ports:
-      - 5601:5432
+      - 5432:5432
     networks:
       - v3-network
 
-  v3-user-broker:
-    container_name: v3-user-broker
+  broker:
+    container_name: v3-broker
     image: ${BROKER_IMAGE}
     ports:
       - 5672:5672