diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 0000000..525d39f
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,13 @@
+image: gitpod/workspace-java-21
+
+tasks:
+  - command: gp open /workspace/learn-apache-flink-table-api-for-java-exercises/README.md && exit
+  - name: exercises
+    command: |
+      cd exercises
+
+vscode:
+  extensions:
+    - vscjava.vscode-java-pack
+
+workspaceLocation: /workspace/learn-apache-flink-table-api-for-java-exercises
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c44af35..1f6d69f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,4 +14,8 @@
 
 ## Version 0.3.1
 
-* Fixing an issue with the POM file that was preventing VS Code from detecting the main method.
\ No newline at end of file
+* Fixing an issue with the POM file that was preventing VS Code from detecting the main method.
+
+## Version 0.3.2
+
+* Added a basic Gitpod configuration file.
\ No newline at end of file
diff --git a/README.md b/README.md
index 5ea8dce..4103e86 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Apache Flink Table API for Java
 
-This repository is for the **Apache Flink Table API for Java** course provided by Confluent Developer.
+This repository is for the [** Apache Flink® Table API: Processing Data Streams in Java**](https://developer.confluent.io/courses/flink-table-api-java/) course provided by Confluent Developer.
 
 ## A Simple Marketplace with Apache Flink
 
@@ -57,4 +57,10 @@ In general, you can ignore this folder.
 
 The `solutions` folder contains complete solutions for each exercise. These will be copied to the `exercises` folder when you execute the `solve` command with the `exercise.sh` script.
 
-In general, you can ignore this folder, but you might find it helpful to reference if you get stuck.
\ No newline at end of file
+In general, you can ignore this folder, but you might find it helpful to reference if you get stuck.
+
+## Gitpod
+
+This repository contains a [Gitpod](https://www.gitpod.io/) configuration file. You can use Gitpod to spin up a browser-based development environment for working on these exercises.
+
+[Open In Gitpod](https://gitpod.io/new/#https://github.com/confluentinc/learn-apache-flink-table-api-for-java-exercises)
\ No newline at end of file