diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 629c0904348a..21921780ffc9 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/devcontainer.json.
 {
   "name": "dotnet",
-  "image": "mcr.microsoft.com/devcontainers/base:debian",
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
   "customizations": {
     "vscode": {
       "extensions": [
diff --git a/.devcontainer/scripts/post-creation.sh b/.devcontainer/scripts/post-creation.sh
index 0c038848b805..5620e22d2818 100644
--- a/.devcontainer/scripts/post-creation.sh
+++ b/.devcontainer/scripts/post-creation.sh
@@ -1,5 +1,8 @@
 #! /usr/bin/env sh
 
+# Install prerequisites for NativeAOT/dotnet-aot builds
+sudo apt-get update && sudo apt-get install -y --no-install-recommends clang && sudo rm -rf /var/lib/apt/lists/*
+
 # Install SDK and tool dependencies before container starts
 # Also run the full restore on the repo so that go-to definition
 # and other language features will be available in C# files