diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 00000000..f8e49f26
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,7 @@
+FROM gitpod/workspace-full
+
+# Install custom tools, runtimes, etc.
+# For example "bastet", a command-line tetris clone:
+# RUN brew install bastet
+#
+# More information: https://www.gitpod.io/docs/config-docker/
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 00000000..92b69c6e
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,6 @@
+image:
+  file: .gitpod.Dockerfile
+
+tasks:
+  - init: echo init
+    command: echo command
diff --git a/py-requirements/base.txt b/py-requirements/base.txt
index a516ac31..ab0fb541 100644
--- a/py-requirements/base.txt
+++ b/py-requirements/base.txt
@@ -4,7 +4,7 @@ django-extensions==1.8.1
 django-disposable-email-checker==1.2.1
 
 # PostgresSQL
-psycopg2==2.7.3
+psycopg2
 
 # serve files
 whitenoise==3.3.0