diff --git a/docker-compose.yml b/docker-compose.yml
index 6dd4728..8be2f62 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,16 +8,16 @@ networks:
     external: true
 
 services:
-  server:
+  gitea:
     image: gitea/gitea:1.12.5
     environment:
       - USER_UID=1000
       - USER_GID=1000
       - DB_TYPE=mysql
       - DB_HOST=db:3306
-      - DB_NAME=gitea
-      - DB_USER=gitea
-      - DB_PASSWD=gitea
+      - DB_NAME=§{MYSQL_DATABASE}
+      - DB_USER=§{MYSQL_USER}
+      - DB_PASSWD=§{MYSQL_PASSWORD}
     restart: always
     networks:
       - webproxy
@@ -34,10 +34,10 @@ services:
     image: mysql:5.7
     restart: always
     environment:
-      - MYSQL_ROOT_PASSWORD=gitea
-      - MYSQL_USER=gitea
-      - MYSQL_PASSWORD=gitea
-      - MYSQL_DATABASE=gitea
+      - MYSQL_RANDOM_ROOT_PASSWORD='1'
+      - MYSQL_USER=§{MYSQL_USER}
+      - MYSQL_PASSWORD=§{MYSQL_PASSWORD}
+      - MYSQL_DATABASE=§{MYSQL_DATABASE}
     networks:
       - backend-gitea
     container_name: bmen-gitea-db