diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 0ab9c48c5..ec489abbb 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -10,19 +10,15 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1
-      - name: Setup NuGet
-        uses: NuGet/setup-nuget@v1.0.5
-      - name: setup-msbuild
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v2
       - name: Restore Packages
-        run: nuget restore XenAdmin.sln
+        run: msbuild XenAdmin.sln -t:restore
       - name: Build Release solution
-        run: msbuild XenAdmin.sln -property:Configuration=Debug
-      - name: Build Debug solution
         run: msbuild XenAdmin.sln -property:Configuration=Release
+      - name: Build Debug solution
+        run: msbuild XenAdmin.sln -property:Configuration=Debug
       - name: Upload Release Artifacts
         uses: actions/upload-artifact@v4
         with:
diff --git a/.gitignore b/.gitignore
index 50eb68a30..633ada2fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,6 @@ Thumbs.db
 *.idc
 *.bak
 
-packages/*
-!packages/DOTNET_BUILD_LOCATION
 Branding/Hotfixes/*
 
 _ReSharper.*/
diff --git a/Packages/MSTSCLib.1.0.0.nupkg b/Packages/MSTSCLib.1.0.0.nupkg
new file mode 100644
index 000000000..3ca6d2d04
Binary files /dev/null and b/Packages/MSTSCLib.1.0.0.nupkg differ
diff --git a/Packages/Microsoft.ReportViewer.9.0.0.nupkg b/Packages/Microsoft.ReportViewer.9.0.0.nupkg
new file mode 100644
index 000000000..100c46627
Binary files /dev/null and b/Packages/Microsoft.ReportViewer.9.0.0.nupkg differ
diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs
index b0e0156ae..2e0392093 100644
--- a/XenAdmin/MainWindow.cs
+++ b/XenAdmin/MainWindow.cs
@@ -332,7 +332,7 @@ namespace XenAdmin
                 Program.Version.Minor == 0 &&
                 Program.Version.Build == 0)
             {
-                Text += " NIGHTLY BUILD Nr. " + Program.Version.Revision.ToString() + " (rev: " + ThisAssembly.Git.SourceRevisionId + ")";
+                Text += " vNext Build " + Program.Version.Revision.ToString() + " (rev: " + ThisAssembly.Git.SourceRevisionId + ")";
             }
 
             /*
diff --git a/XenAdmin/Program.cs b/XenAdmin/Program.cs
index 302d1c9b8..2d703cc29 100644
--- a/XenAdmin/Program.cs
+++ b/XenAdmin/Program.cs
@@ -120,7 +120,10 @@ namespace XenAdmin
             var assembly = Assembly.GetExecutingAssembly();
             AssemblyDir = Path.GetDirectoryName(assembly.Location);
             Version = assembly.GetName().Version;
-            VersionText = $"{Version.Major}.{Version.Minor}.{Version.Build}";
+
+            VersionText = Version.Major == 0 && Version.Minor == 0 && Version.Build == 0
+                ? "vNext"
+                : $"{Version.Major}.{Version.Minor}.{Version.Build}";
 
             var logFolder = Path.Combine(
                 Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
diff --git a/XenAdmin/RDP/MSTSCLib.dll b/XenAdmin/RDP/MSTSCLib.dll
deleted file mode 100644
index 29577b601..000000000
Binary files a/XenAdmin/RDP/MSTSCLib.dll and /dev/null differ
diff --git a/XenAdmin/ReportViewer/Microsoft.ReportViewer.Common.dll b/XenAdmin/ReportViewer/Microsoft.ReportViewer.Common.dll
deleted file mode 100644
index 2ab51fd6a..000000000
Binary files a/XenAdmin/ReportViewer/Microsoft.ReportViewer.Common.dll and /dev/null differ
diff --git a/XenAdmin/ReportViewer/Microsoft.ReportViewer.Common.resources.dll b/XenAdmin/ReportViewer/Microsoft.ReportViewer.Common.resources.dll
deleted file mode 100644
index ba99aa266..000000000
Binary files a/XenAdmin/ReportViewer/Microsoft.ReportViewer.Common.resources.dll and /dev/null differ
diff --git a/XenAdmin/ReportViewer/Microsoft.ReportViewer.ProcessingObjectModel.dll b/XenAdmin/ReportViewer/Microsoft.ReportViewer.ProcessingObjectModel.dll
deleted file mode 100644
index 90bcae91c..000000000
Binary files a/XenAdmin/ReportViewer/Microsoft.ReportViewer.ProcessingObjectModel.dll and /dev/null differ
diff --git a/XenAdmin/ReportViewer/Microsoft.ReportViewer.WinForms.dll b/XenAdmin/ReportViewer/Microsoft.ReportViewer.WinForms.dll
deleted file mode 100644
index 2010a318a..000000000
Binary files a/XenAdmin/ReportViewer/Microsoft.ReportViewer.WinForms.dll and /dev/null differ
diff --git a/XenAdmin/ReportViewer/Microsoft.ReportViewer.WinForms.resources.dll b/XenAdmin/ReportViewer/Microsoft.ReportViewer.WinForms.resources.dll
deleted file mode 100644
index f5fa2aa9c..000000000
Binary files a/XenAdmin/ReportViewer/Microsoft.ReportViewer.WinForms.resources.dll and /dev/null differ
diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj
index 044e17fcd..a4ecf9697 100755
--- a/XenAdmin/XenAdmin.csproj
+++ b/XenAdmin/XenAdmin.csproj
@@ -8,10 +8,13 @@
 		<ApplicationIcon>AppIcon.ico</ApplicationIcon>
 		<Title>XCP-ng Center</Title>
 		<Description>XCP-ng Center</Description>
+		<RestoreSources>$(RestoreSources);../Packages</RestoreSources>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\XenModel\XenModel.csproj" />
+		<PackageReference Include="MSTSCLib" Version="1.0.0" />
+		<PackageReference Include="Microsoft.ReportViewer" Version="9.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -31,21 +34,10 @@
 		<EmbeddedResource Update="VNC\KeyMap.resx">
 			<LogicalName>DotNetVnc.KeyMap.resources</LogicalName>
 		</EmbeddedResource>
-	</ItemGroup>
-
-	<ItemGroup>
-		<Reference Include="Microsoft.ReportViewer.WinForms, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-			<HintPath>ReportViewer\Microsoft.ReportViewer.WinForms.dll</HintPath>
-			<SpecificVersion>False</SpecificVersion>
-			<Private>True</Private>
-		</Reference>
-		<Reference Include="MSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-			<Private>True</Private>
-		</Reference>
-		<Reference Include="MSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-			<SpecificVersion>False</SpecificVersion>
-			<HintPath>RDP\MSTSCLib.dll</HintPath>
-		</Reference>
+		<EmbeddedResource Update="Wizards\NewSRWizard_Pages\ChooseSrProvisioningPage.resx">
+		  <Generator>ResXFileCodeGenerator</Generator>
+		  <LastGenOutput>ChooseSrProvisioningPage.Designer.cs</LastGenOutput>
+		</EmbeddedResource>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -59,6 +51,11 @@
 	    <AutoGen>True</AutoGen>
 	    <DependentUpon>Settings.settings</DependentUpon>
 	  </Compile>
+	  <Compile Update="Wizards\NewSRWizard_Pages\ChooseSrProvisioningPage.Designer.cs">
+	    <DesignTime>True</DesignTime>
+	    <AutoGen>True</AutoGen>
+	    <DependentUpon>ChooseSrProvisioningPage.resx</DependentUpon>
+	  </Compile>
 	</ItemGroup>
 
 	<ItemGroup>