diff --git a/scripts/create-manifest-file.ps1 b/scripts/create-manifest-file.ps1
index bb32d18cf2..85e1579ba4 100644
--- a/scripts/create-manifest-file.ps1
+++ b/scripts/create-manifest-file.ps1
@@ -40,11 +40,17 @@ foreach ($targetFramework in $dotnetTargetFrameworks)
 }
 
 # Generating hash for nuget
-$nugetFileName = "Microsoft.DataApiBuilder.$DabVersion.nupkg"
-$nugetFilePath = "$BuildOutputDir/nupkg/$nugetFileName"
-$fileHashInfo = Get-FileHash $nugetFilePath
-$nuget_file_hash = $fileHashInfo.Hash
-$download_url_nuget = "https://github.com/Azure/data-api-builder/releases/download/$versionTag/$nugetFileName"
+$nugetCliFileName = "Microsoft.DataApiBuilder.$DabVersion.nupkg"
+$nugetCliFilePath = "$BuildOutputDir/nupkg/$nugetCliFileName"
+$fileCliHashInfo = Get-FileHash $nugetCliFilePath
+$nuget_cli_file_hash = $fileCliHashInfo.Hash
+$download_url_nuget_cli = "https://github.com/Azure/data-api-builder/releases/download/$versionTag/$nugetCliFileName"
+
+$nugetCoreFileName = "Microsoft.DataApiBuilder.Core.$DabVersion.nupkg"
+$nugetCoreFilePath = "$BuildOutputDir/nupkg/$nugetCoreFileName"
+$fileCoreHashInfo = Get-FileHash $nugetCoreFilePath
+$nuget_core_file_hash = $fileCoreHashInfo.Hash
+$download_url_nuget_core = "https://github.com/Azure/data-api-builder/releases/download/$versionTag/$nugetCoreFileName"
 
 # Creating new block to insert latest version 
 # String substitution requires hashtable to be wrapped in $( $hashtable['key'] ) to avoid parsing issues.
@@ -68,8 +74,12 @@ $latestBlock = @'
             "sha": "$($frameworkPlatformFileHashMetadata["net8.0_osx-x64"])"
         },
         "nuget": {
-            "url": "${download_url_nuget}",
-            "sha": "${nuget_file_hash}"
+            "url": "${download_url_nuget_cli}",
+            "sha": "${nuget_cli_file_hash}"
+        },
+        "nuget-core": {
+            "url": "${download_url_nuget_core}",
+            "sha": "${nuget_core_file_hash}"
         }
     }
 }
diff --git a/scripts/notice-generation.ps1 b/scripts/notice-generation.ps1
index bc67f6e72e..d97f0edf8a 100644
--- a/scripts/notice-generation.ps1
+++ b/scripts/notice-generation.ps1
@@ -2,6 +2,7 @@
 # Licensed under the MIT License.
 
 param (
+    [Parameter (Mandatory=$true)][string] $noticeFilePath,
     [Parameter (Mandatory=$true)][string] $BuildArtifactStagingDir,
     [Parameter (Mandatory=$true)][string] $BuildSourcesDir
 )
@@ -17,9 +18,6 @@ Invoke-WebRequest $chiliCreamLicenseMetadataURL -UseBasicParsing |
 $sqlClientSNILicenseFilePath = "$BuildSourcesDir/external_licenses/Microsoft.Data.SqlClient.SNI.5.2.0.License.txt"
 $sqlClientSNILicense = Get-Content -Path $sqlClientSNILicenseFilePath -Raw
 
-# Path of notice file generated in CI/CD pipeline.
-$noticeFilePath = "$BuildSourcesDir/NOTICE.txt"
-
 # Replace erroneous copyright, using [System.IO.File] for better performance than Get-Content and Set-Content
 $content = [System.IO.File]::ReadAllText($noticeFilePath).Replace("(c) Microsoft 2023`r`n", "")
 $content = [System.IO.File]::ReadAllText($noticeFilePath).Replace("(c) Microsoft 2024`r`n", "")
diff --git a/src/Cli/Cli.csproj b/src/Cli/Cli.csproj
index 60c405e6a9..85ae1e4ff5 100644
--- a/src/Cli/Cli.csproj
+++ b/src/Cli/Cli.csproj
@@ -55,7 +55,7 @@
     <None Include="..\..\nuget\README.md" Pack="true" PackagePath="\" CopyToOutputDirectory="PreserveNewest" />
     <None Include="..\..\nuget\nuget_icon.png" Pack="true" PackagePath="\" />
     <None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="..\..\NOTICE.txt" Pack="true" PackagePath="\" Condition="Exists('..\..\..\NOTICE.txt')" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="..\..\nuget_cli\NOTICE.txt" Pack="true" PackagePath="\" Condition="Exists('..\..\..\nuget_cli\NOTICE.txt')" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Core/Azure.DataApiBuilder.Core.csproj b/src/Core/Azure.DataApiBuilder.Core.csproj
index 8b32a8682c..0423b87d8e 100644
--- a/src/Core/Azure.DataApiBuilder.Core.csproj
+++ b/src/Core/Azure.DataApiBuilder.Core.csproj
@@ -62,7 +62,7 @@
     <None Include="..\..\nuget\nuget_core\README.md" Pack="true" PackagePath="\" />
     <None Include="..\..\nuget\nuget_icon.png" Pack="true" PackagePath="\" />
     <None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\" />
-    <None Include="..\..\NOTICE.txt" Pack="true" PackagePath="\" Condition="Exists('..\..\..\NOTICE.txt')" />
+    <None Include="..\..\nuget_core\NOTICE.txt" Pack="true" PackagePath="\" Condition="Exists('..\..\..\nuget_core\NOTICE.txt')" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
 </Project>