diff --git a/Dockerfile b/Dockerfile
index 4cabdbf..e4285cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,15 +5,11 @@ LABEL maintainer="hello@wagtail.io"
 # Set environment varibles
 ENV PYTHONUNBUFFERED 1
 
+RUN apt-get update -y && apt-get install -y libenchant-dev
+
 RUN mkdir -p /code/requirements
 COPY ./bakerydemo/requirements/base.txt /code/requirements/base.txt
 COPY ./bakerydemo/requirements/production.txt /code/requirements/production.txt
 
 RUN pip install --upgrade pip
 RUN pip install -r /code/requirements/production.txt
-
-# Install any needed packages specified in requirements.txt
-# RUN pip install -r /code/requirements.txt
-RUN pip install gunicorn
-
-EXPOSE 8000
diff --git a/docker-compose.yml b/docker-compose.yml
index 87d8546..17a02bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,17 @@ services:
   web:
     build: ./
     working_dir: /code/bakerydemo
-    command: bash -c "python manage.py migrate --noinput && python manage.py load_initial_data && python manage.py update_index && python manage.py runserver 0.0.0.0:8000"
+    command: 
+      - /bin/bash 
+      - -c 
+      - |
+        cd /code/wagtail
+        pip install -e .[testing,docs]
+        cd /code/bakerydemo
+        python manage.py migrate --noinput
+        python manage.py load_initial_data
+        python manage.py update_index
+        python manage.py runserver 0.0.0.0:8000
     volumes:
       - ./wagtail:/code/wagtail:rw
       - ./bakerydemo:/code/bakerydemo:rw
@@ -12,7 +22,7 @@ services:
       - "8000:8000"
     environment:
       DATABASE_URL: postgres://wagtail:changeme@postgres/wagtail
-      PYTHON_PATH: /code/wagtail:/code/bakerydemo
+      PYTHONPATH: /code/wagtail:/code/bakerydemo:$PYTHONPATH
     depends_on:
       - db
   db: