diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 6b6b2c04f..f4188d430 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -93,9 +93,6 @@ services:
   #########################################################
   mariadb:
     image: gradido/mariadb:test
-    environment:
-      - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1
-      - MARIADB_USER=root
     networks: 
       - internal-net
       - external-net
diff --git a/docker-compose.yml b/docker-compose.yml
index a4d759695..9396cd393 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -65,7 +65,7 @@ services:
       context: ./mariadb
       target: mariadb_server
     environment:
-      - MARIADB_ALLOW_EMPTY_PASSWORD=1
+      - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1
       - MARIADB_USER=root
     networks:
       - internal-net
@@ -92,7 +92,6 @@ services:
       - 4000:4000
     depends_on:
       - mariadb
-    restart: always
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
@@ -128,7 +127,6 @@ services:
     #  - 5000:5000
     depends_on:
       - mariadb
-    restart: always
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
@@ -162,7 +160,6 @@ services:
       - external-net
     ports:
       - 6010:6010
-    restart: always
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
@@ -196,7 +193,6 @@ services:
       - 5010:5010
     depends_on:
       - mariadb
-    restart: always
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"