diff --git a/docker-compose.yml b/docker-compose.yml
index 4cf6f1a..7be5089 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,9 @@ version: "2"
 services:
    skeleton-django-db:
      image: mariadb
+     restart: unless-stopped
      volumes:
+       - ./docker/db_init:/docker-entrypoint-initdb.d
        - db_data:/var/lib/mysql
      environment:
        MYSQL_ROOT_PASSWORD: rootpassword
@@ -13,6 +15,7 @@ services:
 
    skeleton-django-service:
      build: .
+     restart: unless-stopped
      depends_on:
        - skeleton-django-db
      command: /env/bin/python /app/manage.py runserver 0.0.0.0:8990
diff --git a/docker/db_init/db_setup.sql b/docker/db_init/db_setup.sql
new file mode 100644
index 0000000..3446906
--- /dev/null
+++ b/docker/db_init/db_setup.sql
@@ -0,0 +1,5 @@
+CREATE SCHEMA IF NOT EXISTS `skeletondjango` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+CREATE SCHEMA IF NOT EXISTS `test_skeletondjango` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+CREATE USER IF NOT EXISTS 'nicolas'@'%' IDENTIFIED BY 'qwerty';
+GRANT ALL PRIVILEGES ON skeletondjango.* TO 'nicolas'@'%';
+GRANT ALL PRIVILEGES ON test_skeletondjango.* TO 'nicolas'@'%';
diff --git a/docker/db_setup.sql b/docker/db_setup.sql
deleted file mode 100644
index d05fe22..0000000
--- a/docker/db_setup.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE SCHEMA `skeletondjango` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-CREATE SCHEMA `test_skeletondjango` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-CREATE USER 'nicolas'@'%' IDENTIFIED BY 'qwerty';
-GRANT ALL PRIVILEGES ON skeletondjango.* TO 'nicolas'@'%';
-GRANT ALL PRIVILEGES ON test_skeletondjango.* TO 'nicolas'@'%';