diff --git a/eng/common/scripts/modules/Package-Properties.psm1 b/eng/common/scripts/modules/Package-Properties.psm1
index 61c45455f0d..577ba0b7c4b 100644
--- a/eng/common/scripts/modules/Package-Properties.psm1
+++ b/eng/common/scripts/modules/Package-Properties.psm1
@@ -107,7 +107,16 @@ function Extract-JsPkgProps ($pkgPath, $serviceName, $pkgName)
     if (Test-Path $projectPath)
     {
         $projectJson = Get-Content $projectPath | ConvertFrom-Json
-        $jsStylePkgName = $pkgName.replace("azure-", "@azure/")
+        $jsStylePkgName = ""
+        if ($pkgName.StartsWith("azure-"))
+        {
+            $jsStylePkgName = $pkgName.replace("azure-", "@azure/")
+        }
+        else if ($pkgName.StartsWith("microsoft-"))
+        {
+            $jsStylePkgName = $pkgName.replace("microsoft-", "@microsoft/")
+        }
+
         if ($projectJson.name -eq "$jsStylePkgName")
         {
             return [PackageProps]::new($projectJson.name, $projectJson.version, $pkgPath, $serviceName)
diff --git a/eng/common/scripts/update-docs-metadata.ps1 b/eng/common/scripts/update-docs-metadata.ps1
index 2f7f3343de4..d65dafca6e6 100644
--- a/eng/common/scripts/update-docs-metadata.ps1
+++ b/eng/common/scripts/update-docs-metadata.ps1
@@ -53,7 +53,7 @@ function GetAdjustedReadmeContent($pkgInfo, $lang){
     $service = ""
 
     # the namespace is not expected to be present for js.
-    $pkgId = $pkgInfo.PackageId.Replace("@azure/", "")
+    $pkgId = $pkgInfo.PackageId.Replace("@azure/", "").Replace("@microsoft/", "")
 
     try {
       $metadata = GetMetaData -lang $lang
@@ -112,7 +112,13 @@ if ($pkgs) {
       $rdSuffix = "-pre"
     }
 
-    $readmeName = "$($packageInfo.PackageId.Replace('azure-','').Replace('Azure.', '').Replace('@azure/', '').ToLower())-readme$rdSuffix.md"
+    $packageId = $packageInfo.PackageId
+    # JS opentelemetry has "azure-" word inside package name and this should not be replaced
+    if ( $packageId.StartsWith("azure-")) 
+    {
+      $packageId = $packageId.Replace("azure-", "")
+    }
+    $readmeName = "$($packageId.Replace('Azure.', '').Replace('@azure/', '').Replace('@microsoft/', '').ToLower())-readme$rdSuffix.md"
     $readmeLocation = Join-Path $DocRepoLocation $DocRepoContentLocation $readmeName
 
     if ($packageInfo.ReadmeContent) {