diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index b765445ef..af18c5ffe 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM mcr.microsoft.com/dotnet/nightly/sdk:6.0.100
+FROM mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 36ae95373..c7b3de62e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
-	"name": ".NET Core 5.0, including pwsh (Debian 10)",
+	"name": ".NET Core 6.0, including pwsh (Ubuntu 18.04)",
 	"dockerFile": "Dockerfile",
 
 	// Uncomment the next line to run commands after the container is created.