diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 000000000..ee5ba04c2
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,9 @@
+image: ghcr.io/edgetx/edgetx-dev:2.4
+
+vscode:
+  extensions:
+    - ms-vscode.cpptools
+
+tasks:
+  - name: Prep build folder
+    init: mkdir build && cd build
diff --git a/README.md b/README.md
index 17e6abbab..6b6ecec4c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/pfeerick/edgetx/tree/gitpod)
+
 <p align="center">
 <a href="url"><img src="https://github.com/EdgeTX/edgetx.github.io/blob/master/images/edgetx-v2.png" align="center" height="150" width="150" ></a>