diff --git a/data/.empty b/data/.empty
deleted file mode 100644
index e69de29..0000000
--- a/data/.empty
+++ /dev/null
diff --git a/data/conf/gitbucket/gitbucket.conf b/data/conf/gitbucket/gitbucket.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/data/conf/gitbucket/gitbucket.conf
diff --git a/data/conf/mysql/docker.cnf b/data/conf/mysql/docker.cnf
new file mode 100644
index 0000000..4f1829d
--- /dev/null
+++ b/data/conf/mysql/docker.cnf
@@ -0,0 +1,3 @@
+[mysqld]
+skip-host-cache
+skip-name-resolve
diff --git a/data/conf/mysql/mysql.cnf b/data/conf/mysql/mysql.cnf
new file mode 100644
index 0000000..56a15ee
--- /dev/null
+++ b/data/conf/mysql/mysql.cnf
@@ -0,0 +1,13 @@
+[mysqld]
+character-set-client-handshake = FALSE
+character-set-server           = utf8mb4
+collation-server               = utf8mb4_unicode_ci
+innodb_file_per_table          = TRUE
+innodb_file_format             = barracuda
+innodb_large_prefix = TRUE
+
+[client]
+default-character-set = utf8mb4
+
+[mysql]
+default-character-set = utf8mb4
diff --git a/data/gitbucket.conf b/data/gitbucket.conf
deleted file mode 100644
index e69de29..0000000
--- a/data/gitbucket.conf
+++ /dev/null
diff --git a/docker-compose.yml b/docker-compose.yml
index c87196c..ad3651c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,8 +12,8 @@
         - GITBUCKET_DATABASE_USER=${GITBUCKET_DATABASE_USER}
         - GITBUCKET_DATABASE_PASSWORD=${GITBUCKET_DATABASE_PASSWORD}
       volumes:
-        - ./data/repositories:/srv/gitbucket/repositories
-        - ./data/gitbucket.conf:/srv/gitbucket/gitbucket.conf
+        - ./data/repositories/:/srv/gitbucket/repositories/
+        - ./data/conf/gitbucket/gitbucket.conf:/srv/gitbucket/gitbucket.conf
       ports:
         - "${GITBUCKET_BIND:-127.0.0.1}:${GITBUCKET_WEB_PORT:-8080}:8080"
         - "${GITBUCKET_BIND:-127.0.0.1}:${GITBUCKET_SSH_PORT:-29418}:29418"
@@ -32,7 +32,8 @@
         - MYSQL_USER=${GITBUCKET_DATABASE_USER}
         - MYSQL_PASSWORD=${GITBUCKET_DATABASE_PASSWORD}
       volumes:
-        - mysql-vol-1:/var/lib/mysql
+        - mysql-vol-1:/var/lib/mysql/
+        - ./data/conf/mysel:/etc/mysql/conf.d/:ro
       networks:
         gitbucket-network:
           ipv4_address: 172.22.2.251