diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 0000000..ac03a1d
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,6 @@
+FROM gitpod/workspace-full:latest
+
+USER gitpod
+#.NET installed via .gitpod.yml task until the following issue is fixed: https://github.com/gitpod-io/gitpod/issues/5090
+ENV DOTNET_ROOT=/tmp/dotnet
+ENV PATH=$PATH:/tmp/dotnet
\ No newline at end of file
diff --git a/.gitpod.yml b/.gitpod.yml
index dbfdb46..68f9f39 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,8 +1,13 @@
-image: gitpod/workspace-dotnet
+image:
+  file: .gitpod.Dockerfile
 
 tasks:
-  - init: dotnet build
-    command: dotnet run
+  # Mitigation for https://github.com/gitpod-io/gitpod/issues/6460 
+  - name: Postinstall .NET 6.0 and dev certificates
+    init: |
+      mkdir -p /tmp/dotnet && curl -fsSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0 --install-dir /tmp/dotnet 
+      dotnet dev-certs https 
+      dotnet restore
 
 vscode:
   extensions: