diff --git a/Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1
index 4a5b8f69e2..4b37e5afaf 100644
--- a/Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1
+++ b/Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1
@@ -261,10 +261,6 @@ function Start-M365DSCConfigurationExtract
         }
 
         $AzureAutomation = $false
-        if ($organization.IndexOf('.') -gt 0)
-        {
-            $organization = $organization.Split('.')[0]
-        }
 
         [array] $version = Get-Module 'Microsoft365DSC'
         $version = $version[0].Version
@@ -330,7 +326,6 @@ function Start-M365DSCConfigurationExtract
             { $_ -in 'CertificateThumbprint', 'CertificatePath', 'ApplicationWithSecret' }
             {
                 $postParamContent.Append("    `$OrganizationName = `$ConfigurationData.NonNodeData.OrganizationName`r`n") | Out-Null
-                $postParamContent.Append("    `$TenantId = `$ConfigurationData.NonNodeData.TenantId`r`n") | Out-Null
 
                 Add-ConfigurationDataEntry -Node 'NonNodeData' `
                     -Key 'OrganizationName' `
diff --git a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
index 740a0cda1e..c1f8707cb1 100644
--- a/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
+++ b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1
@@ -2968,8 +2968,8 @@ function Get-M365DSCExportContentForResource
     if ($partialContent.ToLower().IndexOf($OrganizationName.ToLower()) -gt 0)
     {
         $partialContent = $partialContent -ireplace [regex]::Escape($OrganizationName + ':'), "`$($OrganizationName):"
-        $partialContent = $partialContent -ireplace [regex]::Escape('@' + $OrganizationName), "@`$TenantId"
         $partialContent = $partialContent -ireplace [regex]::Escape($OrganizationName), "`$OrganizationName"
+        $partialContent = $partialContent -ireplace [regex]::Escape('@' + $OrganizationName), "@`$OrganizationName"
     }
     $content += $partialContent
     $content += "        }`r`n"