diff --git a/conf/mariadb/docker.cnf b/conf/mariadb/docker.cnf
new file mode 100644
index 0000000..4f1829d
--- /dev/null
+++ b/conf/mariadb/docker.cnf
@@ -0,0 +1,3 @@
+[mysqld]
+skip-host-cache
+skip-name-resolve
diff --git a/conf/mariadb/mysql.cnf b/conf/mariadb/mysql.cnf
new file mode 100644
index 0000000..37dad7a
--- /dev/null
+++ b/conf/mariadb/mysql.cnf
@@ -0,0 +1,14 @@
+[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
+bind-address = 0.0.0.0
+
+[client]
+default-character-set = utf8mb4
+
+[mysql]
+default-character-set = utf8mb4
diff --git a/docker-compose.yml b/docker-compose.yml
index c9cde15..ee61fe1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,7 +50,7 @@
         - MYSQL_PASSWORD=${OPENHAB_DATABASE_PASSWORD}
       volumes:
         - ./data/db/:/var/lib/mysql/
-        - ./data/conf/mysql:/etc/mysql/conf.d/:ro
+        - ./conf/mariadb:/etc/mysql/conf.d/:ro
       networks:
         openhab-network:
           ipv4_address: ${IPV4_NETWORK:-172.55.55}.101