diff --git a/Dockerfile.prod b/Dockerfile.prod
index ef6ac28c9a0c80a1111b0d3b1d34b6ad58965f6c..b890bd0a78c809b3904e71b928d52a7de2e9fbf0 100644
--- a/Dockerfile.prod
+++ b/Dockerfile.prod
@@ -44,6 +44,7 @@ RUN groupadd app && useradd -g app app
 ENV HOME=/home/app
 ENV APP_HOME=/home/app/kszkepzes-backend
 RUN mkdir $APP_HOME
+RUN mkdir $APP_HOME/staticfiles
 WORKDIR $APP_HOME
 
 # install dependencies
diff --git a/src/entrypoint.sh b/src/entrypoint.sh
index 84c451504517e8c4ae40f110bbd48b8ce4d5fd20..e837b4f5bad4448d9d7558f0dc0ebb9de1b2b9bb 100755
--- a/src/entrypoint.sh
+++ b/src/entrypoint.sh
@@ -13,5 +13,6 @@ fi
 
 python manage.py flush --no-input
 python manage.py migrate
+python manage.py collectstatic --no-input --clear
 
 exec "$@"
\ No newline at end of file
diff --git a/src/kszkepzes/settings/base.py b/src/kszkepzes/settings/base.py
index 79bb0903c49615ad0c6a96a2f6c50fa293b98215..1e9a30157766d5704f4892538ec9128fd7672078 100644
--- a/src/kszkepzes/settings/base.py
+++ b/src/kszkepzes/settings/base.py
@@ -13,7 +13,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/
 import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 # Quick-start development settings - unsuitable for production
diff --git a/src/kszkepzes/settings/production.py b/src/kszkepzes/settings/production.py
index 785c9826aa58dead2370974d16eaf7e0fdd3781f..f6d364955eb58dbcdd773123c282c597ee0ccc5a 100644
--- a/src/kszkepzes/settings/production.py
+++ b/src/kszkepzes/settings/production.py
@@ -24,7 +24,6 @@ REST_FRAMEWORK = {
     )
 }
 
-STATIC_ROOT = os.path.join(BASE_DIR, 'static_collected')
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_HOST = 'mail.sch.bme.hu'
 EMAIL_PORT = 25