diff --git a/docker-compose.yml b/docker-compose.yml
index 74f2d8a..b39f062 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,6 +23,11 @@ services:
       - GITEA_MAILER_USER=$GITEA_MAILER_USER
       - GITEA_MAILER_FROM=$GITEA_MAILER_FROM
       - GITEA_MAILER_PASSWD=$GITEA_MAILER_PASSWD
+      - GITEA__database__DB_TYPE=mysql
+      - GITEA__database__HOST=mysql:3306
+      - GITEA__database__NAME=gitead
+      - GITEA__database__USER=gitea
+      - GITEA__database__PASSWD=gitea
 
     volumes:
       - gitea-app-4:/data
@@ -33,7 +38,7 @@ services:
       - appnet
       - externalnet
   mysql:
-    image: ${DOCKER_REGISTRY}mysql:5.7
+    image: ${DOCKER_REGISTRY}mysql:8
     deploy:
       placement:
         constraints: [node.labels.com.sigyl.git-stack-data == yes]
@@ -41,14 +46,18 @@ services:
       restart_policy:
         condition: any
     volumes:
-      - gitea-data-1:/var/lib/mysql
+      - gitea-data-5:/var/lib/mysql
     environment:
-      MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASSWORD
+      #- MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASSWORD
+      - MYSQL_ROOT_PASSWORD=gitea
+      - MYSQL_USER=gitea
+      - MYSQL_PASSWORD=gitea
+      - MYSQL_DATABASE=gitea
     networks:
       - appnet
 volumes:
   gitea-app-4:
-  gitea-data-1:
+  gitea-data-5:
 
 networks:
   appnet: