diff --git a/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.Debug.csproj b/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.Debug.csproj
index e1859cba..2f9ad7f0 100644
--- a/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.Debug.csproj
+++ b/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.Debug.csproj
@@ -475,7 +475,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.csproj b/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.csproj
index 1bf4f482..6af721a3 100644
--- a/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.csproj
+++ b/Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.csproj
@@ -515,7 +515,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
     <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.371.3-beta" />
   </ItemGroup>
 
diff --git a/Tests/DemoModel/DemoModel.Debug.csproj b/Tests/DemoModel/DemoModel.Debug.csproj
index 70350346..2d04d4bd 100644
--- a/Tests/DemoModel/DemoModel.Debug.csproj
+++ b/Tests/DemoModel/DemoModel.Debug.csproj
@@ -31,6 +31,8 @@
 
   <ItemGroup>
     <None Remove="DemoModel\DemoModel.PredefinedNodes.uanodes" />
+    <None Remove="GDS\Opc.Ua.Gds.PredefinedNodes.uanodes" />
+    <None Remove="Onboarding\Opc.Ua.Onboarding.PredefinedNodes.uanodes" />
     <None Remove="Opc.Ua.NodeSet.NodeIds.csv" />
     <None Remove="Opc.Ua.NodeSet.NodeSet2.Part6.xml" />
     <None Remove="Opc.Ua.NodeSet.NodeSet2.xml" />
@@ -40,16 +42,18 @@
     <None Remove="Opc.Ua.NodeSet.Types.xsd" />
     <None Remove="OpcUaNodeSetModel.csv" />
     <None Remove="OpcUaNodeSetModel.xml" />
+    <None Remove="Scheduler\Opc.Ua.Scheduler.PredefinedNodes.uanodes" />
   </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="DemoModel\DemoModel.PredefinedNodes.uanodes" />
+    <EmbeddedResource Include="GDS\Opc.Ua.Gds.PredefinedNodes.uanodes" />
+    <EmbeddedResource Include="Onboarding\Opc.Ua.Onboarding.PredefinedNodes.uanodes" />
+    <EmbeddedResource Include="Scheduler\Opc.Ua.Scheduler.PredefinedNodes.uanodes" />
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Models\" />
-    <Folder Include="Scheduler\" />
-    <Folder Include="Onboarding\" />
   </ItemGroup>
 
   <ItemGroup>