diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
new file mode 100644
index 0000000..f0f8330
--- /dev/null
+++ b/.gitpod.dockerfile
@@ -0,0 +1,4 @@
+FROM gitpod/workspace-full
+ENV PYTHONUSERBASE=/workspace/.pip-modules
+ENV PATH=$PYTHONUSERBASE/bin:$PATH
+ENV PIP_USER=yes
diff --git a/.gitpod.yml b/.gitpod.yml
index cb9b080..2c38016 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,16 +1,22 @@
+image:
+  file: .gitpod.dockerfile
 ports:
 - port: 8080
   onOpen: open-preview
 tasks:
-- init: >
-    cp bakerydemo/settings/local.py.example bakerydemo/settings/local.py &&
-    echo "DJANGO_SETTINGS_MODULE=bakerydemo.settings.local" > .env &&
-    python -m pip install -r requirements.txt &&
-    python manage.py makemigrations &&
-    python manage.py migrate &&
+- init: |
+    cp bakerydemo/settings/local.py.example bakerydemo/settings/local.py
+    echo "DJANGO_SETTINGS_MODULE=bakerydemo.settings.local" > .env
+    python -m pip install -r requirements.txt
+    python manage.py makemigrations
+    python manage.py migrate
     python manage.py load_initial_data
-  command: >
+    echo "CSRF_TRUSTED_ORIGINS = ['https://*.gitpod.io']" >> bakerydemo/settings/local.py
+  command: |
     python manage.py runserver 0.0.0.0:8080
 github:
     prebuilds:
         pullRequestsFromForks: true
+vscode:
+  extensions:
+    - ms-python.python