diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.mysql b/{{cookiecutter.project_slug}}/.envs/.local/.mysql
index 29808b6d0..caf619828 100644
--- a/{{cookiecutter.project_slug}}/.envs/.local/.mysql
+++ b/{{cookiecutter.project_slug}}/.envs/.local/.mysql
@@ -5,4 +5,5 @@ MYSQL_PORT=3306
 MYSQL_DB={{ cookiecutter.project_slug }}
 MYSQL_USER=!!!SET MYSQL_USER!!!
 MYSQL_PASSWORD=!!!SET MYSQL_PASSWORD!!!
+MYSQL_ROOT_PASSWORD=!!!SET MYSQL_ROOT_PASSWORD!!!
 
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.mysql b/{{cookiecutter.project_slug}}/.envs/.production/.mysql
index f77701a66..bc7819451 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.mysql
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.mysql
@@ -5,3 +5,4 @@ MYSQL_PORT=3306
 MYSQL_DB={{ cookiecutter.project_slug }}
 MYSQL_USER=!!!SET MYSQL_USER!!!
 MYSQL_PASSWORD=!!!SET MYSQL_PASSWORD!!!
+MYSQL_ROOT_PASSWORD=!!!SET MYSQL_ROOT_PASSWORD!!!
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
index 562b679e1..db1c81edb 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
@@ -53,7 +53,7 @@ try:
         user="${MYSQL_USER}",
         password="${MYSQL_PASSWORD}",
         database="${MYSQL_DB}",
-        port="${MYSQL_PORT}",
+        port=int("${MYSQL_PORT}")
     )
 except MySQLdb._exceptions.OperationalError:
     sys.exit(-1)
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index c59e97f6a..0f38ab17e 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -65,7 +65,7 @@ services:
     image: {{ cookiecutter.project_slug }}_production_mysql
     container_name: mysql
     volumes:
-      - local_mysql_data:/var/lib/mysql/data:Z
+      - local_mysql_data:/var/lib/mysql:z
       - local_mysql_data_backups:/backups:z
     env_file:
       - ./.envs/.local/.mysql
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 5c58ea662..131108345 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -55,7 +55,7 @@ services:
     image: {{ cookiecutter.project_slug }}_production_mysql
     container_name: mysql
     volumes:
-      - production_mysql_data:/var/lib/mysql/data:Z
+      - production_mysql_data:/var/lib/mysql:z
       - production_mysql_data_backups:/backups:z
     env_file:
       - ./.envs/.production/.mysql