diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000000..d20b7fa515
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,16 @@
+# It's easier to restore node/typescript than dotnet, which is why we use this as the base
+FROM mcr.microsoft.com/devcontainers/dotnet:8.0
+
+# Install VSCode which includes the library prereqs to run vscode-test
+RUN <<SCRIPT
+apt-get update
+apt-get install -y software-properties-common apt-transport-https wget gpg
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /usr/share/keyrings/packages.microsoft.gpg
+echo "deb [arch=amd64,arm64,armhf signed-by=/usr/share/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list
+apt-get update
+apt-get install -y code
+apt-get clean
+rm -rf /var/lib/apt/lists/*
+SCRIPT
+
+RUN pwsh -noni -c 'Install-PSResource -TrustRepository -Confirm:$false -Verbose Platyps'
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..a702f54019
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,30 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
+{
+	"name": "PowerShell Extension",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"hostRequirements": {
+		"cpus": 4 // Primarily for GitHub Codespaces, as the 2 CPU is not generally good enough for C# compilation
+	},
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {
+			"nvmVersion": "latest", // Can be used to change node versions as needed
+			"version": "20.19.0" // Keep in sync with package.json for what target vscode version uses
+		}
+	},
+	"postCreateCommand": "pwsh -c 'if (-not (Test-Path /workspaces/PowerShellEditorServices)) {git clone https://github.com/PowerShell/PowerShellEditorServices.git /workspaces/PowerShellEditorServices}'"
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "yarn install",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}