diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 55207626909f0f4598ae982b08021325be4fb0d7..e994b1f5b15b2076dcf3f979841be7a20c16a897 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -6,17 +6,12 @@ version: "3.6"
 
 volumes:
   metadata-db-data:
+  user-db-data:
   search-db-data:
   broker-service-data:
   authentication-service-data:
 
 networks:
-  userdb:
-    name: userdb
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.30.0.0/16
   public:
     name: public
     driver: bridge
@@ -41,6 +36,7 @@ services:
       core:
     volumes:
       - metadata-db-data:/var/lib/mysql
+      - ./dbrepo-metadata-db/setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
     ports:
       - "3306:3306"
       - "9100:9100"
@@ -49,20 +45,42 @@ services:
     logging:
       driver: json-file
 
+  dbrepo-user-db:
+    restart: "no"
+    container_name: dbrepo-user-db
+    hostname: user-db
+    image: mariadb:10.5
+    networks:
+      core:
+    volumes:
+      - user-db-data:/var/lib/mysql
+      - "/tmp:/tmp"
+    ports:
+      - "3307:3306"
+      - "9101:9100"
+    env_file:
+      - .env
+    environment:
+      - MARIADB_ROOT_PASSWORD=$USER_DB_PASSWORD
+    healthcheck:
+      test: mysqladmin ping --user="$USER_DB_USERNAME" --password="$USER_DB_PASSWORD" --silent
+      interval: 10s
+      timeout: 5s
+      retries: 12
+    logging:
+      driver: json-file
+
   dbrepo-database-service:
     restart: "no"
     container_name: dbrepo-database-service
     hostname: database-service
     image: dbrepo/database-service:1.3
     networks:
-      userdb:
       core:
     ports:
       - "9092:9092"
     env_file:
       - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       dbrepo-container-service:
         condition: service_healthy
@@ -84,8 +102,6 @@ services:
       - "9091:9091"
     env_file:
       - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       dbrepo-authentication-service:
         condition: service_healthy
@@ -119,7 +135,6 @@ services:
     image: dbrepo/query-service:1.3
     networks:
       core:
-      userdb:
     env_file:
       - .env
     volumes:
@@ -141,13 +156,11 @@ services:
     image: dbrepo/table-service:1.3
     networks:
       core:
-      userdb:
     ports:
       - "9094:9094"
     env_file:
       - .env
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
       - ${SHARED_FILESYSTEM}:/tmp
     depends_on:
       dbrepo-authentication-service:
@@ -206,12 +219,10 @@ services:
     image: dbrepo/analyse-service:1.3
     networks:
       core:
-      userdb:
     env_file:
       - .env
     volumes:
       - ${SHARED_FILESYSTEM}:/tmp
-      - /var/run/docker.sock:/var/run/docker.sock
     logging:
       driver: json-file
 
@@ -247,7 +258,6 @@ services:
       - .env
     volumes:
       - ${SHARED_FILESYSTEM}:/tmp
-      - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       dbrepo-metadata-db:
         condition: service_healthy
diff --git a/docker-compose.yml b/docker-compose.yml
index f4532513c97cf464d9ce154fa7c6cc7520ad3915..19a7b8d3b6620f939e1895122ece1dbec86094f4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,17 +6,12 @@ version: "3.6"
 
 volumes:
   metadata-db-data:
+  user-db-data:
   search-db-data:
   broker-service-data:
   authentication-service-data:
 
 networks:
-  userdb:
-    name: userdb
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.30.0.0/16
   public:
     name: public
     driver: bridge
@@ -42,6 +37,7 @@ services:
       core:
     volumes:
       - metadata-db-data:/var/lib/mysql
+      - ./dbrepo-metadata-db/setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
     ports:
       - "3306:3306"
       - "9100:9100"
@@ -50,6 +46,31 @@ services:
     logging:
       driver: json-file
 
+  dbrepo-user-db:
+    restart: "no"
+    container_name: dbrepo-user-db
+    hostname: user-db
+    image: mariadb:10.5
+    networks:
+      core:
+    volumes:
+      - user-db-data:/var/lib/mysql
+      - "/tmp:/tmp"
+    ports:
+      - "3307:3306"
+      - "9101:9100"
+    env_file:
+      - .env
+    environment:
+      - MARIADB_ROOT_PASSWORD=$USER_DB_PASSWORD
+    healthcheck:
+      test: mysqladmin ping --user="$USER_DB_USERNAME" --password="$USER_DB_PASSWORD" --silent
+      interval: 10s
+      timeout: 5s
+      retries: 12
+    logging:
+      driver: json-file
+
   dbrepo-database-service:
     restart: "no"
     container_name: dbrepo-database-service
@@ -57,14 +78,11 @@ services:
     build: ./dbrepo-database-service
     image: dbrepo-database-service
     networks:
-      userdb:
       core:
     ports:
       - "9092:9092"
     env_file:
       - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       dbrepo-container-service:
         condition: service_healthy
@@ -89,8 +107,6 @@ services:
       - "9091:9091"
     env_file:
       - .env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
       dbrepo-authentication-service:
         condition: service_healthy
@@ -128,7 +144,6 @@ services:
     image: dbrepo-query-service
     networks:
       core:
-      userdb:
     ports:
       - "9093:9093"
     env_file:
@@ -155,13 +170,11 @@ services:
     image: dbrepo-table-service
     networks:
       core:
-      userdb:
     ports:
       - "9094:9094"
     env_file:
       - .env
     volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock"
       - "/tmp:/tmp"
     depends_on:
       dbrepo-authentication-service:
@@ -227,14 +240,12 @@ services:
     image: dbrepo-analyse-service
     networks:
       core:
-      userdb:
     ports:
       - "5000:5000"
     env_file:
       - .env
     volumes:
       - "/tmp:/tmp"
-      - /var/run/docker.sock:/var/run/docker.sock
     logging:
       driver: json-file
 
@@ -274,7 +285,6 @@ services:
       - .env
     volumes:
       - "/tmp:/tmp"
-      - "/var/run/docker.sock:/var/run/docker.sock"
     depends_on:
       dbrepo-metadata-db:
         condition: service_healthy