diff --git a/src/AzureFunctions/Definition.target b/src/AzureFunctions/Definition.target
index caf31e7..f45b12b 100644
--- a/src/AzureFunctions/Definition.target
+++ b/src/AzureFunctions/Definition.target
@@ -28,7 +28,14 @@
 			<Data>
 				<ApplicationServer>Generic Servlet 6.0</ApplicationServer>
 			</Data>
-		</Generator>		
+		</Generator>
+		<Generator>
+			<Id>15</Id>			
+			<SupportFiles>
+				<File>services.deployment.azurefunctions.csproj</File>
+			</SupportFiles>
+			<Data/>
+		</Generator>			
 	</Generators>
 	<DataSources>
 		<DataSource Id="12" /> <!-- Microsoft SQL Server -->
diff --git a/src/AzureFunctions/ProjectFiles/services.deployment.azurefunctions.csproj b/src/AzureFunctions/ProjectFiles/services.deployment.azurefunctions.csproj
new file mode 100644
index 0000000..9c81dc5
--- /dev/null
+++ b/src/AzureFunctions/ProjectFiles/services.deployment.azurefunctions.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="CopyNugetSources">
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <OutputType>Library</OutputType>
+        <AssemblyName>services.deployment.azurefunctions.csproj</AssemblyName>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+        <Configurations>Debug;Release;Release_Trial;Debug_Trial</Configurations>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="GeneXus.Deploy.AzureFunctions.Handlers" Version="$(GenStdVersion)" />
+        <PackageReference Include="GeneXus.Deploy.AzureFunctionsLibraries" Version="$(GenStdVersion)" />
+    </ItemGroup>
+
+    <PropertyGroup>
+        <NugetCachePath Condition="'$(NugetCachePath)' == '' and '$(OS)' == 'Windows_NT'">$([System.Environment]::ExpandEnvironmentVariables('%UserProfile%\.nuget\packages'))</NugetCachePath>
+        <NugetCachePath Condition="'$(NugetCachePath)' == '' and '$(OS)' != 'Windows_NT'">$([System.Environment]::ExpandEnvironmentVariables('$(HOME)/.nuget/packages'))</NugetCachePath>
+    </PropertyGroup>
+
+    <ItemGroup>    
+        <NugetFileAzureClasses Include="
+            $(NugetCachePath)\GeneXus.Deploy.AzureFunctionsLibraries\$(GenStdVersion)\src\**\*.*">
+            <OutputDir>GeneXus.Deploy.AzureFunctionsLibraries</OutputDir>
+        </NugetFileAzureClasses>
+        <NugetFileAzureClasses Include="
+                $(NugetCachePath)\GeneXus.Deploy.AzureFunctions.Handlers\$(GenStdVersion)\src\**\*.*">
+            <OutputDir>GeneXus.Deploy.AzureFunctions.Handlers</OutputDir>
+        </NugetFileAzureClasses>
+	</ItemGroup>
+
+     <Target Name="CopyNugetSources" AfterTargets="Publish">
+        <Copy SourceFiles="%(NugetFileAzureClasses.Identity)" DestinationFolder="$(DeploySrcBuildPath)\%(NugetFileAzureClasses.OutputDir)\%(NugetFileAzureClasses.RecursiveDir)" SkipUnchangedFiles="true" ContinueOnError="ErrorAndContinue"/>
+    </Target>
+</Project>
diff --git a/src/Common/Azure/azurefunctions-create-NETpackage.targets b/src/Common/Azure/azurefunctions-create-NETpackage.targets
index e782a02..253b545 100644
--- a/src/Common/Azure/azurefunctions-create-NETpackage.targets
+++ b/src/Common/Azure/azurefunctions-create-NETpackage.targets
@@ -45,6 +45,25 @@
 
 	</Target>
 
+	<Target Name="CopyNugetSources" Condition = "'$(NETGenerator)' == 'true'">
+		<!--Download GeneXus Azure Functions sources from nuget -->
+		
+		<Target Name="GetProjectFilesFromDeployTargets" Condition="'$(NETGenerator)' == 'true'">
+		<GetSupportFiles 
+			DeployTargetId="$(DeployTarget)"
+			Generator ="$(GENERATOR)">
+			<Output TaskParameter="TgSupportFilesItem" ItemName="TgSupportFilesItem"/>
+		</GetSupportFiles>
+		</Target>
+
+		<Copy SourceFiles="$(SourcePath)\Directory.build.props" 
+		DestinationFolder="$(DeploySrcBuildPath)" SkipUnchangedFiles="true" />
+
+		<Message Text="dotnet publish &quot;@(TgSupportFilesItem)&quot; -c Release" Importance="high"/>
+		<Exec Command="dotnet publish &quot;@(TgSupportFilesItem)&quot; -c Release" WorkingDirectory="$(DeploySrcBuildPath)" ConsoleToMSBuild="true"/>
+	
+	</Target>
+
 	<Target Name="GenerateSources" Condition = "'$(NETGenerator)' == 'true'">
 		
 		<MakeDir
@@ -124,7 +143,7 @@
 		/>
 	</Target>
 
-	<Target Name="PrepareDeploy" DependsOnTargets="GenerateSources;GenerateConfigs;RedisSupport;CopyAzureBinaries;UpdateHostJsonFile" Condition="'$(NETGenerator)' == 'true'">
+	<Target Name="PrepareDeploy" DependsOnTargets="CopyNugetSources;GenerateSources;GenerateConfigs;RedisSupport;CopyAzureBinaries;UpdateHostJsonFile" Condition="'$(NETGenerator)' == 'true'">
 	<Message Text="Adding required files to the deploy...(this may take a while)" Importance="high"/>
 
 		<ItemGroup>