diff --git a/Dockerfile b/Dockerfile
index f24c177..d45d054 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,12 @@ WORKDIR /app
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
+RUN apt-get update && apt-get install -y gettext && rm -rf /var/lib/apt/lists/*
+
 COPY . .
 
+RUN python manage.py compilemessages
+
 # Create volume mount points
 RUN mkdir -p /app/media /app/static /app/data
 
diff --git a/entrypoint.sh b/entrypoint.sh
index fca4a2c..8638676 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,5 +3,6 @@ set -e
 
 python manage.py collectstatic --noinput
 python manage.py migrate --noinput
+python manage.py loaddata initial
 python manage.py create_default_admin
 exec gunicorn photo21.wsgi:application --bind 0.0.0.0:8000 --workers 3