diff --git a/.azure-pipelines/generation-templates/java-kiota.yml b/.azure-pipelines/generation-templates/java-kiota.yml
index d005fd60c..6aed05d48 100644
--- a/.azure-pipelines/generation-templates/java-kiota.yml
+++ b/.azure-pipelines/generation-templates/java-kiota.yml
@@ -16,3 +16,8 @@ steps:
     BuildConfiguration: $(buildConfiguration)
     OutputFullPath: $(kiotaDirectory)/output/${{ parameters.namespacePath }}/*
     RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/main/java/${{ parameters.namespacePath }}/generated/
+
+- pwsh: |
+    Move-Item -Path "*.txt","*.json" -Destination "$(Build.SourcesDirectory)/${{ parameters.repoName }}/src/main/java/${{ parameters.namespacePath }}/generated/"
+  displayName: Move kiota specific metadata to expected location (txt for export file, json for lock or workspace file)
+  workingDirectory: $(kiotaDirectory)/output/
diff --git a/.azure-pipelines/generation-templates/language-generation-kiota.yml b/.azure-pipelines/generation-templates/language-generation-kiota.yml
index 8167a499c..be2907370 100644
--- a/.azure-pipelines/generation-templates/language-generation-kiota.yml
+++ b/.azure-pipelines/generation-templates/language-generation-kiota.yml
@@ -44,6 +44,10 @@ parameters:
   type: string
   default: ''
 
+- name: exportDom
+  type: boolean
+  default: true
+
 steps:
 - template: set-up-for-generation-kiota.yml
   parameters:
@@ -80,6 +84,8 @@ steps:
 
 - bash: '$(kiotaDirectory)/kiota generate --openapi $(Build.SourcesDirectory)/msgraph-metadata/${{ parameters.cleanMetadataFolder }}/openapi.yaml --language ${{ parameters.language }} -o $(kiotaDirectory)/output -n ${{ parameters.targetNamespace }} -c ${{ parameters.targetClassName }} ${{ parameters.customArguments }}'
   displayName: 'Run Kiota for ${{ parameters.language }} ${{ parameters.version }}'
+  env:
+    KIOTA_GENERATION:EXPORTPUBLICAPI: ${{ parameters.exportDom }}
 
 - ${{ parameters.languageSpecificSteps }}
 
diff --git a/.azure-pipelines/generation-templates/typescript-sdk.yml b/.azure-pipelines/generation-templates/typescript-sdk.yml
index 1ee642760..33d82d254 100644
--- a/.azure-pipelines/generation-templates/typescript-sdk.yml
+++ b/.azure-pipelines/generation-templates/typescript-sdk.yml
@@ -15,3 +15,9 @@ steps:
 - pwsh : $(Build.SourcesDirectory)/${{ parameters.repoName }}/scripts/incrementMinorVersion.ps1
   displayName: 'Increment minor version number'
   workingDirectory: '$(Build.SourcesDirectory)/${{ parameters.repoName }}/scripts'
+
+
+- pwsh: |
+    Move-Item -Path "*.txt","*.json" -Destination "$(Build.SourcesDirectory)/${{ parameters.repoName }}/packages/"
+  displayName: Move kiota specific metadata to expected location (txt for export file, json for lock or workspace file)
+  workingDirectory: $(kiotaDirectory)/output/
diff --git a/scripts/copy-typescript-sdk-models.ps1 b/scripts/copy-typescript-sdk-models.ps1
index 528c0d7bf..433c5a8cd 100644
--- a/scripts/copy-typescript-sdk-models.ps1
+++ b/scripts/copy-typescript-sdk-models.ps1
@@ -22,4 +22,4 @@ foreach ($directory in $packagesDirectories) {
     Invoke-Expression "$PSScriptRoot\fix-typescript-fluent-packages-imports.ps1 -targetDirectory $($directory.FullName) -packageName $packageName"
 }
 
-Write-Host "Copied the generated files into the repo. From: $env:OutputFullPath to: $env:RepoModelsDir" -ForegroundColor Green
+Write-Host "Copied the generated files into the repo. From: $sourceDirectory to: $targetDirectory" -ForegroundColor Green