diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
index b69a1e2..f8567e4 100644
--- a/.github/workflows/publish-nuget.yml
+++ b/.github/workflows/publish-nuget.yml
@@ -31,7 +31,7 @@ jobs:
           echo "PACKAGE_VERSION=${PACKAGE_VERSION_PREFIXED#v}" | tee -a $GITHUB_ENV
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.x,9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 99d0428..ebaf44e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 8.0.x,9.0.x
       - name: 📥 Restore dependencies
         run: dotnet restore --verbosity normal
       - name: 🔨 Build
diff --git a/Dockerfile b/Dockerfile
index bd96f5f..0652178 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 as runtime
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 as runtime
 WORKDIR /app
-EXPOSE 80
+EXPOSE 8080
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder-base
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS builder-base
 WORKDIR /src
 COPY . .
 
diff --git a/GCloud.Compute.Metadata.TestServer/GCloud.Compute.Metadata.TestServer.csproj b/GCloud.Compute.Metadata.TestServer/GCloud.Compute.Metadata.TestServer.csproj
index 26bf3cb..0596191 100644
--- a/GCloud.Compute.Metadata.TestServer/GCloud.Compute.Metadata.TestServer.csproj
+++ b/GCloud.Compute.Metadata.TestServer/GCloud.Compute.Metadata.TestServer.csproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <LangVersion>13</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/GCloud.Compute.Metadata.Tests/GCloud.Compute.Metadata.Tests.csproj b/GCloud.Compute.Metadata.Tests/GCloud.Compute.Metadata.Tests.csproj
index c03e413..2f167f5 100644
--- a/GCloud.Compute.Metadata.Tests/GCloud.Compute.Metadata.Tests.csproj
+++ b/GCloud.Compute.Metadata.Tests/GCloud.Compute.Metadata.Tests.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+        <LangVersion>13</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/GCloud.Compute.Metadata.V1/GCloud.Compute.Metadata.V1.csproj b/GCloud.Compute.Metadata.V1/GCloud.Compute.Metadata.V1.csproj
index 8d7d2c2..b32c6fe 100644
--- a/GCloud.Compute.Metadata.V1/GCloud.Compute.Metadata.V1.csproj
+++ b/GCloud.Compute.Metadata.V1/GCloud.Compute.Metadata.V1.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <PackageId>GCloud.Compute.Metadata.V1</PackageId>
@@ -16,6 +15,8 @@
         <Description>Library for using the GCE metadata api</Description>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageTags>google cloud metadata</PackageTags>
+        <LangVersion>13</LangVersion>
+        <TargetFrameworks>net9.0;net8.0</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
     <None Include="..\LICENSE">