diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 56117b6ba..b56c5bab8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000"]
+        unity-version: ["2020", "2022", "6000", "6100"]
     uses: ./.github/workflows/smoke-test-create.yml
     with:
       unity-version: ${{ matrix.unity-version }}
@@ -101,7 +101,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000"]
+        unity-version: ["2020", "2022", "6000", "6100"]
         platform: ["WebGL", "Linux"]
         include:
           - platform: WebGL
@@ -205,7 +205,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000"]
+        unity-version: ["2020", "2022", "6000", "6100"]
     uses: ./.github/workflows/smoke-test-build-android.yml
     with:
       unity-version: ${{ matrix.unity-version }}
@@ -224,7 +224,7 @@ jobs:
       matrix:
         api-level: [30, 31, 34] # last updated January 2025
         init-type: ["runtime", "buildtime"]
-        unity-version: ["2020", "2022", "6000"]
+        unity-version: ["2020", "2022", "6000", "6100"]
 
   smoke-test-build-ios:
     name: Build iOS ${{ matrix.unity-version }} Smoke Test
@@ -234,7 +234,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000"]
+        unity-version: ["2020", "2022", "6000", "6100"]
     uses: ./.github/workflows/smoke-test-build-ios.yml
     with:
       unity-version: ${{ matrix.unity-version }}
@@ -247,7 +247,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000"]
+        unity-version: ["2020", "2022", "6000", "6100"]
         init-type: ["runtime", "buildtime"]
     uses: ./.github/workflows/smoke-test-compile-ios.yml
     with:
@@ -266,7 +266,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000"]
+        unity-version: ["2020", "2022", "6000", "6100"]
         # Check https://support.apple.com/en-us/HT201222 for the latest minor version for a given major one.
         # https://developer.apple.com/support/app-store/ shows that of all iOS devices
         # - `iOS 17`: 86 %
@@ -287,7 +287,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000"]
+        unity-version: ["2020", "2022", "6000", "6100"]
         platform: ["WebGL", "Linux"]
     steps:
       - name: Checkout
@@ -325,7 +325,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        unity-version: ["2020", "2022", "6000"]
+        unity-version: ["2020", "2022", "6000", "6100"]
         # os: ["windows", "macos"]
         os: ["windows"]
         include:
diff --git a/scripts/ci-env.ps1 b/scripts/ci-env.ps1
index 448f9c53b..a541243f3 100644
--- a/scripts/ci-env.ps1
+++ b/scripts/ci-env.ps1
@@ -19,6 +19,9 @@ switch ($name) {
     "unity6000" {
         return "6000.0.49f1"
     }
+    "unity6100" {
+        return "6000.1.12f1"
+    }
     Default {
         throw "Unkown variable '$name'"
     }
diff --git a/test/Scripts.Integration.Test/Editor/Builder.cs b/test/Scripts.Integration.Test/Editor/Builder.cs
index e70e4efa3..cac652fd0 100644
--- a/test/Scripts.Integration.Test/Editor/Builder.cs
+++ b/test/Scripts.Integration.Test/Editor/Builder.cs
@@ -43,14 +43,6 @@ public static void BuildIl2CPPPlayer(BuildTarget target, BuildTargetGroup group,
         PlayerSettings.SetManagedStrippingLevel(group, ManagedStrippingLevel.Low);
 #endif
 
-
-        // This is a workaround for build issues with Unity 2022.3. and newer.
-        // https://discussions.unity.com/t/gradle-build-issues-for-android-api-sdk-35-in-unity-2022-3lts/1502187/10
-#if UNITY_2022_3_OR_NEWER
-        Debug.Log("Builder: Setting Android target API level to 33");
-        PlayerSettings.Android.targetSdkVersion = AndroidSdkVersions.AndroidApiLevel33;
-#endif
-
         Debug.Log("Builder: Updating BuildPlayerOptions");
         var buildPlayerOptions = new BuildPlayerOptions
         {