diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3dd1d45b..b40b2538 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '7.x.x'
+          dotnet-version: '8.x.x'
       - name: Restore dependencies
         run: dotnet restore
       - name: Download Dalamud
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f3afe9c1..7c9e2909 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '7.x.x'
+          dotnet-version: '8.x.x'
       - name: Restore dependencies
         run: dotnet restore
       - name: Download Dalamud
diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml
index 0968430d..91361646 100644
--- a/.github/workflows/test_release.yml
+++ b/.github/workflows/test_release.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '7.x.x'
+          dotnet-version: '8.x.x'
       - name: Restore dependencies
         run: dotnet restore
       - name: Download Dalamud
diff --git a/Penumbra.GameData b/Penumbra.GameData
index 33b51274..d53db6a3 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit 33b512746e80b7b1276b644430923eee9bec9fba
+Subproject commit d53db6a358cedecd3ef18f62f12a07deff4b61ee
diff --git a/Penumbra/Penumbra.cs b/Penumbra/Penumbra.cs
index b532339f..ff068928 100644
--- a/Penumbra/Penumbra.cs
+++ b/Penumbra/Penumbra.cs
@@ -51,7 +51,7 @@ public class Penumbra : IDalamudPlugin
     {
         try
         {
-            _services        = ServiceManagerA.CreateProvider(this, pluginInterface, Log);
+            _services        = StaticServiceManager.CreateProvider(this, pluginInterface, Log);
             Messager         = _services.GetService<MessageService>();
             _validityChecker = _services.GetService<ValidityChecker>();
             _services.EnsureRequiredServices();
diff --git a/Penumbra/Services/ServiceManagerA.cs b/Penumbra/Services/StaticServiceManager.cs
similarity index 98%
rename from Penumbra/Services/ServiceManagerA.cs
rename to Penumbra/Services/StaticServiceManager.cs
index 0d562250..66c90e84 100644
--- a/Penumbra/Services/ServiceManagerA.cs
+++ b/Penumbra/Services/StaticServiceManager.cs
@@ -6,7 +6,6 @@ using Dalamud.Plugin.Services;
 using Microsoft.Extensions.DependencyInjection;
 using OtterGui;
 using OtterGui.Classes;
-using OtterGui.Compression;
 using OtterGui.Log;
 using OtterGui.Services;
 using Penumbra.Api;
@@ -14,14 +13,12 @@ using Penumbra.Collections.Cache;
 using Penumbra.Collections.Manager;
 using Penumbra.GameData.Actors;
 using Penumbra.Import.Models;
-using Penumbra.GameData.DataContainers;
 using Penumbra.GameData.Structs;
 using Penumbra.Import.Textures;
 using Penumbra.Interop.PathResolving;
 using Penumbra.Interop.ResourceLoading;
 using Penumbra.Interop.ResourceTree;
 using Penumbra.Interop.Services;
-using Penumbra.Interop.Structs;
 using Penumbra.Meta;
 using Penumbra.Mods;
 using Penumbra.Mods.Editor;
@@ -38,7 +35,7 @@ using ResidentResourceManager = Penumbra.Interop.Services.ResidentResourceManage
 
 namespace Penumbra.Services;
 
-public static class ServiceManagerA
+public static class StaticServiceManager
 {
     public static ServiceManager CreateProvider(Penumbra penumbra, DalamudPluginInterface pi, Logger log)
     {