diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index da200cd..b6554f3 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "4.0.0",
+      "version": "5.0.0",
       "commands": [
         "dotnet-cake"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f4792d9..56b94e0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,27 +2,39 @@ name: CI
 
 on: [push]
 
+env:
+  JAVA_DISTRIBUTION: 'microsoft'
+  JAVA_VERSION: 17
+  NET_VERSION: 9.0.200
+
 jobs:
   build:
 
     runs-on: windows-latest
     
     steps:
-    - uses: actions/checkout@v1
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        fetch-tags: true
       
-    - name: Setup Java JDK
-      uses: actions/setup-java@v4
+    - name: Install .NET ${{ env.NET_VERSION }}
+      uses: actions/setup-dotnet@v4
       with:
-        distribution: 'microsoft'
-        java-version: '17'
+        dotnet-version: ${{ env.NET_VERSION }}
 
-    - name: Setup .NET 8
-      uses: actions/setup-dotnet@v1
+    - name: Set up JDK
+      uses: actions/setup-java@v4
       with:
-        dotnet-version: 8.0.x
+        distribution: ${{ env.JAVA_DISTRIBUTION }}
+        java-version: ${{ env.JAVA_VERSION }}
+
+    - name: Restore .NET tools
+      run: dotnet tool restore
 
     - name: Install workload
-      run: dotnet workload install android
+      run: dotnet workload install android --version ${{ env.NET_VERSION }}
 
     - name: Restore dotnet tools
       run: dotnet tool restore
diff --git a/AndHUD/AndHUD.csproj b/AndHUD/AndHUD.csproj
index 4f8856c..a58481a 100644
--- a/AndHUD/AndHUD.csproj
+++ b/AndHUD/AndHUD.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Net.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0-android;net8.0-android</TargetFrameworks>
+    <TargetFrameworks>net8.0-android;net9.0-android</TargetFrameworks>
     <AssemblyName>AndHUD</AssemblyName>
     <RootNamespace>AndroidHUD</RootNamespace>
     <PackageId>AndHUD</PackageId>
@@ -19,4 +19,4 @@
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
   
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
index 32d540c..c25f976 100644
--- a/Sample/Sample.csproj
+++ b/Sample/Sample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-      <TargetFramework>net8.0-android</TargetFramework>
+      <TargetFramework>net9.0-android</TargetFramework>
       <OutputType>Exe</OutputType>
       <SupportedOSPlatformVersion>22</SupportedOSPlatformVersion>
       <Nullable>enable</Nullable>
@@ -20,4 +20,4 @@
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>