diff --git a/.gitpod.yml b/.gitpod.yml
index c4feeb3..38c33b3 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,4 @@
-image: gitpod/workspace-node
+image: gitpod/workspace-full
 tasks:
   - init: |
       yarn install
@@ -18,8 +18,23 @@ tasks:
       cd gitpod-remote
       gp sync-await shared
       yarn watch
+  - name: supervisor
+    before: |
+      cd /workspace/gitpod/components/supervisor
+    init: |
+      go mod verify
+  - name: gitpod-cli
+    before: |
+      cd /workspace/gitpod/components/gitpod-cli
+    init: |
+      go mod verify
 
 vscode:
   extensions:
     - dbaeumer.vscode-eslint
     - svelte.svelte-vscode
+
+workspaceLocation: gitpod-code/main.code-workspace
+additionalRepositories:
+  - url: https://github.com/gitpod-io/gitpod
+    checkoutLocation: gitpod
diff --git a/gitpod-shared/src/validate.ts b/gitpod-shared/src/validate.ts
index 79f54ec..0ab936c 100644
--- a/gitpod-shared/src/validate.ts
+++ b/gitpod-shared/src/validate.ts
@@ -111,8 +111,8 @@ export class ValidateService extends vscode.Disposable {
 			new vscode.Task(
 				{ type: 'shell' },
 				vscode.TaskScope.Workspace,
-				ValidateAction.description,
-				ValidateAction.command,
+				'validate',
+				'gitpod',
 				new vscode.ShellExecution(ValidateAction.shellCommand)));
 	}
 
diff --git a/main.code-workspace b/main.code-workspace
new file mode 100644
index 0000000..4d4b6cb
--- /dev/null
+++ b/main.code-workspace
@@ -0,0 +1,22 @@
+{
+    "folders": [
+        {
+            "path": "."
+        },
+        {
+            "path": "./gitpod-shared"
+        },
+        {
+            "path": "./gitpod-remote"
+        },
+        {
+            "path": "./gitpod-web"
+        },
+        {
+            "path": "../gitpod/components/supervisor"
+        },
+        {
+            "path": "../gitpod/components/gitpod-cli"
+        }
+    ],
+}
\ No newline at end of file