diff --git a/DockerMakefile b/DockerMakefile
index 6ba9f67..3b79731 100644
--- a/DockerMakefile
+++ b/DockerMakefile
@@ -22,17 +22,18 @@ stop:
 	docker-compose stop
 
 migrate:
-	docker-compose run web python src/manage.py migrate
+	docker-compose exec web python src/manage.py migrate myauth
+	docker-compose exec web python src/manage.py migrate
 
 loaddata:
-	docker-compose run web python src/manage.py loaddata src/myauth/fixtures/myauth.json
-	docker-compose run web python src/manage.py loaddata src/commons/fixtures/cms.json
-	docker-compose run web python src/manage.py loaddata src/commons/fixtures/djangocms_text_ckeditor.json
-	docker-compose run web python src/manage.py loaddata src/commons/fixtures/sites.json
-	docker-compose run web python src/manage.py loaddata src/customer/fixtures/price.json
-	docker-compose run web python src/manage.py loaddata src/docs/fixtures/country.json
-	docker-compose run web python src/manage.py loaddata src/docs/fixtures/currency.json
-	docker-compose run web python src/manage.py loaddata src/docs/fixtures/measure.json
+	docker-compose exec web python src/manage.py loaddata src/myauth/fixtures/myauth.json
+	docker-compose exec web python src/manage.py loaddata src/commons/fixtures/cms.json
+	docker-compose exec web python src/manage.py loaddata src/commons/fixtures/djangocms_text_ckeditor.json
+	docker-compose exec web python src/manage.py loaddata src/commons/fixtures/sites.json
+	docker-compose exec web python src/manage.py loaddata src/customer/fixtures/price.json
+	docker-compose exec web python src/manage.py loaddata src/docs/fixtures/country.json
+	docker-compose exec web python src/manage.py loaddata src/docs/fixtures/currency.json
+	docker-compose exec web python src/manage.py loaddata src/docs/fixtures/measure.json
 
 collectstatic:
 	docker-compose run web python manage.py collectstatic --noinput
diff --git a/bin/docker-local-entrypoint.sh b/bin/docker-local-entrypoint.sh
new file mode 100644
index 0000000..995aa9d
--- /dev/null
+++ b/bin/docker-local-entrypoint.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# Collect static files
+echo "Collect static files"
+python manage.py collectstatic --noinput
+
+# Make database migrations
+echo "Make database migrations"
+python manage.py migrate makemigrations
+
+# Apply database migrations
+echo "Apply database migrations"
+python manage.py migrate myauth
+python manage.py migrate
diff --git a/bin/docker_local_init.sh b/bin/docker-local-init.sh
similarity index 100%
rename from bin/docker_local_init.sh
rename to bin/docker-local-init.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 05c4605..20abdb4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,7 @@ services:
       - "5671:5671"
 
   celery:
+    restart: always
     build:
       context: .
       dockerfile: compose/Dockerfile.web.local
@@ -40,6 +41,7 @@ services:
       - redis
 
   redis:
+    restart: always
     image: redis:latest
     ports:
       - '6379:6379'