diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 000000000..d6122b7f2
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,11 @@
+# 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/
+  
+FROM gitpod/workspace-full:latest
+
+USER gitpod
+
+RUN pip3 install pytest==4.4.2 pytest-testdox mock
\ No newline at end of file
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 000000000..94253242b
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,14 @@
+image:
+  file: .gitpod.Dockerfile
+
+tasks:
+  - command: python contemplate_koans.py
+
+github:
+    prebuilds:
+        # enable for the master/default branch (defaults to true)
+        master: true
+        # enable for pull requests coming from this repo (defaults to true)
+        pullRequests: false
+        # add a "Review in Gitpod" button as a comment to pull requests (defaults to true)
+        addComment: false
diff --git a/README.rst b/README.rst
index 3c74876fb..e42a75926 100644
--- a/README.rst
+++ b/README.rst
@@ -5,6 +5,23 @@ Python Koans
 .. image:: https://travis-ci.org/gregmalcolm/python_koans.png?branch=master
    :target: http://travis-ci.org/gregmalcolm/python_koans
 
+.. image:: https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod
+    :target: https://gitpod.io/#https://github.com/gregmalcolm/python_koans
+    
+.. image:: https://www.eclipse.org/che/contribute.svg
+    :target: https://workspaces.openshift.com/f?url=https://gitpod.io/#https://github.com/gregmalcolm/python_koans
+
+One click installation:
+-----------------------
+
+.. image:: https://www.eclipse.org/che/contribute.svg
+    :target: https://workspaces.openshift.com/f?url=https://gitpod.io/#https://github.com/gregmalcolm/python_koans
+|   or
+.. image:: https://gitpod.io/button/open-in-gitpod.svg
+    :target: https://gitpod.io/#https://gitpod.io/#https://github.com/gregmalcolm/python_koans
+
+|
+
 Python Koans is a port of Edgecase's "Ruby Koans" which can be found
 at http://rubykoans.com/.
 
@@ -214,4 +231,4 @@ FPIP. So here's a little plug for their very cool Python podcast:
   http://frompythonimportpodcast.com/
 
 A big thanks also to Mike Pirnat @pirnat and Kevin Chase @kjc have pitched in
-as co-maintainers at various times
\ No newline at end of file
+as co-maintainers at various times