diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 16b9efa..8f26e76 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,7 +6,8 @@ jobs:
   Tests:
     name: Run All Tests on 4.2
     runs-on: ubuntu-latest
-    container: barichello/godot-ci:mono-4.2
+    # TODO: Replace with barichello after this PR (https://github.com/abarichello/godot-ci/pull/106) gets merged
+    container: adrasteondev/godot-ci:mono-4.2
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
diff --git a/GDTask.csproj b/GDTask.csproj
index 48368a0..198256e 100644
--- a/GDTask.csproj
+++ b/GDTask.csproj
@@ -1,9 +1,8 @@
 <Project Sdk="Godot.NET.Sdk/4.2.1">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
+    <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'ios' ">net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>
   </PropertyGroup>
-  <ItemGroup>
-    <Folder Include="tests\manual\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/GDTask.sln b/GDTask.sln
index bafa5e0..b9b0bc8 100644
--- a/GDTask.sln
+++ b/GDTask.sln
@@ -1,28 +1,19 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.32630.194
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GDTask", "GDTask.csproj", "{CD948EAF-E39E-45E7-A13E-7A74700EFFF1}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GDTask", "GDTask.csproj", "{2A00429B-5E6F-4AC6-AF6C-8CA6070444BE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		ExportDebug|Any CPU = ExportDebug|Any CPU
-		ExportRelease|Any CPU = ExportRelease|Any CPU
+	Debug|Any CPU = Debug|Any CPU
+	ExportDebug|Any CPU = ExportDebug|Any CPU
+	ExportRelease|Any CPU = ExportRelease|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CD948EAF-E39E-45E7-A13E-7A74700EFFF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD948EAF-E39E-45E7-A13E-7A74700EFFF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD948EAF-E39E-45E7-A13E-7A74700EFFF1}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
-		{CD948EAF-E39E-45E7-A13E-7A74700EFFF1}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
-		{CD948EAF-E39E-45E7-A13E-7A74700EFFF1}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
-		{CD948EAF-E39E-45E7-A13E-7A74700EFFF1}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8B0106CE-747F-4EF9-BA0F-6220BBDA9D55}
+		{2A00429B-5E6F-4AC6-AF6C-8CA6070444BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A00429B-5E6F-4AC6-AF6C-8CA6070444BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A00429B-5E6F-4AC6-AF6C-8CA6070444BE}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
+		{2A00429B-5E6F-4AC6-AF6C-8CA6070444BE}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
+		{2A00429B-5E6F-4AC6-AF6C-8CA6070444BE}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
+		{2A00429B-5E6F-4AC6-AF6C-8CA6070444BE}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
 	EndGlobalSection
 EndGlobal