diff --git a/eng/pipelines/docindex.yml b/eng/pipelines/docindex.yml
index bab1ffefc82d..55720dd2989a 100644
--- a/eng/pipelines/docindex.yml
+++ b/eng/pipelines/docindex.yml
@@ -33,7 +33,15 @@ jobs:
           ContainerRegistryClientId: $(azuresdkimages-cr-clientid)
           ContainerRegistryClientSecret: $(azuresdkimages-cr-clientsecret)
           ImageId: "$(DocValidationImageId)"
-      # Call update docs ci script to onboard packages
+
+      - task: Powershell@2
+        inputs:
+          pwsh: true
+          filePath: eng/common/scripts/Update-DocsMsPackageMonikers.ps1
+          arguments: -DocRepoLocation $(DocRepoLocation)
+        displayName: Move deprecated packages to legacy moniker
+        condition: and(succeeded(), or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Force.MainUpdate'], 'true')))
+
       - task: Powershell@2
         inputs:
           pwsh: true
@@ -116,6 +124,15 @@ jobs:
           Copy-Item "./eng/repo-docs/docms/daily.update.setting.xml" -Destination "~/.m2/settings.xml"
         displayName: 'Configure mvn'
         workingDirectory: $(Build.SourcesDirectory)
+
+      - task: Powershell@2
+        inputs:
+          pwsh: true
+          filePath: eng/common/scripts/Update-DocsMsPackageMonikers.ps1
+          arguments: -DocRepoLocation $(DocRepoLocation)
+        displayName: Move deprecated packages to legacy moniker
+        condition: and(succeeded(), or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Force.MainUpdate'], 'true')))
+
       - task: Powershell@2
         inputs:
           pwsh: true
diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
index c491b5afd330..48e53e584c30 100644
--- a/eng/scripts/Language-Settings.ps1
+++ b/eng/scripts/Language-Settings.ps1
@@ -741,6 +741,7 @@ function Get-java-DocsMsMetadataForPackage($PackageInfo) {
     DocsMsReadMeName = $readmeName
     LatestReadMeLocation  = 'docs-ref-services/latest'
     PreviewReadMeLocation = 'docs-ref-services/preview'
+    LegacyReadMeLocation  = 'docs-ref-services/legacy'
     Suffix = ''
   }
 }
diff --git a/eng/scripts/docs/Docs-Onboarding.ps1 b/eng/scripts/docs/Docs-Onboarding.ps1
index eefb6c418936..e00958605ac2 100644
--- a/eng/scripts/docs/Docs-Onboarding.ps1
+++ b/eng/scripts/docs/Docs-Onboarding.ps1
@@ -1,12 +1,5 @@
 #$SetDocsPackageOnboarding = "Set-${Language}-DocsPackageOnboarding"
 function Set-java-DocsPackageOnboarding($moniker, $metadata, $docRepoLocation, $packageSourceOverride) { 
-    
-    # Do not write onboarding information for legacy moniker
-    # TODO: remove this once legacy moniker is properly configured
-    if ($moniker -eq 'legacy') { 
-        return 
-    }
-
     $packageJsonPath = Join-Path $docRepoLocation "package.json"
     $onboardingInfo = Get-Content $packageJsonPath | ConvertFrom-Json
 
@@ -64,3 +57,9 @@ function Get-java-DocsPackagesAlreadyOnboarded($docRepoLocation, $moniker) {
 function Get-java-PackageIdentity($package) { 
     return "$($package['Group']):$($package['Name'])"
 }
+
+# Declared in common.ps1 as 
+# $GetPackageIdentityFromCsvMetadata = "Get-${Language}-PackageIdentityFromCsvMetadata"
+function Get-java-PackageIdentityFromCsvMetadata($package) { 
+    return "$($package.GroupId):$($Package.Package)"
+}
\ No newline at end of file
diff --git a/eng/scripts/docs/Docs-ToC.ps1 b/eng/scripts/docs/Docs-ToC.ps1
index 3152853a0e37..03c68676ed28 100644
--- a/eng/scripts/docs/Docs-ToC.ps1
+++ b/eng/scripts/docs/Docs-ToC.ps1
@@ -15,13 +15,12 @@ function Get-java-OnboardedDocsMsPackagesForMoniker ($DocRepoLocation, $moniker)
     $onboardingSpec = ConvertFrom-Json (Get-Content $packageOnboardingFiles -Raw)
     if ("preview" -eq $moniker) {
         $onboardingSpec = $onboardingSpec | Where-Object { $_.output_path -eq "preview/docs-ref-autogen" }
-    }
-    elseif("latest" -eq $moniker) {
+    } elseif("latest" -eq $moniker) {
         $onboardingSpec = $onboardingSpec | Where-Object { $_.output_path -eq "docs-ref-autogen" }
+    } elseif ("legacy" -eq $moniker) { 
+        $onboardingSpec = $onboardingSpec | Where-Object { $_.output_path -eq "legacy/docs-ref-autogen" }
     }
 
-    # TODO: Add support for "legacy" moniker
-
     $onboardedPackages = @{}
     foreach ($spec in $onboardingSpec.packages) {
         $packageName = $spec.packageArtifactId