diff --git a/.env.dist b/.env.dist
index eeede43..aeeb7ef 100644
--- a/.env.dist
+++ b/.env.dist
@@ -3,15 +3,12 @@ SERVICE_URL=0.0.0.0
 SERVICE_PORT=5002
 
 # PRISMA
-DATABASE_URL="postgresql://auth:auth@v3-auth-db:5432/auth?schema=public"
+DATABASE_URL="postgresql://mobicoop:mobicoop@v3-db:5432/mobicoop?schema=auth"
 
 # RABBIT MQ
 RMQ_URI=amqp://v3-broker:5672
 RMQ_EXCHANGE=mobicoop
 
-# POSTGRES
-POSTGRES_IMAGE=postgres:15.0
-
 # OPA
 OPA_IMAGE=openpolicyagent/opa:0.48.0-rootless
 OPA_URL=http://v3-auth-opa:8181/v1/data/
diff --git a/.env.test b/.env.test
index 243a253..b2282e6 100644
--- a/.env.test
+++ b/.env.test
@@ -3,10 +3,7 @@ SERVICE_URL=0.0.0.0
 SERVICE_PORT=5002
 
 # PRISMA
-DATABASE_URL="postgresql://auth:auth@localhost:5602/auth?schema=public"
-
-# POSTGRES
-POSTGRES_IMAGE=postgres:15.0
+DATABASE_URL="postgresql://mobicoop:mobicoop@localhost:5432/mobicoop?schema=auth-test"
 
 # OPA
 OPA_IMAGE=openpolicyagent/opa:0.48.0-rootless
diff --git a/ci/.env.ci b/ci/.env.ci
index 112403f..c584cd6 100644
--- a/ci/.env.ci
+++ b/ci/.env.ci
@@ -3,7 +3,7 @@ SERVICE_URL=0.0.0.0
 SERVICE_PORT=5002
 
 # PRISMA
-DATABASE_URL="postgresql://auth:auth@v3-auth-db-test:5432/auth?schema=public"
+DATABASE_URL="postgresql://mobicoop:mobicoop@v3-db:5432/mobicoop?schema=public"
 
 # RABBIT MQ
 RMQ_URI=amqp://v3-auth-broker:5672
diff --git a/ci/wait-up.sh b/ci/wait-up.sh
index 6b6d286..f29be44 100644
--- a/ci/wait-up.sh
+++ b/ci/wait-up.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 testlog() {
-	docker logs v3-auth-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 7f39fde..a72f134 100644
--- a/docker-compose.ci.tools.yml
+++ b/docker-compose.ci.tools.yml
@@ -1,20 +1,20 @@
 version: '3.8'
 
 services:
-  v3-auth-db-test:
-    container_name: v3-auth-db-test
+  db:
+    container_name: v3-db
     image: ${POSTGRES_IMAGE}
     environment:
-      POSTGRES_DB: auth
-      POSTGRES_USER: auth
-      POSTGRES_PASSWORD: auth
+      POSTGRES_DB: mobicoop
+      POSTGRES_USER: mobicoop
+      POSTGRES_PASSWORD: mobicoop
     ports:
-      - 5602:5432
+      - 5432:5432
     networks:
       - v3-network
 
-  v3-auth-broker:
-    container_name: v3-auth-broker
+  broker:
+    container_name: v3-broker
     image: ${BROKER_IMAGE}
     ports:
       - 5672:5672
diff --git a/docker-compose.yml b/docker-compose.yml
index d5a55e4..402cc66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,43 +14,11 @@ services:
     command: npm run start:dev
     ports:
       - ${SERVICE_PORT:-5002}:${SERVICE_PORT:-5002}
-    depends_on:
-      - v3-auth-db
     networks:
       v3-network:
         aliases:
           - v3-auth-api
 
-  v3-auth-db:
-    container_name: v3-auth-db
-    image: ${POSTGRES_IMAGE}
-    environment:
-      POSTGRES_DB: auth
-      POSTGRES_USER: auth
-      POSTGRES_PASSWORD: auth
-    ports:
-      - 5502:5432
-    volumes:
-      - .postgresql:/var/lib/postgresql/data:rw
-    networks:
-      v3-network:
-        aliases:
-          - v3-auth-db
-
-  v3-auth-db-test:
-    container_name: v3-auth-db-test
-    image: ${POSTGRES_IMAGE}
-    environment:
-      POSTGRES_DB: auth
-      POSTGRES_USER: auth
-      POSTGRES_PASSWORD: auth
-    ports:
-      - 5602:5432
-    networks:
-      v3-network:
-        aliases:
-          - v3-auth-db-test
-
   v3-auth-opa:
     container_name: v3-auth-opa
     image: ${OPA_IMAGE}