diff --git a/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj b/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj
index 58fa34b88..6a112f127 100644
--- a/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj
+++ b/Stack/Opc.Ua.Core/Opc.Ua.Core.csproj
@@ -9,6 +9,7 @@
     <Description>OPC UA Core Class Library</Description>
     <IsPackable>true</IsPackable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -88,23 +89,31 @@
 
   <Target Name="GetPackagingOutputs" />
 
-  <!-- Produces a zipped version of the Nodeset 2 to reduce assembly size by 2.7MB ! -->
-  <ItemGroup>
-    <EmbeddedResource Include="Schema\Opc.Ua.NodeSet2.xml.zip" />
-  </ItemGroup>
-
+  <!-- Produces a zipped version of the Nodeset 2 to reduce assembly size! -->
   <PropertyGroup>
-    <ZipTmp>$(BaseIntermediateOutputPath)/zipnodeset2</ZipTmp>
-    <ZipNodeSet2XML>Schema/Opc.Ua.NodeSet2.xml</ZipNodeSet2XML>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ZipTmp>$(BaseIntermediateOutputPath)$(Configuration)/$(TargetFramework)/zipnodeset2</ZipTmp>
+    <NodeSet2XML>Schema/Opc.Ua.NodeSet2.xml</NodeSet2XML>
+    <ZipNodeSet2XML>$(BaseIntermediateOutputPath)$(Configuration)/$(TargetFramework)/Opc.Ua.NodeSet2.xml.zip</ZipNodeSet2XML>
   </PropertyGroup>
 
-  <Target Name="ZipNodeSet2" BeforeTargets="PrepareForBuild" Inputs="$(ZipNodeSet2XML)" Outputs="$(ZipNodeSet2XML).zip">
-    <Message Text="Zip $(ZipNodeSet2XML) in $(ZipTmp)." Importance="high" />
-    <Copy SourceFiles="$(ZipNodeSet2XML)" DestinationFolder="$(ZipTmp)" />
-    <ZipDirectory SourceDirectory="$(ZipTmp)" DestinationFile="$(ZipNodeSet2XML).zip" Overwrite="true" />
+  <!-- Embed the zipped Nodeset2 file -->
+  <ItemGroup>
+    <EmbeddedResource Include="$(ZipNodeSet2XML)" Link="$(NodeSet2XML).zip" />
+  </ItemGroup>
+
+  <!-- Zip the NodeSet2 file -->
+  <Target Name="ZipNodeSet2" BeforeTargets="PrepareForBuild" Inputs="$(NodeSet2XML)" Outputs="$(ZipNodeSet2XML)">
+    <Message Text="Zip $(NodeSet2XML) in $(ZipNodeSet2XML)." Importance="high" />
+    <Copy SourceFiles="$(NodeSet2XML)" DestinationFolder="$(ZipTmp)" />
+    <ZipDirectory SourceDirectory="$(ZipTmp)" DestinationFile="$(ZipNodeSet2XML)" Overwrite="true" />
     <RemoveDir Directories="$(ZipTmp)" />
     <Message Text="Zip NodeSet2 completed, $(ZipTmp) removed." Importance="high" />
   </Target>
-
+  
+  <!-- Clean up the zip file -->
+  <Target Name="RemoveZipNodeset2" AfterTargets="Clean" Condition="Exists('$(ZipNodeSet2XML)')">
+    <Message Text="Delete Zip $(ZipNodeSet2XML)" Importance="high"></Message>
+    <Delete Files="$(ZipNodeSet2XML)"></Delete>
+  </Target>
+  
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0be491de2..68e57bf23 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -68,7 +68,7 @@ stages:
     parameters:
       configuration: Release
       framework: net6.0
-      agents: '@{ windows = "windows-2022"; linux="ubuntu-22.04"; mac = "macOS-12"}'
+      agents: '@{ windows = "windows-2022"; linux="ubuntu-22.04"; mac = "macOS-15"}'
       jobnamesuffix: net60
       customtestarget: net6.0
 - stage: testreleasepr