diff --git a/.gitignore b/.gitignore
index d374ce5..2c544cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,8 @@ nginx-srv/var
 
 multi-php-fpm/etc
 multi-php-fpm/run
+
+mariadb-srv/run
+mariadb-srv/var
+mariadb-srv/etc
 #
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 74e2bf4..96918d6 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
     volumes:
       - ./nginx-srv/etc/nginx/sites-available:/etc/nginx/sites-available
       - ./nginx-srv/var/www:/var/www
-      - ./multi-php-fpm/run/php:/run/php # It will be mounted from the PHP container.
+      - ./multi-php-fpm/run/php:/run/php # Socket files dir. It will be mounted and shared from the PHP container.
       - ./nginx-srv/etc/letsencrypt:/etc/letsencrypt
 
   multi-php-fpm:
@@ -24,3 +24,12 @@ services:
     volumes:
       - ./multi-php-fpm/etc/php:/etc/php
       - ./multi-php-fpm/run/php:/run/php
+      - ./mariadb-srv/run/mysql:/run/mysqld
+
+  mariadb-srv:
+    image: eroncero/mariadb-srv:latest
+    restart: unless-stopped
+    volumes:
+      - ./mariadb-srv/var/lib/mysql:/var/lib/mysql
+      - ./mariadb-srv/etc/mysql:/etc/mysql
+      - ./mariadb-srv/run/mysql/:/run/mysqld
diff --git a/mariadb-srv/Dockerfile b/mariadb-srv/Dockerfile
new file mode 100644
index 0000000..b961771
--- /dev/null
+++ b/mariadb-srv/Dockerfile
@@ -0,0 +1,13 @@
+FROM debian:bookworm
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG DEBCONF_NONINTERACTIVE_SEEN=true
+
+RUN apt-get update; apt-get full-upgrade -y; apt-get autoclean -y; apt-get install mariadb-server mariadb-client -y
+
+COPY project/entrypoint/entrypoint.sh /entrypoint/entrypoint.sh
+COPY project/entrypoint/fix_volumes.sh /entrypoint/fix_volumes.sh
+#COPY project/entrypoint/gen-cert.sh /entrypoint/gen-cert.sh
+RUN mkdir -p /tmp/buildtime/etc/mysql && cp -r /etc/mysql/. /tmp/buildtime/etc/mysql/
+RUN mkdir -p /tmp/buildtime/var/lib/mysql && cp -r /var/lib/mysql/. /tmp/buildtime/var/lib/mysql/
+ENTRYPOINT ["/bin/sh", "/entrypoint/entrypoint.sh"]
diff --git a/mariadb-srv/project/entrypoint/entrypoint.sh b/mariadb-srv/project/entrypoint/entrypoint.sh
new file mode 100644
index 0000000..1b87ba5
--- /dev/null
+++ b/mariadb-srv/project/entrypoint/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+/bin/sh /entrypoint/fix_volumes.sh
+
+service mariadb start
+# Run the CMD that was passed (or default)
+#exec "$@"
+
+tail -f /dev/null
+
diff --git a/mariadb-srv/project/entrypoint/fix_volumes.sh b/mariadb-srv/project/entrypoint/fix_volumes.sh
new file mode 100644
index 0000000..11d9cba
--- /dev/null
+++ b/mariadb-srv/project/entrypoint/fix_volumes.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+mkdir -p /etc/mysql  # Creates /etc/php if it doesn't exist
+mkdir -p /var/lib/mysql  # Creates /etc/php if it doesn't exist
+
+mv /tmp/buildtime/etc/mysql/* /etc/mysql/
+mv /tmp/buildtime/var/lib/mysql/* /var/lib/mysql
+chown -R mysql:mysql /var/lib/mysql
+chown -R mysql:root /run/mysqld