diff --git a/.devcontainer/libraries/Dockerfile b/.devcontainer/libraries/Dockerfile
index 2b9ab8a9f83be..5a697ac088194 100644
--- a/.devcontainer/libraries/Dockerfile
+++ b/.devcontainer/libraries/Dockerfile
@@ -1,22 +1,22 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
 # For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
 
-# [Choice] .NET version: 6.0, 3.1
-ARG VARIANT="6.0-focal"
+# [Choice] .NET version: 6.0, 7.0
+ARG VARIANT="6.0-jammy"
 FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
 
 # Set up machine requirements to build the repo and the gh CLI
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
         cmake \
-        llvm-10 \
-        clang-10 \
+        llvm \
+        clang \
         build-essential \
-        python \
+        python3 \
         curl \
         git \
-        lldb-6.0 \
-        liblldb-6.0-dev \
+        lldb \
+        liblldb-dev \
         libunwind8 \
         libunwind8-dev \
         gettext \
diff --git a/.devcontainer/libraries/devcontainer.json b/.devcontainer/libraries/devcontainer.json
index 09daf0ecf6c6f..4e6b891872c4b 100644
--- a/.devcontainer/libraries/devcontainer.json
+++ b/.devcontainer/libraries/devcontainer.json
@@ -4,9 +4,8 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0
-			// Append -bullseye or -focal to pin to an OS version.
-			"VARIANT": "6.0-focal"
+			// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
+			"VARIANT": "6.0-jammy"
 		}
 	},
 	"hostRequirements": {
diff --git a/.devcontainer/wasm/Dockerfile b/.devcontainer/wasm/Dockerfile
index 5f51770a44663..75f2465b391b3 100644
--- a/.devcontainer/wasm/Dockerfile
+++ b/.devcontainer/wasm/Dockerfile
@@ -1,22 +1,22 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.192.0/containers/dotnet/.devcontainer/base.Dockerfile
 # For details on dotnet specific container, see: https://github.com/microsoft/vscode-dev-containers/tree/main/containers/dotnet
 
-# [Choice] .NET version: 6.0, 3.1
-ARG VARIANT="6.0-focal"
+# [Choice] .NET version: 6.0, 7.0
+ARG VARIANT="6.0-jammy"
 FROM mcr.microsoft.com/devcontainers/dotnet:0-${VARIANT}
 
 # Set up machine requirements to build the repo and the gh CLI
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
         cmake \
-        llvm-10 \
-        clang-10 \
+        llvm \
+        clang \
         build-essential \
-        python \
+        python3 \
         curl \
         git \
-        lldb-6.0 \
-        liblldb-6.0-dev \
+        lldb \
+        liblldb-dev \
         libunwind8 \
         libunwind8-dev \
         gettext \
diff --git a/.devcontainer/wasm/devcontainer.json b/.devcontainer/wasm/devcontainer.json
index 44fca5078392d..5c99a66e8c548 100644
--- a/.devcontainer/wasm/devcontainer.json
+++ b/.devcontainer/wasm/devcontainer.json
@@ -4,9 +4,8 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			// Update 'VARIANT' to pick a .NET Core version: 3.1, 6.0
-			// Append -bullseye or -focal to pin to an OS version.
-			"VARIANT": "6.0-focal"
+			// Update 'VARIANT' to pick a .NET Core version: 6.0, 7.0
+			"VARIANT": "6.0-jammy"
 		}
 	},
 	"hostRequirements": {
diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt
index 0dc95b3e048e1..4ab4ece785c5c 100644
--- a/src/mono/CMakeLists.txt
+++ b/src/mono/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 
+cmake_policy(SET CMP0091 NEW)
+
 project(mono)
 
 include(../../eng/native/configurepaths.cmake)