diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 85a0175a..dd9d58a6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,11 +1,10 @@
 {
-	"name": "C# (.NET)",
+	"name": "Dev container",
 	"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
 	"features": {
 		"ghcr.io/devcontainers/features/dotnet:2": {
 			"version": "8.0",
-			"additionalVersions": "9.0",
-			"workloads": "aspire"
+			"additionalVersions": "9.0"
 		},
 		"ghcr.io/devcontainers/features/azure-cli:1": {
 			"version": "latest",
@@ -14,18 +13,21 @@
 		"ghcr.io/devcontainers/features/powershell:1": {
 			"version": "latest"
 		},
-		"ghcr.io/devcontainers/features/git:1": {}
+		"ghcr.io/devcontainers/features/git:1": {},
+		"ghcr.io/devcontainers/features/github-cli:1": {}
 	},
-	"postCreateCommand": "./.devcontainer/postCreateCommand.sh",
+	"postCreateCommand": "sh .devcontainer/install.sh",
 	"customizations": {
 		"vscode": {
 			"extensions": [
 				"ms-azuretools.vscode-bicep",
-				"ms-azure-devops.azure-pipelines",
 				"ms-dotnettools.csdevkit",
-				"github.copilot",
-				"github.copilot-chat",
-				"timonwong.shellcheck"
+				"ms-azure-devops.azure-pipelines",
+				"GitHub.vscode-github-actions",
+				"GitHub.copilot",
+				"timonwong.shellcheck",
+				"foxundermoon.shell-format",
+				"redhat.vscode-yaml"
 			]
 		}
 	}
diff --git a/.devcontainer/install.sh b/.devcontainer/install.sh
new file mode 100644
index 00000000..c7b07827
--- /dev/null
+++ b/.devcontainer/install.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Install PowerShell modules
+pwsh -Command "Install-Module -Name Az -Force"
diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh
deleted file mode 100644
index eeff37ef..00000000
--- a/.devcontainer/postCreateCommand.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Install Aspire
-sudo /usr/share/dotnet/dotnet workload update --from-rollback-file "./.devcontainer/rollback.txt"
-sudo /usr/share/dotnet/dotnet workload install aspire --from-rollback-file "./.devcontainer/rollback.txt"
-
-# Install PowerShell modules
-pwsh -Command "Install-Module -Name Az -Force
-               Install-Module -Name Microsoft.Graph -Force"
diff --git a/tools/code/aspire/aspire.csproj b/tools/code/aspire/aspire.csproj
index 4cf41770..a3ed0926 100644
--- a/tools/code/aspire/aspire.csproj
+++ b/tools/code/aspire/aspire.csproj
@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0-rc.1.24511.1" />
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsAspireHost>true</IsAspireHost>
     <UserSecretsId>6ce9dc18-ea0d-4d82-8f1a-e63877f35b88</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="8.1.0" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.0.0-rc.1.24511.1" />
   </ItemGroup>
 
   <ItemGroup>