diff --git a/module/Entra/Microsoft.Entra/Applications/Add-EntraApplicationOwner.ps1 b/module/Entra/Microsoft.Entra/Applications/Add-EntraApplicationOwner.ps1
index 7cffc357ab..e3ec819b7b 100644
--- a/module/Entra/Microsoft.Entra/Applications/Add-EntraApplicationOwner.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/Add-EntraApplicationOwner.ps1
@@ -22,8 +22,18 @@ function Add-EntraApplicationOwner {
 
         $newOwner = @{}
 
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
+        else {
+            Write-Verbose "Using environment-specific Graph endpoint: $rootUri"
+        }
+        
         if ($null -ne $PSBoundParameters["OwnerId"]) {
-            $newOwner["@odata.id"] = "https://graph.microsoft.com/v1.0/directoryObjects/" + $PSBoundParameters["OwnerId"]
+            $newOwner["@odata.id"] = "$rootUri/v1.0/directoryObjects/" + $PSBoundParameters["OwnerId"]
             $params["BodyParameter"] = $newOwner
         }
         if ($null -ne $PSBoundParameters["WarningVariable"]) {
diff --git a/module/Entra/Microsoft.Entra/Applications/Add-EntraServicePrincipalOwner.ps1 b/module/Entra/Microsoft.Entra/Applications/Add-EntraServicePrincipalOwner.ps1
index 036969bc44..3358f800ca 100644
--- a/module/Entra/Microsoft.Entra/Applications/Add-EntraServicePrincipalOwner.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/Add-EntraServicePrincipalOwner.ps1
@@ -18,6 +18,12 @@ function Add-EntraServicePrincipalOwner {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
     
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["OutVariable"]) {
             $params["OutVariable"] = $PSBoundParameters["OutVariable"]
         }
@@ -59,7 +65,7 @@ function Add-EntraServicePrincipalOwner {
         }
         if ($null -ne $PSBoundParameters["OwnerId"]) {
             $TmpValue = $PSBoundParameters["OwnerId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/v1.0/directoryObjects/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
 
diff --git a/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationLogo.ps1 b/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationLogo.ps1
index e71a5bd9cf..5f15970337 100644
--- a/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationLogo.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationLogo.ps1
@@ -18,7 +18,7 @@ function Get-EntraApplicationLogo {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand        
-        $baseUri = 'https://graph.microsoft.com/v1.0/applications'
+        $baseUri = '/v1.0/applications'
         $Method = "GET"        
         if($null -ne $PSBoundParameters["ApplicationId"])
         {
diff --git a/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationOwner.ps1 b/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationOwner.ps1
index 6c9bb979b6..864cf4cefa 100644
--- a/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationOwner.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationOwner.ps1
@@ -21,7 +21,7 @@ function Get-EntraApplicationOwner {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/v1.0/applications'
+        $baseUri = '/v1.0/applications'
         $properties = '$select=*'
         $Method = "GET"        
         if ($null -ne $PSBoundParameters["Property"]) {
diff --git a/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationTemplate.ps1 b/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationTemplate.ps1
index 461d2cd83d..694c8f0025 100644
--- a/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationTemplate.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/Get-EntraApplicationTemplate.ps1
@@ -27,7 +27,7 @@ function Get-EntraApplicationTemplate {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $uri = "https://graph.microsoft.com/v1.0/applicationTemplates"
+        $uri = "/v1.0/applicationTemplates"
         $params["Method"] = "GET"
         $params["Uri"] = $uri + '?$select=*'
         
diff --git a/module/Entra/Microsoft.Entra/Applications/New-EntraApplicationFromApplicationTemplate.ps1 b/module/Entra/Microsoft.Entra/Applications/New-EntraApplicationFromApplicationTemplate.ps1
index 819f384997..abf9a8d35c 100644
--- a/module/Entra/Microsoft.Entra/Applications/New-EntraApplicationFromApplicationTemplate.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/New-EntraApplicationFromApplicationTemplate.ps1
@@ -31,7 +31,7 @@ function New-EntraApplicationFromApplicationTemplate {
             displayName = $DisplayName
         }
 
-        $uri = "https://graph.microsoft.com/v1.0/applicationTemplates/$ApplicationTemplateId/instantiate"
+        $uri = "/v1.0/applicationTemplates/$ApplicationTemplateId/instantiate"
         $response = Invoke-GraphRequest -uri $uri -Headers $customHeaders -Body $body -Method POST | ConvertTo-Json -Depth 5 | ConvertFrom-Json
         $memberList = @()
         foreach ($data in $response) {
diff --git a/module/Entra/Microsoft.Entra/Applications/New-EntraServicePrincipalPasswordCredential.ps1 b/module/Entra/Microsoft.Entra/Applications/New-EntraServicePrincipalPasswordCredential.ps1
index 2a2464fafe..26edad85a1 100644
--- a/module/Entra/Microsoft.Entra/Applications/New-EntraServicePrincipalPasswordCredential.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/New-EntraServicePrincipalPasswordCredential.ps1
@@ -24,7 +24,7 @@ function New-EntraServicePrincipalPasswordCredential {
             DisplayName        = $DisplayName
         }
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = 'https://graph.microsoft.com/v1.0/servicePrincipals'
+        $baseUri = '/v1.0/servicePrincipals'
         $URI = "$baseUri/$ServicePrincipalId/addPassword"
         $body = @{
             passwordCredential = @{
diff --git a/module/Entra/Microsoft.Entra/Applications/Remove-EntraDeletedDirectoryObject.ps1 b/module/Entra/Microsoft.Entra/Applications/Remove-EntraDeletedDirectoryObject.ps1
index 7f9690f5cc..68e23b2751 100644
--- a/module/Entra/Microsoft.Entra/Applications/Remove-EntraDeletedDirectoryObject.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/Remove-EntraDeletedDirectoryObject.ps1
@@ -20,7 +20,7 @@ function Remove-EntraDeletedDirectoryObject {
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object {"$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
-        $URI = "https://graph.microsoft.com/v1.0/directory/deletedItems/$DirectoryObjectId"
+        $URI = "/v1.0/directory/deletedItems/$DirectoryObjectId"
         $response = Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method $Method
         $response
     }    
diff --git a/module/Entra/Microsoft.Entra/Applications/Set-EntraApplicationLogo.ps1 b/module/Entra/Microsoft.Entra/Applications/Set-EntraApplicationLogo.ps1
index fb658ebb7c..5444dfe805 100644
--- a/module/Entra/Microsoft.Entra/Applications/Set-EntraApplicationLogo.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/Set-EntraApplicationLogo.ps1
@@ -22,7 +22,7 @@ function Set-EntraApplicationLogo {
         try{
             $params = @{}
             $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand        
-            $baseUri = 'https://graph.microsoft.com/v1.0/applications'
+            $baseUri = '/v1.0/applications'
             $Method = "PUT"            
             if($null -ne $PSBoundParameters["ApplicationId"])
             {
diff --git a/module/Entra/Microsoft.Entra/Applications/Set-EntraServicePrincipal.ps1 b/module/Entra/Microsoft.Entra/Applications/Set-EntraServicePrincipal.ps1
index 70513a06be..48dab9f076 100644
--- a/module/Entra/Microsoft.Entra/Applications/Set-EntraServicePrincipal.ps1
+++ b/module/Entra/Microsoft.Entra/Applications/Set-EntraServicePrincipal.ps1
@@ -46,7 +46,7 @@ function Set-EntraServicePrincipal {
 
     PROCESS {    
         $params = @{}
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/servicePrincipals"
+        $params["Uri"] = "/v1.0/servicePrincipals"
         $params["Method"] = "PATCH"
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $body = @{}        
diff --git a/module/Entra/Microsoft.Entra/Authentication/Revoke-EntraSignedInUserAllRefreshToken.ps1 b/module/Entra/Microsoft.Entra/Authentication/Revoke-EntraSignedInUserAllRefreshToken.ps1
index 6ae24fae3b..a220d828cf 100644
--- a/module/Entra/Microsoft.Entra/Authentication/Revoke-EntraSignedInUserAllRefreshToken.ps1
+++ b/module/Entra/Microsoft.Entra/Authentication/Revoke-EntraSignedInUserAllRefreshToken.ps1
@@ -14,7 +14,7 @@ function Revoke-EntraSignedInUserAllRefreshToken {
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
-        $response = (Invoke-GraphRequest -Headers $customHeaders -Uri 'https://graph.microsoft.com/v1.0/me/revokeSignInSessions' -Method POST).value
+        $response = (Invoke-GraphRequest -Headers $customHeaders -Uri '/v1.0/me/revokeSignInSessions' -Method POST).value
         if ($response) {
             $responseType = New-Object Microsoft.Graph.PowerShell.Models.ComponentsMwc6EoResponsesRevokesigninsessionsresponseContentApplicationJsonSchema
             $responseType.Value = $response
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraAdministrativeUnitMember.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraAdministrativeUnitMember.ps1
index 5c9962abab..c34c8b4259 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraAdministrativeUnitMember.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraAdministrativeUnitMember.ps1
@@ -21,9 +21,15 @@ function Add-EntraAdministrativeUnitMember {
             $params["AdministrativeUnitId"] = $PSBoundParameters["AdministrativeUnitId"]
             $Uri = "/v1.0/directory/administrativeUnits/$($params.AdministrativeUnitId)/members/" + '$ref'
         }
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["MemberId"]) {
             $TmpValue = $PSBoundParameters["MemberId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/v1.0/directoryObjects/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
 
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1
index 58e6e1a9fa..75f83547a3 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1
@@ -29,7 +29,7 @@ function Add-EntraCustomSecurityAttributeDefinitionAllowedValue {
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
         
-        $Uri = "https://graph.microsoft.com/v1.0/directory/customSecurityAttributeDefinitions/$CustomSecurityAttributeDefinitionId/allowedValues"
+        $Uri = "/v1.0/directory/customSecurityAttributeDefinitions/$CustomSecurityAttributeDefinitionId/allowedValues"
         $Method = "POST"
         $response = Invoke-GraphRequest -Uri $Uri -Method $Method -Body $body -Headers $customHeaders | ConvertTo-Json | ConvertFrom-Json
         if($response)
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDeviceRegisteredOwner.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDeviceRegisteredOwner.ps1
index ad06fcc131..1e74b794cf 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDeviceRegisteredOwner.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDeviceRegisteredOwner.ps1
@@ -18,6 +18,12 @@ function Add-EntraDeviceRegisteredOwner {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
     
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["OutVariable"]) {
             $params["OutVariable"] = $PSBoundParameters["OutVariable"]
         }
@@ -59,7 +65,7 @@ function Add-EntraDeviceRegisteredOwner {
         }
         if ($null -ne $PSBoundParameters["OwnerId"]) {
             $TmpValue = $PSBoundParameters["OwnerId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/v1.0/directoryObjects/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
 
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDeviceRegisteredUser.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDeviceRegisteredUser.ps1
index 86ef0fb640..e24ff33858 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDeviceRegisteredUser.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDeviceRegisteredUser.ps1
@@ -17,7 +17,13 @@ function Add-EntraDeviceRegisteredUser {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-    
+
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["OutVariable"]) {
             $params["OutVariable"] = $PSBoundParameters["OutVariable"]
         }
@@ -59,7 +65,7 @@ function Add-EntraDeviceRegisteredUser {
         }
         if ($null -ne $PSBoundParameters["UserId"]) {
             $TmpValue = $PSBoundParameters["UserId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/v1.0/directoryObjects/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
 
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDirectoryRoleMember.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDirectoryRoleMember.ps1
index 57491c04ad..a1110b9ddd 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDirectoryRoleMember.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Add-EntraDirectoryRoleMember.ps1
@@ -59,7 +59,7 @@ function Add-EntraDirectoryRoleMember {
         }
         if ($null -ne $PSBoundParameters["MemberId"]) {
             $TmpValue = $PSBoundParameters["MemberId"]
-            $Value = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue"
+            $Value = "/v1.0/directoryObjects/$TmpValue"
             $params["OdataId"] = $Value
         }
 
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraAttributeSet.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraAttributeSet.ps1
index 38714ba526..46dafb23af 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraAttributeSet.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraAttributeSet.ps1
@@ -13,7 +13,7 @@ function Get-EntraAttributeSet {
     PROCESS {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/directory/attributeSets/"
+        $params["Uri"] = "/v1.0/directory/attributeSets/"
         $params["Method"] = "GET"
         if ($null -ne $PSBoundParameters["AttributeSetId"]) {
             $params["Uri"] += $AttributeSetId
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraCustomSecurityAttributeDefinition.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraCustomSecurityAttributeDefinition.ps1
index 8b574497da..5a66b56bc2 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraCustomSecurityAttributeDefinition.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraCustomSecurityAttributeDefinition.ps1
@@ -12,7 +12,7 @@ function Get-EntraCustomSecurityAttributeDefinition {
     PROCESS {    
         $params = @{}
         $Method = "GET"
-        $Uri = "https://graph.microsoft.com/v1.0/directory/customSecurityAttributeDefinitions/"
+        $Uri = "/v1.0/directory/customSecurityAttributeDefinitions/"
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         
         if ($null -ne $PSBoundParameters["Id"]) {
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1
index c4323c75f9..e0fa09293f 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1
@@ -15,7 +15,7 @@ function Get-EntraCustomSecurityAttributeDefinitionAllowedValue {
 
     PROCESS {    
         $params = @{}
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/directory/customSecurityAttributeDefinitions/$CustomSecurityAttributeDefinitionId/allowedValues/"
+        $params["Uri"] = "/v1.0/directory/customSecurityAttributeDefinitions/$CustomSecurityAttributeDefinitionId/allowedValues/"
         $params["Method"] = "GET"
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
 
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDeviceRegisteredOwner.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDeviceRegisteredOwner.ps1
index 92f9d11a03..cf11115e88 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDeviceRegisteredOwner.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDeviceRegisteredOwner.ps1
@@ -24,7 +24,7 @@ function Get-EntraDeviceRegisteredOwner {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/v1.0/devices'
+        $baseUri = '/v1.0/devices'
         $properties = '$select=*'
         $Method = "GET"        
         if ($null -ne $PSBoundParameters["Property"]) {
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDeviceRegisteredUser.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDeviceRegisteredUser.ps1
index 25f945b7a5..e0bf8336b8 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDeviceRegisteredUser.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDeviceRegisteredUser.ps1
@@ -24,7 +24,7 @@ function Get-EntraDeviceRegisteredUser {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/v1.0/devices'
+        $baseUri = '/v1.0/devices'
         $properties = '$select=*'
         $Method = "GET"        
         if ($null -ne $PSBoundParameters["Property"]) {
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryObject.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryObject.ps1
index 62ec156251..af7bc7c4e4 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryObject.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryObject.ps1
@@ -23,12 +23,12 @@ function Get-EntraDirectoryObject {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $body = @{}        
-        $URI = 'https://graph.microsoft.com/v1.0/directoryObjects/microsoft.graph.getByIds?$select=*'
+        $URI = '/v1.0/directoryObjects/microsoft.graph.getByIds?$select=*'
         if ($null -ne $PSBoundParameters["Property"]) {
             $selectProperties = $PSBoundParameters["Property"]
             $selectProperties = $selectProperties -Join ','
             $properties = "`$select=$($selectProperties)"
-            $URI = "https://graph.microsoft.com/v1.0/directoryObjects/microsoft.graph.getByIds?$properties"
+            $URI = "/v1.0/directoryObjects/microsoft.graph.getByIds?$properties"
         }
         if ($null -ne $PSBoundParameters["ObjectTypes"]) {
             $body["Types"] = $PSBoundParameters["ObjectTypes"]
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryObjectOnPremisesProvisioningError.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryObjectOnPremisesProvisioningError.ps1
index 14b8480900..ee648b1a1f 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryObjectOnPremisesProvisioningError.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryObjectOnPremisesProvisioningError.ps1
@@ -27,7 +27,7 @@ function Get-EntraDirectoryObjectOnPremisesProvisioningError {
 
         try {
             foreach ($obj in $Object) {
-                $uri = "https://graph.microsoft.com/v1.0/" + $obj + "?`$filter=onPremisesProvisioningErrors/any(o:o/category ne null)&`$select=Id,UserPrincipalName,DisplayName,Mail,ProxyAddresses,onPremisesProvisioningErrors,onPremisesSyncEnabled&`$top=999"
+                $uri = "/v1.0/" + $obj + "?`$filter=onPremisesProvisioningErrors/any(o:o/category ne null)&`$select=Id,UserPrincipalName,DisplayName,Mail,ProxyAddresses,onPremisesProvisioningErrors,onPremisesSyncEnabled&`$top=999"
                 $response = Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method GET
                 $response.value | ForEach-Object {
                     $_ | Add-Member -MemberType NoteProperty -Name ObjectType -Value $obj -Force
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryRoleMember.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryRoleMember.ps1
index 0f41ae094b..1b1cc13ba3 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryRoleMember.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDirectoryRoleMember.ps1
@@ -15,7 +15,7 @@ function Get-EntraDirectoryRoleMember {
     PROCESS {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand       
-        $baseUri = 'https://graph.microsoft.com/v1.0/directoryRoles'
+        $baseUri = '/v1.0/directoryRoles'
         $properties = '$select=*'
         $Method = "GET"        
         if ($null -ne $PSBoundParameters["Property"]) {
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDomainNameReference.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDomainNameReference.ps1
index 41e275cc81..cd29850e79 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDomainNameReference.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraDomainNameReference.ps1
@@ -16,7 +16,7 @@ function Get-EntraDomainNameReference {
     PROCESS {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand       
-        $baseUri = 'https://graph.microsoft.com/v1.0/domains'
+        $baseUri = '/v1.0/domains'
         $properties = '$select=*'
         $Method = "GET"
         $keysChanged = @{ObjectId = "Id" }
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraPartnerInformation.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraPartnerInformation.ps1
index 29e03a07a9..a4c80b479c 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraPartnerInformation.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraPartnerInformation.ps1
@@ -22,8 +22,9 @@ function Get-EntraPartnerInformation {
         Write-Debug("=========================================================================`n")
         if ([string]::IsNullOrWhiteSpace($TenantId)) {
             $TenantID = (Get-EntraContext).TenantId
+
         }
-        $response = Invoke-MgGraphRequest -Headers $customHeaders -Method GET -Uri "https://graph.microsoft.com/v1.0/organization/$TenantID/partnerInformation"
+        $response = Invoke-MgGraphRequest -Headers $customHeaders -Method GET -Uri "/v1.0/organization/$TenantID/partnerInformation"
         # Create a custom table
         $customTable = [PSCustomObject]@{
             "PartnerCompanyName"       = $response.companyName
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraScopedRoleMembership.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraScopedRoleMembership.ps1
index b01f1052eb..79c32d0c58 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraScopedRoleMembership.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraScopedRoleMembership.ps1
@@ -16,7 +16,7 @@ function Get-EntraScopedRoleMembership {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $isList = $false
-        $baseUri = "https://graph.microsoft.com/v1.0/directory/administrativeUnits"
+        $baseUri = "/v1.0/directory/administrativeUnits"
         if($null -ne $PSBoundParameters["AdministrativeUnitId"])
         {
             $params["AdministrativeUnitId"] = $PSBoundParameters["AdministrativeUnitId"]
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraSubscription.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraSubscription.ps1
index b6d2bb170b..2977794f4e 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraSubscription.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Get-EntraSubscription.ps1
@@ -28,7 +28,7 @@ function Get-EntraSubscription {
         $params = @{}
         $topCount = 0
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = "https://graph.microsoft.com/v1.0/directory/subscriptions"
+        $baseUri = "/v1.0/directory/subscriptions"
         $properties = "`$select=*"
     
         if ($PSBoundParameters.ContainsKey("Property")) {
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/New-EntraAttributeSet.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/New-EntraAttributeSet.ps1
index a43d8dddbd..87a358dc97 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/New-EntraAttributeSet.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/New-EntraAttributeSet.ps1
@@ -20,7 +20,7 @@ function New-EntraAttributeSet {
         $params = @{}
         $body = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/directory/attributeSets"
+        $params["Uri"] = "/v1.0/directory/attributeSets"
         $params["Method"] = "POST"
         
         if ($null -ne $PSBoundParameters["AttributeSetId"]) {
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/New-EntraCustomSecurityAttributeDefinition.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/New-EntraCustomSecurityAttributeDefinition.ps1
index 19eb2e2941..f7d131ea94 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/New-EntraCustomSecurityAttributeDefinition.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/New-EntraCustomSecurityAttributeDefinition.ps1
@@ -27,7 +27,7 @@ function New-EntraCustomSecurityAttributeDefinition {
         $params = @{}
         $body = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $Uri = "https://graph.microsoft.com/v1.0/directory/customSecurityAttributeDefinitions"
+        $Uri = "/v1.0/directory/customSecurityAttributeDefinitions"
         $Method = "POST"
 
         if($null -ne $PSBoundParameters["AttributeSet"])
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Restore-EntraDeletedDirectoryObject.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Restore-EntraDeletedDirectoryObject.ps1
index 10629b0fa6..49d41c89b1 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Restore-EntraDeletedDirectoryObject.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Restore-EntraDeletedDirectoryObject.ps1
@@ -16,7 +16,7 @@ function Restore-EntraDeletedDirectoryObject {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $params["Uri"] = 'https://graph.microsoft.com/v1.0/directory/deletedItems/'   
+        $params["Uri"] = '/v1.0/directory/deletedItems/'   
         $params["Method"] = "POST"    
         if ($null -ne $PSBoundParameters["Id"]) {
             $params["Uri"] += $Id + "/microsoft.graph.restore"      
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraAttributeSet.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraAttributeSet.ps1
index fe98f0e4a7..680934f6c8 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraAttributeSet.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraAttributeSet.ps1
@@ -20,7 +20,7 @@ function Set-EntraAttributeSet {
     $params = @{}
     $body = @{}
     $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-    $params["Uri"] = "https://graph.microsoft.com/v1.0/directory/attributeSets/"
+    $params["Uri"] = "/v1.0/directory/attributeSets/"
     $params["Method"] = "PATCH"    
     if($null -ne $PSBoundParameters["AttributeSetId"])
     {
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraCustomSecurityAttributeDefinition.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraCustomSecurityAttributeDefinition.ps1
index fa35a05c31..33b56ec62f 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraCustomSecurityAttributeDefinition.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraCustomSecurityAttributeDefinition.ps1
@@ -22,7 +22,7 @@ function Set-EntraCustomSecurityAttributeDefinition {
         $params = @{}
         $body = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $Uri = "https://graph.microsoft.com/v1.0/directory/customSecurityAttributeDefinitions/$Id"
+        $Uri = "/v1.0/directory/customSecurityAttributeDefinitions/$Id"
         $Method = "PATCH"
 
         if($null -ne $PSBoundParameters["Id"])
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1
index 754a55b3ca..ceb5893f4f 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraCustomSecurityAttributeDefinitionAllowedValue.ps1
@@ -19,7 +19,7 @@ function Set-EntraCustomSecurityAttributeDefinitionAllowedValue {
     $body = @{}
 
     $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-    $Uri = "https://graph.microsoft.com/v1.0/directory/customSecurityAttributeDefinitions/$CustomSecurityAttributeDefinitionId/allowedValues/$Id"
+    $Uri = "/v1.0/directory/customSecurityAttributeDefinitions/$CustomSecurityAttributeDefinitionId/allowedValues/$Id"
     $Method = "PATCH"
 
     if($null -ne $PSBoundParameters["CustomSecurityAttributeDefinitionId"])
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraDirSyncEnabled.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraDirSyncEnabled.ps1
index 8ff06f2200..160c1e68ff 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraDirSyncEnabled.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraDirSyncEnabled.ps1
@@ -19,14 +19,15 @@ function Set-EntraDirSyncEnabled {
         $params = @{}
         $body = @{}
         $params["Method"] = "PATCH"
-        $URL = "https://graph.microsoft.com/v1.0/organization/" + $TenantId
+        $URL = "/v1.0/organization/" + $TenantId
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         if ($EnableDirsync -or (-not($EnableDirsync))) {
             $body["OnPremisesSyncEnabled"] = $PSBoundParameters["EnableDirsync"]
         }        
         if ([string]::IsNullOrWhiteSpace($TenantId)) {           
+
             $TenantId = (Get-EntraContext).TenantId            
-            $URL = "https://graph.microsoft.com/v1.0/organization/" + $TenantId
+            $URL = "/v1.0/organization/" + $TenantId
         }
         
         $params["Uri"] = $URL
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraPartnerInformation.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraPartnerInformation.ps1
index 3a56049c63..6477dd47ee 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraPartnerInformation.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Set-EntraPartnerInformation.ps1
@@ -65,9 +65,10 @@ function Set-EntraPartnerInformation {
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
         if ([string]::IsNullOrWhiteSpace($TenantId)) {
+
             $TenantID = (Get-EntraContext).TenantId
         }
-        Invoke-MgGraphRequest -Headers $customHeaders -Method PATCH -Uri "https://graph.microsoft.com/v1.0/organization/$TenantID/partnerInformation" -Body $body
+        Invoke-MgGraphRequest -Headers $customHeaders -Method PATCH -Uri "/v1.0/organization/$TenantID/partnerInformation" -Body $body
     }
 }
 
diff --git a/module/Entra/Microsoft.Entra/DirectoryManagement/Update-EntraOauth2PermissionGrant.ps1 b/module/Entra/Microsoft.Entra/DirectoryManagement/Update-EntraOauth2PermissionGrant.ps1
index c9cf7204fd..ae45adcd5d 100644
--- a/module/Entra/Microsoft.Entra/DirectoryManagement/Update-EntraOauth2PermissionGrant.ps1
+++ b/module/Entra/Microsoft.Entra/DirectoryManagement/Update-EntraOauth2PermissionGrant.ps1
@@ -17,7 +17,7 @@ function Update-EntraOauth2PermissionGrant {
         $params = @{}
         $body = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/oauth2PermissionGrants/"
+        $params["Uri"] = "/v1.0/oauth2PermissionGrants/"
         $params["Method"] = "PATCH"
         
         if ($null -ne $PSBoundParameters["OAuth2PermissionGrantId"]) {
diff --git a/module/Entra/Microsoft.Entra/Groups/Get-EntraGroupMember.ps1 b/module/Entra/Microsoft.Entra/Groups/Get-EntraGroupMember.ps1
index 5f65d45cbb..a35db0434f 100644
--- a/module/Entra/Microsoft.Entra/Groups/Get-EntraGroupMember.ps1
+++ b/module/Entra/Microsoft.Entra/Groups/Get-EntraGroupMember.ps1
@@ -35,7 +35,7 @@ function Get-EntraGroupMember {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/v1.0/groups'
+        $baseUri = '/v1.0/groups'
         $properties = '$select=*'
         $Method = "GET"
 
diff --git a/module/Entra/Microsoft.Entra/Groups/Get-EntraGroupOwner.ps1 b/module/Entra/Microsoft.Entra/Groups/Get-EntraGroupOwner.ps1
index e8594b3809..4b4f842a6c 100644
--- a/module/Entra/Microsoft.Entra/Groups/Get-EntraGroupOwner.ps1
+++ b/module/Entra/Microsoft.Entra/Groups/Get-EntraGroupOwner.ps1
@@ -35,7 +35,7 @@ function Get-EntraGroupOwner {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/v1.0/groups'
+        $baseUri = '/v1.0/groups'
         $properties = '$select=*'
         $Method = "GET"        
         if ($null -ne $PSBoundParameters["Property"]) {
diff --git a/module/Entra/Microsoft.Entra/Groups/Get-EntraObjectSetting.ps1 b/module/Entra/Microsoft.Entra/Groups/Get-EntraObjectSetting.ps1
index bebb1c98ae..a1766f94bc 100644
--- a/module/Entra/Microsoft.Entra/Groups/Get-EntraObjectSetting.ps1
+++ b/module/Entra/Microsoft.Entra/Groups/Get-EntraObjectSetting.ps1
@@ -42,7 +42,7 @@ function Get-EntraObjectSetting {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         $topCount = $null
-        $baseUri = "https://graph.microsoft.com/v1.0/$TargetType/$TargetObjectId/settings"
+        $baseUri = "/v1.0/$TargetType/$TargetObjectId/settings"
         $params["Method"] = "GET"
         $params["Uri"] = $baseUri + '?$select=*'
         if ($null -ne $PSBoundParameters["Property"]) {
diff --git a/module/Entra/Microsoft.Entra/Reports/Get-EntraAuditDirectoryLog.ps1 b/module/Entra/Microsoft.Entra/Reports/Get-EntraAuditDirectoryLog.ps1
index 2bbb075acf..2484321a49 100644
--- a/module/Entra/Microsoft.Entra/Reports/Get-EntraAuditDirectoryLog.ps1
+++ b/module/Entra/Microsoft.Entra/Reports/Get-EntraAuditDirectoryLog.ps1
@@ -23,7 +23,7 @@ function Get-EntraAuditDirectoryLog {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/v1.0/auditLogs/directoryAudits'
+        $baseUri = '/v1.0/auditLogs/directoryAudits'
         $params["Method"] = "GET"
         $params["Uri"] = "$baseUri" + "?"
 
diff --git a/module/Entra/Microsoft.Entra/Reports/Get-EntraAuditSignInLog.ps1 b/module/Entra/Microsoft.Entra/Reports/Get-EntraAuditSignInLog.ps1
index cfe22cd076..4e768917c4 100644
--- a/module/Entra/Microsoft.Entra/Reports/Get-EntraAuditSignInLog.ps1
+++ b/module/Entra/Microsoft.Entra/Reports/Get-EntraAuditSignInLog.ps1
@@ -24,7 +24,7 @@ function Get-EntraAuditSignInLog {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/v1.0/auditLogs/signIns'
+        $baseUri = '/v1.0/auditLogs/signIns'
         $params["Method"] = "GET"
         $params["Uri"] = "$baseUri"
         $query = $null
diff --git a/module/Entra/Microsoft.Entra/Reports/Get-EntraAuthenticationMethodUserRegistrationDetailReport.ps1 b/module/Entra/Microsoft.Entra/Reports/Get-EntraAuthenticationMethodUserRegistrationDetailReport.ps1
index 802ab74fd6..3959709020 100644
--- a/module/Entra/Microsoft.Entra/Reports/Get-EntraAuthenticationMethodUserRegistrationDetailReport.ps1
+++ b/module/Entra/Microsoft.Entra/Reports/Get-EntraAuthenticationMethodUserRegistrationDetailReport.ps1
@@ -43,7 +43,7 @@ function Get-EntraAuthenticationMethodUserRegistrationDetailReport {
         $params = @{}
         $topCount = 0
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = "https://graph.microsoft.com/v1.0/reports/authenticationMethods/userRegistrationDetails"
+        $baseUri = "/v1.0/reports/authenticationMethods/userRegistrationDetails"
         $properties = "`$select=*"
     
         if ($PSBoundParameters.ContainsKey("Property")) {
diff --git a/module/Entra/Microsoft.Entra/SignIns/Get-EntraAuthorizationPolicy.ps1 b/module/Entra/Microsoft.Entra/SignIns/Get-EntraAuthorizationPolicy.ps1
index 6de1052e6b..d1f8e2a594 100644
--- a/module/Entra/Microsoft.Entra/SignIns/Get-EntraAuthorizationPolicy.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/Get-EntraAuthorizationPolicy.ps1
@@ -17,7 +17,7 @@ function Get-EntraAuthorizationPolicy {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand        
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/policies/authorizationPolicy?"
+        $params["Uri"] = "/v1.0/policies/authorizationPolicy?"
         $params["Method"] = "GET"
     
         if ($null -ne $PSBoundParameters["Id"]) {
diff --git a/module/Entra/Microsoft.Entra/SignIns/Get-EntraFeatureRolloutPolicy.ps1 b/module/Entra/Microsoft.Entra/SignIns/Get-EntraFeatureRolloutPolicy.ps1
index b7d85e0c98..b3ce3083c0 100644
--- a/module/Entra/Microsoft.Entra/SignIns/Get-EntraFeatureRolloutPolicy.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/Get-EntraFeatureRolloutPolicy.ps1
@@ -23,14 +23,14 @@ function Get-EntraFeatureRolloutPolicy {
     PROCESS {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
-        $baseUri = 'https://graph.microsoft.com/v1.0/policies/featureRolloutPolicies'
+        $baseUri = '/v1.0/policies/featureRolloutPolicies'
         $params["Method"] = "GET"
         $params["Uri"] = "$baseUri"
         $query = $null
         
         if ($null -ne $PSBoundParameters["Id"]) {
             $Id = $PSBoundParameters["Id"]
-            $params["Uri"] = "https://graph.microsoft.com/v1.0/policies/featureRolloutPolicies/$Id"
+            $params["Uri"] = "/v1.0/policies/featureRolloutPolicies/$Id"
         }
         if ($null -ne $PSBoundParameters["SearchString"]) {
             $FilterValue = $PSBoundParameters["SearchString"]
diff --git a/module/Entra/Microsoft.Entra/SignIns/Get-EntraPolicy.ps1 b/module/Entra/Microsoft.Entra/SignIns/Get-EntraPolicy.ps1
index 4d48f24364..3669d97e86 100644
--- a/module/Entra/Microsoft.Entra/SignIns/Get-EntraPolicy.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/Get-EntraPolicy.ps1
@@ -19,7 +19,7 @@ function Get-EntraPolicy {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUrl = "https://graph.microsoft.com/v1.0/policies/"
+        $baseUrl = "/v1.0/policies/"
         $endpoints = @("homeRealmDiscoveryPolicies", "claimsMappingPolicies", "tokenIssuancePolicies", "tokenLifetimePolicies", "activityBasedTimeoutPolicies", "featureRolloutPolicies", "defaultAppManagementPolicy", "appManagementPolicies", "authenticationFlowsPolicy",	"authenticationMethodsPolicy", "permissionGrantPolicies")
         
         if ($PSBoundParameters.ContainsKey("Top") -and ($null -eq $Top -or $Top -eq 0)) {
diff --git a/module/Entra/Microsoft.Entra/SignIns/Get-EntraUserAuthenticationMethod.ps1 b/module/Entra/Microsoft.Entra/SignIns/Get-EntraUserAuthenticationMethod.ps1
index 2b2a8f6668..163b6ee68f 100644
--- a/module/Entra/Microsoft.Entra/SignIns/Get-EntraUserAuthenticationMethod.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/Get-EntraUserAuthenticationMethod.ps1
@@ -37,7 +37,7 @@ function Get-EntraUserAuthenticationMethod {
             $params = @{}
             $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
             $encodedUserId = [System.Web.HttpUtility]::UrlEncode($UserId)
-            $uri = "https://graph.microsoft.com/v1.0/users/$encodedUserId/authentication/methods"
+            $uri = "/v1.0/users/$encodedUserId/authentication/methods"
 
             Write-Debug("============================ REQUEST DETAILS ============================")
             $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
diff --git a/module/Entra/Microsoft.Entra/SignIns/New-EntraFeatureRolloutPolicy.ps1 b/module/Entra/Microsoft.Entra/SignIns/New-EntraFeatureRolloutPolicy.ps1
index 50e472c600..81de9010f4 100644
--- a/module/Entra/Microsoft.Entra/SignIns/New-EntraFeatureRolloutPolicy.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/New-EntraFeatureRolloutPolicy.ps1
@@ -30,7 +30,7 @@ function New-EntraFeatureRolloutPolicy {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         $body = @{}
-        $params["Uri"] = 'https://graph.microsoft.com/v1.0/policies/featureRolloutPolicies/'
+        $params["Uri"] = '/v1.0/policies/featureRolloutPolicies/'
         $params["Method"] = "POST"
     
         if ($null -ne $PSBoundParameters["Description"]) {
diff --git a/module/Entra/Microsoft.Entra/SignIns/New-EntraOauth2PermissionGrant.ps1 b/module/Entra/Microsoft.Entra/SignIns/New-EntraOauth2PermissionGrant.ps1
index 0ce82484ae..c9fed3a204 100644
--- a/module/Entra/Microsoft.Entra/SignIns/New-EntraOauth2PermissionGrant.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/New-EntraOauth2PermissionGrant.ps1
@@ -24,7 +24,7 @@ function New-EntraOauth2PermissionGrant {
     PROCESS {
         $params = @{}
         $body = @{}
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/oauth2PermissionGrants"
+        $params["Uri"] = "/v1.0/oauth2PermissionGrants"
         $params["Method"] = "POST"
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
 
diff --git a/module/Entra/Microsoft.Entra/SignIns/New-EntraPolicy.ps1 b/module/Entra/Microsoft.Entra/SignIns/New-EntraPolicy.ps1
index aea6b00f7d..b21a8e5123 100644
--- a/module/Entra/Microsoft.Entra/SignIns/New-EntraPolicy.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/New-EntraPolicy.ps1
@@ -62,7 +62,7 @@ function New-EntraPolicy {
             $params.type = "permissionGrantPolicies"
             $respType = New-Object -TypeName Microsoft.Graph.PowerShell.Models.MicrosoftGraphPermissionGrantPolicy 
         }
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/policies/" + $params.type
+        $params["Uri"] = "/v1.0/policies/" + $params.type
         $Definition = $PSBoundParameters["Definition"]
         $DisplayName = $PSBoundParameters["DisplayName"]
         $AlternativeIdentifier = $PSBoundParameters["AlternativeIdentifier"]
diff --git a/module/Entra/Microsoft.Entra/SignIns/Remove-EntraFeatureRolloutPolicy.ps1 b/module/Entra/Microsoft.Entra/SignIns/Remove-EntraFeatureRolloutPolicy.ps1
index ba43caf385..15f08f09bd 100644
--- a/module/Entra/Microsoft.Entra/SignIns/Remove-EntraFeatureRolloutPolicy.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/Remove-EntraFeatureRolloutPolicy.ps1
@@ -13,7 +13,7 @@ function Remove-EntraFeatureRolloutPolicy {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/policies/featureRolloutPolicies/$Id"
+        $params["Uri"] = "/v1.0/policies/featureRolloutPolicies/$Id"
         $params["Method"] = "DELETE"
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/Entra/Microsoft.Entra/SignIns/Remove-EntraFeatureRolloutPolicyDirectoryObject.ps1 b/module/Entra/Microsoft.Entra/SignIns/Remove-EntraFeatureRolloutPolicyDirectoryObject.ps1
index 34fdd17f3d..5c486c1972 100644
--- a/module/Entra/Microsoft.Entra/SignIns/Remove-EntraFeatureRolloutPolicyDirectoryObject.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/Remove-EntraFeatureRolloutPolicyDirectoryObject.ps1
@@ -18,7 +18,7 @@ function Remove-EntraFeatureRolloutPolicyDirectoryObject {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
-        $params["Uri"] = 'https://graph.microsoft.com/v1.0/policies/featureRolloutPolicies/{0}/appliesTo/{1}/$ref' -f $FeatureRolloutPolicyId, $DirectoryObjectId
+        $params["Uri"] = '/v1.0/policies/featureRolloutPolicies/{0}/appliesTo/{1}/$ref' -f $FeatureRolloutPolicyId, $DirectoryObjectId
         $params["Method"] = "DELETE"
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/Entra/Microsoft.Entra/SignIns/Remove-EntraPolicy.ps1 b/module/Entra/Microsoft.Entra/SignIns/Remove-EntraPolicy.ps1
index 40cc562640..46fd65aabd 100644
--- a/module/Entra/Microsoft.Entra/SignIns/Remove-EntraPolicy.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/Remove-EntraPolicy.ps1
@@ -16,7 +16,7 @@ function Remove-EntraPolicy {
         $policyTypes = "activityBasedTimeoutPolicies", "DefaultAppManagementPolicy", "appManagementPolicies", "authenticationFlowsPolicy", "authenticationMethodsPolicy", "claimsMappingPolicies", "featureRolloutPolicies", "homeRealmDiscoveryPolicies", "permissionGrantPolicies", "tokenIssuancePolicies", "tokenLifetimePolicies"
     
         foreach ($policyType in $policyTypes) {
-            $uri = "https://graph.microsoft.com/v1.0/policies/" + $policyType + "/" + $id
+            $uri = "/v1.0/policies/" + $policyType + "/" + $id
             try {
                 $response = Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method GET
                 break
@@ -32,7 +32,7 @@ function Remove-EntraPolicy {
         Write-Debug($Matches[1])
 
         if (($null -ne $PSBoundParameters["id"]) -and ($null -ne $policyType )) {
-            $URI = "https://graph.microsoft.com/v1.0/policies/" + $policyType + "/" + $id
+            $URI = "/v1.0/policies/" + $policyType + "/" + $id
         }
         $Method = "DELETE"
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/Entra/Microsoft.Entra/SignIns/Set-EntraFeatureRolloutPolicy.ps1 b/module/Entra/Microsoft.Entra/SignIns/Set-EntraFeatureRolloutPolicy.ps1
index e8d16df8b7..9cea7967e8 100644
--- a/module/Entra/Microsoft.Entra/SignIns/Set-EntraFeatureRolloutPolicy.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/Set-EntraFeatureRolloutPolicy.ps1
@@ -32,7 +32,7 @@ function Set-EntraFeatureRolloutPolicy {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         $body = @{}
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/policies/featureRolloutPolicies/$Id"
+        $params["Uri"] = "/v1.0/policies/featureRolloutPolicies/$Id"
         $params["Method"] = "PATCH"
     
         if ($null -ne $PSBoundParameters["Description"]) {
diff --git a/module/Entra/Microsoft.Entra/SignIns/Set-EntraPolicy.ps1 b/module/Entra/Microsoft.Entra/SignIns/Set-EntraPolicy.ps1
index eedf13344e..17d87056b3 100644
--- a/module/Entra/Microsoft.Entra/SignIns/Set-EntraPolicy.ps1
+++ b/module/Entra/Microsoft.Entra/SignIns/Set-EntraPolicy.ps1
@@ -62,7 +62,7 @@ function Set-EntraPolicy {
         
         if (!$type) {
             foreach ($pType in $policyTypes) {
-                $uri = "https://graph.microsoft.com/v1.0/policies/" + $pType + "/" + $id
+                $uri = "/v1.0/policies/" + $pType + "/" + $id
                 try {
                     $response = Invoke-GraphRequest -Uri $uri -Method GET
                     break
@@ -92,7 +92,7 @@ function Set-EntraPolicy {
                 $params["IsOrganizationDefault"] = $PSBoundParameters["IsOrganizationDefault"]
             }
             if (($null -ne $PSBoundParameters["id"]) -and ($null -ne $type )) {
-                $URI = "https://graph.microsoft.com/v1.0/policies/" + $type + "/" + $id
+                $URI = "/v1.0/policies/" + $type + "/" + $id
             }
             
             $Method = "PATCH"
diff --git a/module/Entra/Microsoft.Entra/Users/Get-EntraUserDirectReport.ps1 b/module/Entra/Microsoft.Entra/Users/Get-EntraUserDirectReport.ps1
index a1a6c39ee0..c2ab20f0b6 100644
--- a/module/Entra/Microsoft.Entra/Users/Get-EntraUserDirectReport.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Get-EntraUserDirectReport.ps1
@@ -32,7 +32,7 @@ function Get-EntraUserDirectReport {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/v1.0/users'
+        $baseUri = '/v1.0/users'
         $properties = '$select=*'
         $Method = "GET"        
         if ($null -ne $PSBoundParameters["Property"]) {
diff --git a/module/Entra/Microsoft.Entra/Users/Get-EntraUserExtension.ps1 b/module/Entra/Microsoft.Entra/Users/Get-EntraUserExtension.ps1
index 89ac1556b0..d26b1b2ace 100644
--- a/module/Entra/Microsoft.Entra/Users/Get-EntraUserExtension.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Get-EntraUserExtension.ps1
@@ -24,7 +24,7 @@ function Get-EntraUserExtension {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = "https://graph.microsoft.com/v1.0/users/$UserId"
+        $baseUri = "/v1.0/users/$UserId"
         $properties = '$select=Identities,OnPremisesDistinguishedName,EmployeeId,CreatedDateTime'        
         $params["Uri"] = "$baseUri/?$properties"
                 
diff --git a/module/Entra/Microsoft.Entra/Users/Get-EntraUserManager.ps1 b/module/Entra/Microsoft.Entra/Users/Get-EntraUserManager.ps1
index 68a4d587b7..eea6f1bff8 100644
--- a/module/Entra/Microsoft.Entra/Users/Get-EntraUserManager.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Get-EntraUserManager.ps1
@@ -29,13 +29,13 @@ function Get-EntraUserManager {
         if ($null -ne $PSBoundParameters["UserId"]) {
             $params["UserId"] = $PSBoundParameters["UserId"]
         }
-        $URI = "https://graph.microsoft.com/v1.0/users/$($params.UserId)/manager?`$select=*"
+        $URI = "/v1.0/users/$($params.UserId)/manager?`$select=*"
 
         if ($null -ne $PSBoundParameters["Property"]) {
             $selectProperties = $PSBoundParameters["Property"]
             $selectProperties = $selectProperties -Join ','
             $properties = "`$select=$($selectProperties)"
-            $URI = "https://graph.microsoft.com/v1.0/users/$($params.UserId)/manager?$properties"
+            $URI = "/v1.0/users/$($params.UserId)/manager?$properties"
         }
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
diff --git a/module/Entra/Microsoft.Entra/Users/Get-EntraUserSponsor.ps1 b/module/Entra/Microsoft.Entra/Users/Get-EntraUserSponsor.ps1
index b40d5f6fae..dd8032147f 100644
--- a/module/Entra/Microsoft.Entra/Users/Get-EntraUserSponsor.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Get-EntraUserSponsor.ps1
@@ -41,7 +41,7 @@ function Get-EntraUserSponsor {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         $topCount = $null
-        $baseUri = "https://graph.microsoft.com/v1.0/users/$UserId/sponsors"
+        $baseUri = "/v1.0/users/$UserId/sponsors"
         $properties = '$select=*'
         $params["Method"] = "GET"
         $params["Uri"] = "$baseUri/?$properties"        
diff --git a/module/Entra/Microsoft.Entra/Users/New-EntraUser.ps1 b/module/Entra/Microsoft.Entra/Users/New-EntraUser.ps1
index 6720192214..f97e50d87c 100644
--- a/module/Entra/Microsoft.Entra/Users/New-EntraUser.ps1
+++ b/module/Entra/Microsoft.Entra/Users/New-EntraUser.ps1
@@ -225,7 +225,7 @@ function New-EntraUser {
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
         $params = $params | ConvertTo-Json
-        $response = Invoke-GraphRequest -Headers $customHeaders -Uri 'https://graph.microsoft.com/v1.0/users?$select=*' -Method POST -Body $params
+        $response = Invoke-GraphRequest -Headers $customHeaders -Uri '/v1.0/users?$select=*' -Method POST -Body $params
         $response = $response | ConvertTo-Json | ConvertFrom-Json
         $response | ForEach-Object {
             if ($null -ne $_) {
diff --git a/module/Entra/Microsoft.Entra/Users/Remove-EntraUserSponsor.ps1 b/module/Entra/Microsoft.Entra/Users/Remove-EntraUserSponsor.ps1
index 9af4b983ab..68e46aac9b 100644
--- a/module/Entra/Microsoft.Entra/Users/Remove-EntraUserSponsor.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Remove-EntraUserSponsor.ps1
@@ -17,7 +17,7 @@ function Remove-EntraUserSponsor {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/users/$UserId/sponsors/$SponsorId/`$ref"
+        $params["Uri"] = "/v1.0/users/$UserId/sponsors/$SponsorId/`$ref"
         $params["Method"] = "DELETE"
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/Entra/Microsoft.Entra/Users/Set-EntraUser.ps1 b/module/Entra/Microsoft.Entra/Users/Set-EntraUser.ps1
index dce849eb71..ceb733a3f1 100644
--- a/module/Entra/Microsoft.Entra/Users/Set-EntraUser.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Set-EntraUser.ps1
@@ -153,7 +153,7 @@ function Set-EntraUser {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
 
         # Microsoft Graph API URL for updating users
-        $graphUri = "https://graph.microsoft.com/v1.0/users/$UserId"
+        $graphUri = "/v1.0/users/$UserId"
 
         # Initialize hashtable for user properties
         $UserProperties = @{}
diff --git a/module/Entra/Microsoft.Entra/Users/Set-EntraUserExtension.ps1 b/module/Entra/Microsoft.Entra/Users/Set-EntraUserExtension.ps1
index 521b6eb74b..97482ff7e0 100644
--- a/module/Entra/Microsoft.Entra/Users/Set-EntraUserExtension.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Set-EntraUserExtension.ps1
@@ -85,7 +85,7 @@ function Set-EntraUserExtension {
             $params["Verbose"] = $PSBoundParameters["Verbose"]
         }
 
-        $uri = "https://graph.microsoft.com/v1.0/users/$UserId"
+        $uri = "/v1.0/users/$UserId"
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
diff --git a/module/Entra/Microsoft.Entra/Users/Set-EntraUserLicense.ps1 b/module/Entra/Microsoft.Entra/Users/Set-EntraUserLicense.ps1
index 995cbbf06a..6d7ab7090b 100644
--- a/module/Entra/Microsoft.Entra/Users/Set-EntraUserLicense.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Set-EntraUserLicense.ps1
@@ -36,7 +36,7 @@ function Set-EntraUserLicense {
         
         $customHeaders['Content-Type'] = 'application/json'
 
-        $graphApiEndpoint = "https://graph.microsoft.com/v1.0/users/$UserId/microsoft.graph.assignLicense"
+        $graphApiEndpoint = "/v1.0/users/$UserId/microsoft.graph.assignLicense"
         
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
diff --git a/module/Entra/Microsoft.Entra/Users/Set-EntraUserManager.ps1 b/module/Entra/Microsoft.Entra/Users/Set-EntraUserManager.ps1
index dd22392b87..97a33982de 100644
--- a/module/Entra/Microsoft.Entra/Users/Set-EntraUserManager.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Set-EntraUserManager.ps1
@@ -18,6 +18,12 @@ function Set-EntraUserManager {
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
     
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["OutVariable"]) {
             $params["OutVariable"] = $PSBoundParameters["OutVariable"]
         }
@@ -59,7 +65,7 @@ function Set-EntraUserManager {
         }
         if ($null -ne $PSBoundParameters["ManagerId"]) {
             $TmpValue = $PSBoundParameters["ManagerId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/users/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/v1.0/users/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
 
diff --git a/module/Entra/Microsoft.Entra/Users/Set-EntraUserSponsor.ps1 b/module/Entra/Microsoft.Entra/Users/Set-EntraUserSponsor.ps1
index 4742c3ee73..80ed32628d 100644
--- a/module/Entra/Microsoft.Entra/Users/Set-EntraUserSponsor.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Set-EntraUserSponsor.ps1
@@ -35,11 +35,18 @@ function Set-EntraUserSponsor {
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand     
         $customHeaders['Content-Type'] = 'application/json'
 
-        $batchEndpoint = "https://graph.microsoft.com/v1.0/`$batch"
+        $batchEndpoint = "/v1.0/`$batch"
         
         # Initialize request collection
         $requests = @()
         
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
+        
         # Determine target endpoint based on parameter set
         $targetResource = if ($Type -eq "User") { "users" } else { "groups" }
         $targetEndpoint = "users/$UserId/sponsors/`$ref"
@@ -50,7 +57,7 @@ function Set-EntraUserSponsor {
                 method  = "POST"
                 url     = "/$targetEndpoint"
                 body    = @{
-                    "@odata.id" = "https://graph.microsoft.com/v1.0/$targetResource/$sponsorId"
+                    "@odata.id" = "$rootUri/v1.0/$targetResource/$sponsorId"
                 }
                 headers = @{
                     "Content-Type" = "application/json"
diff --git a/module/Entra/Microsoft.Entra/Users/Update-EntraSignedInUserPassword.ps1 b/module/Entra/Microsoft.Entra/Users/Update-EntraSignedInUserPassword.ps1
index 3cc358bc5f..80aeb4ba14 100644
--- a/module/Entra/Microsoft.Entra/Users/Update-EntraSignedInUserPassword.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Update-EntraSignedInUserPassword.ps1
@@ -28,7 +28,7 @@ function Update-EntraSignedInUserPassword {
         $newsecur = [System.Runtime.InteropServices.Marshal]::SecureStringToGlobalAllocUnicode($params.NewPassword)
         $new = [System.Runtime.InteropServices.Marshal]::PtrToStringUni($newsecur)
     
-        $params["Url"] = "https://graph.microsoft.com/v1.0/me/changePassword"
+        $params["Url"] = "/v1.0/me/changePassword"
         $body = @{
             currentPassword = $curr
             newPassword     = $new
diff --git a/module/Entra/Microsoft.Entra/Users/Update-EntraUserFromFederated.ps1 b/module/Entra/Microsoft.Entra/Users/Update-EntraUserFromFederated.ps1
index 26e5a6d57e..e2cf12320f 100644
--- a/module/Entra/Microsoft.Entra/Users/Update-EntraUserFromFederated.ps1
+++ b/module/Entra/Microsoft.Entra/Users/Update-EntraUserFromFederated.ps1
@@ -31,7 +31,7 @@ function Update-EntraUserFromFederated {
         $authenticationMethodId = "28c10230-6103-485e-b985-444c60001490"
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{ "UserId" = $UserPrincipalName }
-        $params["Url"] = "https://graph.microsoft.com/v1.0/users/$($UserPrincipalName)/authentication/methods/$authenticationMethodId/resetPassword"
+        $params["Url"] = "/v1.0/users/$($UserPrincipalName)/authentication/methods/$authenticationMethodId/resetPassword"
 
         # Handle password conversion securely
         $passwordRedacted = $false
diff --git a/module/Entra/UnMappedFiles/Test-EntraScript.ps1 b/module/Entra/UnMappedFiles/Test-EntraScript.ps1
index c222f51c4f..04f48a7b29 100644
--- a/module/Entra/UnMappedFiles/Test-EntraScript.ps1
+++ b/module/Entra/UnMappedFiles/Test-EntraScript.ps1
@@ -147,7 +147,7 @@ function Test-EntraScript {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraCustomHeaders -Command $MyInvocation.MyCommand        
-        $params["Uri"] = "https://graph.microsoft.com/v1.0/policies/authorizationPolicy?"
+        $params["Uri"] = "/v1.0/policies/authorizationPolicy?"
         $params["Method"] = "GET"
     
         if($null -ne $PSBoundParameters["Id"])
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaApplicationOwner.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaApplicationOwner.ps1
index d8246e1e16..a3c8c3e96c 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaApplicationOwner.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaApplicationOwner.ps1
@@ -35,7 +35,7 @@ function Add-EntraBetaApplicationOwner {
         }
         if ($null -ne $PSBoundParameters["OwnerId"]) {
             $TmpValue = $PSBoundParameters["OwnerId"]
-            $Value = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue"
+            $Value = "/beta/directoryObjects/$TmpValue"
             $params["OdataId"] = $Value
         }
         if ($null -ne $PSBoundParameters["ApplicationId"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaApplicationPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaApplicationPolicy.ps1
index bebaaca1da..5c2733955d 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaApplicationPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaApplicationPolicy.ps1
@@ -17,15 +17,21 @@ function Add-EntraBetaApplicationPolicy {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["ID"]) {
             $id = $PSBoundParameters["ID"]
         }
         if ($null -ne $PSBoundParameters["RefObjectId"]) {
             $RefObjectId = $PSBoundParameters["RefObjectId"]
         }
-        $uri = "https://graph.microsoft.com/beta/applications/$id/Policies/" + '$ref'
+        $uri = "/beta/applications/$id/Policies/" + '$ref'
         $body = @{
-            "@odata.id" = "https://graph.microsoft.com/beta/legacy/policies/$RefObjectId"
+            "@odata.id" = "$rootUri/beta/legacy/policies/$RefObjectId"
         }
         $body = $body | ConvertTo-Json
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaServicePrincipalOwner.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaServicePrincipalOwner.ps1
index 72d81e3a47..cbc44f6327 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaServicePrincipalOwner.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Add-EntraBetaServicePrincipalOwner.ps1
@@ -18,6 +18,12 @@ function Add-EntraBetaServicePrincipalOwner {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
     
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["ProgressAction"]) {
             $params["ProgressAction"] = $PSBoundParameters["ProgressAction"]
         }
@@ -35,7 +41,7 @@ function Add-EntraBetaServicePrincipalOwner {
         }
         if ($null -ne $PSBoundParameters["OwnerId"]) {
             $TmpValue = $PSBoundParameters["OwnerId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/beta/directoryObjects/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
         if ($null -ne $PSBoundParameters["ServicePrincipalId"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationLogo.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationLogo.ps1
index d699b4d004..60733a458c 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationLogo.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationLogo.ps1
@@ -18,7 +18,7 @@ function Get-EntraBetaApplicationLogo {
     PROCESS {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = 'https://graph.microsoft.com/beta/applications'
+        $baseUri = '/beta/applications'
         $Method = "GET"
         if($null -ne $PSBoundParameters["ApplicationId"])
         {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationPasswordCredential.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationPasswordCredential.ps1
index 0a830738fe..36a07b7f37 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationPasswordCredential.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationPasswordCredential.ps1
@@ -17,7 +17,7 @@ function Get-EntraBetaApplicationPasswordCredential {
     PROCESS {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
-        $baseUri = "https://graph.microsoft.com/beta/applications/$ApplicationId/passwordCredentials"
+        $baseUri = "/beta/applications/$ApplicationId/passwordCredentials"
         $params["Method"] = "GET"
         $params["Uri"] = "$baseUri"
 
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationPolicy.ps1
index 97aa3a67fe..ef96b25882 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationPolicy.ps1
@@ -20,7 +20,7 @@ function Get-EntraBetaApplicationPolicy {
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object {"$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
-        $URI = 'https://graph.microsoft.com/beta/applications/{0}/policies' -f $Id
+        $URI = '/beta/applications/{0}/policies' -f $Id
         $response = (Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method $Method | ConvertTo-Json -Depth 10 | ConvertFrom-Json).value
         $response | Add-Member -MemberType AliasProperty -Value '@odata.type' -Name 'odata.type'
                 
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnector.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnector.ps1
index 34f1bda309..fe0fc24770 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnector.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnector.ps1
@@ -23,24 +23,24 @@ function Get-EntraBetaApplicationProxyConnector {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params["Method"] = "GET"
-        $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectors"
+        $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectors"
         if ($null -ne $PSBoundParameters["SearchString"]) {
             $f = '$' + 'Filter'
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectors?$f=machineName eq '$SearchString' OR startswith(machineName,'$SearchString')"    
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectors?$f=machineName eq '$SearchString' OR startswith(machineName,'$SearchString')"    
         }
         if ($null -ne $PSBoundParameters["OnPremisesPublishingProfileId"]) {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectors/$OnPremisesPublishingProfileId"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectors/$OnPremisesPublishingProfileId"
         }
         if ($null -ne $PSBoundParameters["Filter"]) {
             $f = '$' + 'Filter'
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectors?$f=$filter"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectors?$f=$filter"
         }        
         if ($null -ne $PSBoundParameters["All"]) {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectors"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectors"
         }        
         if ($PSBoundParameters.ContainsKey("Top")) {
             $t = '$' + 'Top'
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectors?$t=$top"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectors?$t=$top"
         }        
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorGroup.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorGroup.ps1
index ae81bb275a..01c72ffb6c 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorGroup.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorGroup.ps1
@@ -22,24 +22,24 @@ function Get-EntraBetaApplicationProxyConnectorGroup {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params["Method"] = "GET"
-        $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups"
+        $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups"
         if ($null -ne $PSBoundParameters["SearchString"]) {
             $f = '$' + 'Filter'
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups?$f=name eq '$SearchString' OR startswith(name,'$SearchString')"    
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups?$f=name eq '$SearchString' OR startswith(name,'$SearchString')"    
         }
         if ($null -ne $PSBoundParameters["Id"]) {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id"
         }
         if ($null -ne $PSBoundParameters["Filter"]) {
             $f = '$' + 'Filter'
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups?$f=$filter"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups?$f=$filter"
         }        
         if ($null -ne $PSBoundParameters["All"]) {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups"
         }        
         if ($PSBoundParameters.ContainsKey("Top")) {
             $t = '$' + 'Top'
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups?$t=$top"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups?$t=$top"
         }
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorGroupMembers.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorGroupMembers.ps1
index 1f930eb4d3..0a0d4410cc 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorGroupMembers.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorGroupMembers.ps1
@@ -22,20 +22,20 @@ function Get-EntraBetaApplicationProxyConnectorGroupMembers {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params["Method"] = "GET"
         $Id = $PSBoundParameters["OnPremisesPublishingProfileId"]
-        $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members"
+        $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members"
         if ($PSBoundParameters.ContainsKey("OnPremisesPublishingProfileId")) {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members"
         }
         if ($PSBoundParameters.ContainsKey("Filter")) {
             $f = '$' + 'Filter'
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members?$f=$filter"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members?$f=$filter"
         }        
         if ($PSBoundParameters.ContainsKey("All")) {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members"
         }        
         if ($PSBoundParameters.ContainsKey("top")) {
             $t = '$' + 'Top'
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members?$t=$top"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id/members?$t=$top"
         }
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorMemberOf.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorMemberOf.ps1
index 98cc853223..1e55f26c45 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorMemberOf.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationProxyConnectorMemberOf.ps1
@@ -15,10 +15,10 @@ function Get-EntraBetaApplicationProxyConnectorMemberOf {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params["Method"] = "GET"
         $Id = $PSBoundParameters["OnPremisesPublishingProfileId"]
-        $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectors/$Id/memberOf"
+        $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectors/$Id/memberOf"
         if($PSBoundParameters.ContainsKey("OnPremisesPublishingProfileId"))
         {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectors/$Id/memberOf"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectors/$Id/memberOf"
         }
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object {"$_ : $($params[$_])" } | Write-Debug
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationTemplate.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationTemplate.ps1
index a9f2849545..4dc4e01ad0 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationTemplate.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Get-EntraBetaApplicationTemplate.ps1
@@ -27,7 +27,7 @@ function Get-EntraBetaApplicationTemplate {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $uri = "https://graph.microsoft.com/beta/applicationTemplates"
+        $uri = "/beta/applicationTemplates"
         $params["Method"] = "GET"
         $params["Uri"] = $uri + '?$select=*'
         
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationFromApplicationTemplate.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationFromApplicationTemplate.ps1
index d6a9fb05c5..8d80ed6eda 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationFromApplicationTemplate.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationFromApplicationTemplate.ps1
@@ -31,7 +31,7 @@ function New-EntraBetaApplicationFromApplicationTemplate {
             displayName = $DisplayName
         }
 
-        $uri = "https://graph.microsoft.com/beta/applicationTemplates/$ApplicationTemplateId/instantiate"
+        $uri = "/beta/applicationTemplates/$ApplicationTemplateId/instantiate"
         $response = Invoke-GraphRequest -uri $uri -Headers $customHeaders -Body $body -Method POST | ConvertTo-Json -Depth 5 | ConvertFrom-Json
         $memberList = @()
         foreach ($data in $response) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationProxyApplication.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationProxyApplication.ps1
index fcf769bded..5f9866a71e 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationProxyApplication.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationProxyApplication.ps1
@@ -34,6 +34,13 @@ function New-EntraBetaApplicationProxyApplication {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $onPremisesPublishing = @{}
+
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if($null -ne $PSBoundParameters["DisplayName"])
         {
             $DisplayName = $PSBoundParameters["DisplayName"]
@@ -81,7 +88,7 @@ function New-EntraBetaApplicationProxyApplication {
             displayName =  $DisplayName
         } | ConvertTo-Json
         try {
-            $NewApp = Invoke-GraphRequest -Uri 'https://graph.microsoft.com/v1.0/applications' -Method POST -Body $newAppBody
+            $NewApp = Invoke-GraphRequest -Uri '/beta/applications' -Method POST -Body $newAppBody
             $Id = $NewApp.Id
         } catch {
             Write-Error $_
@@ -104,7 +111,7 @@ function New-EntraBetaApplicationProxyApplication {
                 } 
             } 
             try {
-                Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/applications/$Id" -Method PATCH -Body $updateUrlBody    
+                Invoke-GraphRequest -Uri "/beta/applications/$Id" -Method PATCH -Body $updateUrlBody    
             } catch {
                 Write-Error $_
                 return
@@ -117,7 +124,7 @@ function New-EntraBetaApplicationProxyApplication {
                 appId = $NewApp.AppId
             } | ConvertTo-Json
             try {
-                $ServicePrincipal = Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/servicePrincipals" -Method POST -Body $serviceBody    
+                $ServicePrincipal = Invoke-GraphRequest -Uri "/beta/servicePrincipals" -Method POST -Body $serviceBody    
             } catch {
                 Write-Error $_
                 return
@@ -128,7 +135,7 @@ function New-EntraBetaApplicationProxyApplication {
         if($null -ne $ServicePrincipal -and $null -ne $NewApp){
             $onPremisesPublishingBody = @{onPremisesPublishing = $onPremisesPublishing}
             try {
-                Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/applications/$Id" -Method PATCH -Body $onPremisesPublishingBody
+                Invoke-GraphRequest -Uri "/beta/applications/$Id" -Method PATCH -Body $onPremisesPublishingBody
             } catch {
                 Write-Error $_
                 return
@@ -139,10 +146,10 @@ function New-EntraBetaApplicationProxyApplication {
         if($null -ne $PSBoundParameters["ConnectorGroupId"] -and $null -ne $NewApp){
             $ConnectorGroupId = $PSBoundParameters["ConnectorGroupId"]
             $ConnectorGroupBody = @{
-                "@odata.id" = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationproxy/connectorGroups/$ConnectorGroupId"
+                "@odata.id" = "$rootUri/beta/onPremisesPublishingProfiles/applicationproxy/connectorGroups/$ConnectorGroupId"
             } 
             $ConnectorGroupBody = $ConnectorGroupBody | ConvertTo-Json
-            $ConnectorGroupUri = "https://graph.microsoft.com/beta/applications/$Id/connectorGroup/" + '$ref'
+            $ConnectorGroupUri = "/beta/applications/$Id/connectorGroup/" + '$ref'
             try {
                 Invoke-GraphRequest -Method PUT -Uri $ConnectorGroupUri -Body $ConnectorGroupBody -ContentType "application/json" 
             } catch {
@@ -153,7 +160,7 @@ function New-EntraBetaApplicationProxyApplication {
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object {"$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
-        $response = (Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/applications/$Id/onPremisesPublishing" -Headers $customHeaders -Method GET) | ConvertTo-Json -depth 10 | ConvertFrom-Json
+        $response = (Invoke-GraphRequest -Uri "/beta/applications/$Id/onPremisesPublishing" -Headers $customHeaders -Method GET) | ConvertTo-Json -depth 10 | ConvertFrom-Json
         $response | ForEach-Object {
             if($null -ne $_) {
                 Add-Member -InputObject $_ -MemberType NoteProperty -Name ObjectId -Value $Id
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationProxyConnectorGroup.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationProxyConnectorGroup.ps1
index 5b87655c6f..c56bfcbeb1 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationProxyConnectorGroup.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaApplicationProxyConnectorGroup.ps1
@@ -14,7 +14,7 @@ function New-EntraBetaApplicationProxyConnectorGroup {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params["Method"] = "POST"
         $body = @{}
-        $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups"
+        $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups"
     
         if($null -ne $PSBoundParameters["Name"])
         {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaServicePrincipalPasswordCredential.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaServicePrincipalPasswordCredential.ps1
index 5b8473524b..7a6db59db5 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaServicePrincipalPasswordCredential.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/New-EntraBetaServicePrincipalPasswordCredential.ps1
@@ -24,7 +24,7 @@ function New-EntraBetaServicePrincipalPasswordCredential {
             DisplayName        = $DisplayName
         }
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = 'https://graph.microsoft.com/beta/servicePrincipals'
+        $baseUri = '/beta/servicePrincipals'
         $URI = "$baseUri/$ServicePrincipalId/addPassword"
         $body = @{
             passwordCredential = @{
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationPolicy.ps1
index e0527fb37b..5ee980489e 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationPolicy.ps1
@@ -26,7 +26,7 @@ function Remove-EntraBetaApplicationPolicy {
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object {"$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
-        $URI = 'https://graph.microsoft.com/beta/applications/{0}/policies/{1}/$ref' -f $Id,$PolicyId
+        $URI = '/beta/applications/{0}/policies/{1}/$ref' -f $Id,$PolicyId
         $response = Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method $Method
         $response
     }     
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyApplication.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyApplication.ps1
index 2f4fae17e1..ede9a3f927 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyApplication.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyApplication.ps1
@@ -27,8 +27,8 @@ function Remove-EntraBetaApplicationProxyApplication {
                     externalUrl = "PowerShellDeleteApplication" 
                 } 
             } | ConvertTo-Json
-            Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/applications/$ApplicationId" -Method PATCH -Body $body
-            Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/applications/$ApplicationId" -Method DELETE -Headers $customHeaders
+            Invoke-GraphRequest -Uri "/beta/applications/$ApplicationId" -Method PATCH -Body $body
+            Invoke-GraphRequest -Uri "/beta/applications/$ApplicationId" -Method DELETE -Headers $customHeaders
         }
         if ($null -eq $PSBoundParameters["RemoveADApplication"] -or ($null -ne $PSBoundParameters["RemoveADApplication"] -and $false -eq $PSBoundParameters["RemoveADApplication"])) {
             $body = @{ 
@@ -37,7 +37,7 @@ function Remove-EntraBetaApplicationProxyApplication {
                     externalUrl = "PowerShellDeleteApplication" 
                 } 
             } | ConvertTo-Json
-            Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/applications/$ApplicationId" -Method PATCH -Headers $customHeaders -Body $body
+            Invoke-GraphRequest -Uri "/beta/applications/$ApplicationId" -Method PATCH -Headers $customHeaders -Body $body
         }
         
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyApplicationConnectorGroup.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyApplicationConnectorGroup.ps1
index f3ef9c7083..b33e069c81 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyApplicationConnectorGroup.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyApplicationConnectorGroup.ps1
@@ -16,7 +16,7 @@ function Remove-EntraBetaApplicationProxyApplicationConnectorGroup {
         $params["Method"] = "DELETE"
         if($null -ne $PSBoundParameters["OnPremisesPublishingProfileId"])
         {
-            $params["Uri"] = "https://graph.microsoft.com/beta/applications/$OnPremisesPublishingProfileId/connectorGroup/"+'$ref'
+            $params["Uri"] = "/beta/applications/$OnPremisesPublishingProfileId/connectorGroup/"+'$ref'
         }
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyConnectorGroup.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyConnectorGroup.ps1
index 27b95eddec..1a849e150a 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyConnectorGroup.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaApplicationProxyConnectorGroup.ps1
@@ -15,7 +15,7 @@ function Remove-EntraBetaApplicationProxyConnectorGroup {
         $params["Method"] = "DELETE"
         if($null -ne $PSBoundParameters["Id"])
         {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id"
         }
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaDeletedDirectoryObject.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaDeletedDirectoryObject.ps1
index d8e3e632d2..1f6aabc1fb 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaDeletedDirectoryObject.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaDeletedDirectoryObject.ps1
@@ -13,7 +13,7 @@ function Remove-EntraBetaDeletedDirectoryObject {
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object {"$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
-        $URI = "https://graph.microsoft.com/v1.0/directory/deletedItems/$Id"
+        $URI = "/beta/directory/deletedItems/$Id"
         $response = Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method $Method
         $response
     }    
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaServicePrincipalPasswordCredential.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaServicePrincipalPasswordCredential.ps1
index 85771037a5..5ef2d16808 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaServicePrincipalPasswordCredential.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Remove-EntraBetaServicePrincipalPasswordCredential.ps1
@@ -15,7 +15,7 @@ function Remove-EntraBetaServicePrincipalPasswordCredential {
     PROCESS{
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = 'https://graph.microsoft.com/beta/servicePrincipals'
+        $baseUri = '/beta/servicePrincipals'
         $Method = "POST"
         if($null -ne $PSBoundParameters["ServicePrincipalId"] -and $null -ne $PSBoundParameters["KeyId"])
         {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationLogo.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationLogo.ps1
index c26144b8e9..8e8b77919c 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationLogo.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationLogo.ps1
@@ -22,7 +22,7 @@ function Set-EntraBetaApplicationLogo {
         try{
             $params = @{}
             $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand        
-            $baseUri = 'https://graph.microsoft.com/beta/applications'
+            $baseUri = '/beta/applications'
             $Method = "PUT"
             
             if($null -ne $PSBoundParameters["ApplicationId"])
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplication.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplication.ps1
index 97b46368d0..c2f91ee2c4 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplication.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplication.ps1
@@ -46,6 +46,13 @@ function Set-EntraBetaApplicationProxyApplication {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $onPremisesPublishing = @{}
+
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["ApplicationId"]) {
             $ApplicationId = $PSBoundParameters["ApplicationId"]
         }
@@ -94,7 +101,7 @@ function Set-EntraBetaApplicationProxyApplication {
             }
         }
         try {
-            Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/applications/$ApplicationId" -Method PATCH -Body $updateUrlBody
+            Invoke-GraphRequest -Uri "/beta/applications/$ApplicationId" -Method PATCH -Body $updateUrlBody
         }
         catch {
             Write-Error $_
@@ -104,7 +111,7 @@ function Set-EntraBetaApplicationProxyApplication {
         # update onpremises
         $onPremisesPublishingBody = @{onPremisesPublishing = $onPremisesPublishing }
         try {
-            Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/applications/$ApplicationId" -Method PATCH -Body $onPremisesPublishingBody
+            Invoke-GraphRequest -Uri "/beta/applications/$ApplicationId" -Method PATCH -Body $onPremisesPublishingBody
         }
         catch {
             Write-Error $_
@@ -115,10 +122,10 @@ function Set-EntraBetaApplicationProxyApplication {
         if ($null -ne $PSBoundParameters["ConnectorGroupId"]) {
             $ConnectorGroupId = $PSBoundParameters["ConnectorGroupId"]
             $ConnectorGroupBody = @{
-                "@odata.id" = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationproxy/connectorGroups/$ConnectorGroupId"
+                "@odata.id" = "$rootUri/beta/onPremisesPublishingProfiles/applicationproxy/connectorGroups/$ConnectorGroupId"
             }
             $ConnectorGroupBody = $ConnectorGroupBody | ConvertTo-Json
-            $ConnectorGroupUri = "https://graph.microsoft.com/beta/applications/$ApplicationId/connectorGroup/" + '$ref'
+            $ConnectorGroupUri = "/beta/applications/$ApplicationId/connectorGroup/" + '$ref'
             try {
                 Invoke-GraphRequest -Method PUT -Uri $ConnectorGroupUri -Body $ConnectorGroupBody -ContentType "application/json"
             }
@@ -132,7 +139,7 @@ function Set-EntraBetaApplicationProxyApplication {
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
 
-        $response = (Invoke-GraphRequest -Uri "https://graph.microsoft.com/beta/applications/$ApplicationId/onPremisesPublishing" -Method GET -Headers $customHeaders) | ConvertTo-Json -depth 10 | ConvertFrom-Json
+        $response = (Invoke-GraphRequest -Uri "/beta/applications/$ApplicationId/onPremisesPublishing" -Method GET -Headers $customHeaders) | ConvertTo-Json -depth 10 | ConvertFrom-Json
         $response | ForEach-Object {
             if ($null -ne $_) {
                 Add-Member -InputObject $_ -MemberType NoteProperty -Name ObjectId -Value $ApplicationId
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplicationConnectorGroup.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplicationConnectorGroup.ps1
index 3d4781c46d..45789b75be 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplicationConnectorGroup.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplicationConnectorGroup.ps1
@@ -16,16 +16,23 @@ function Set-EntraBetaApplicationProxyApplicationConnectorGroup {
     PROCESS {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
+
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         $params["Method"] = "PUT"
         $body = @{}
         if($null -ne $PSBoundParameters["OnPremisesPublishingProfileId"])
         {
-            $params["Uri"] = "https://graph.microsoft.com/beta/applications/$OnPremisesPublishingProfileId/connectorGroup/" + '$ref'
+            $params["Uri"] = "/beta/applications/$OnPremisesPublishingProfileId/connectorGroup/" + '$ref'
         }
         if($null -ne $PSBoundParameters["ConnectorGroupId"])
         {
             $body = @{
-                "@odata.id" = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationproxy/connectorGroups/$ConnectorGroupId"
+                "@odata.id" = "$rootUri/beta/onPremisesPublishingProfiles/applicationproxy/connectorGroups/$ConnectorGroupId"
             }
             $body = $body | ConvertTo-Json
         }
@@ -48,7 +55,7 @@ function Set-EntraBetaApplicationProxyApplicationConnectorGroup {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $params["Uri"] = 'https://graph.microsoft.com/beta/directory/deletedItems/'   
+        $params["Uri"] = '/beta/directory/deletedItems/'   
         $params["Method"] = "POST"    
         if($null -ne $PSBoundParameters["Id"])
         {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplicationSingleSignOn.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplicationSingleSignOn.ps1
index 0c7c9a07c6..9d1cff04ea 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplicationSingleSignOn.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyApplicationSingleSignOn.ps1
@@ -25,7 +25,7 @@ function Set-EntraBetaApplicationProxyApplicationSingleSignOn {
         $params["Method"] = "PATCH"
         $body = @{}
         if ($null -ne $PSBoundParameters["ApplicationId"]) {
-            $params["Uri"] = "https://graph.microsoft.com/beta/applications/$ApplicationId"
+            $params["Uri"] = "/beta/applications/$ApplicationId"
         }
         if ($null -ne $PSBoundParameters["SingleSignOnMode"]) {
             $SingleSignOnMode = $PSBoundParameters["SingleSignOnMode"]
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyConnector.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyConnector.ps1
index fb1d785ba9..f302ef1b46 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyConnector.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyConnector.ps1
@@ -15,16 +15,23 @@ function Set-EntraBetaApplicationProxyConnector {
     PROCESS {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
+        
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         $params["Method"] = "POST"
         $body = @{}
         if($null -ne $PSBoundParameters["OnPremisesPublishingProfileId"])
         {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectors/$OnPremisesPublishingProfileId/memberOf/" + '$ref'
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectors/$OnPremisesPublishingProfileId/memberOf/" + '$ref'
         }
         if($null -ne $PSBoundParameters["ConnectorGroupId"])
         {
             $body = @{
-                "@odata.id" = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$ConnectorGroupId"
+                "@odata.id" = "$rootUri/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$ConnectorGroupId"
             }
             $body = $body | ConvertTo-Json
         }
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyConnectorGroup.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyConnectorGroup.ps1
index 88f9d2d0ff..03c746cecb 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyConnectorGroup.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaApplicationProxyConnectorGroup.ps1
@@ -18,7 +18,7 @@ function Set-EntraBetaApplicationProxyConnectorGroup {
         $body = @{}
         if($null -ne $PSBoundParameters["Id"])
         {
-            $params["Uri"] = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id"
+            $params["Uri"] = "/beta/onPremisesPublishingProfiles/applicationProxy/connectorGroups/$Id"
         }
         if($null -ne $PSBoundParameters["Name"])
         {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaServicePrincipal.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaServicePrincipal.ps1
index a3884bd3cc..8ee14ab276 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaServicePrincipal.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Applications/Set-EntraBetaServicePrincipal.ps1
@@ -46,7 +46,7 @@ function Set-EntraBetaServicePrincipal {
 
     PROCESS {    
         $params = @{}
-        $params["Uri"] = "https://graph.microsoft.com/beta/servicePrincipals"
+        $params["Uri"] = "/beta/servicePrincipals"
         $params["Method"] = "PATCH"
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $body = @{}
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Authentication/Revoke-EntraBetaSignedInUserAllRefreshToken.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Authentication/Revoke-EntraBetaSignedInUserAllRefreshToken.ps1
index ab7a932f06..5922a541ad 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Authentication/Revoke-EntraBetaSignedInUserAllRefreshToken.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Authentication/Revoke-EntraBetaSignedInUserAllRefreshToken.ps1
@@ -17,7 +17,7 @@ function Revoke-EntraBetaSignedInUserAllRefreshToken {
         $params.Keys | ForEach-Object {"$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
                 
-        $response = (Invoke-GraphRequest -Headers $customHeaders -Uri 'https://graph.microsoft.com/beta/me/revokeSignInSessions' -Method POST).value      
+        $response = (Invoke-GraphRequest -Headers $customHeaders -Uri '/beta/me/revokeSignInSessions' -Method POST).value      
         if($response){
                 $responseType = New-Object Microsoft.Graph.Beta.PowerShell.Models.ComponentsMwc6EoResponsesRevokesigninsessionsresponseContentApplicationJsonSchema
                 $responseType.Value= $response
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaAdministrativeUnitMember.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaAdministrativeUnitMember.ps1
index 4096c08876..b2aadb2ae2 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaAdministrativeUnitMember.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaAdministrativeUnitMember.ps1
@@ -16,6 +16,13 @@ function Add-EntraBetaAdministrativeUnitMember {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
+
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         
         if ($PSBoundParameters.ContainsKey("Verbose")) {
             $params["Verbose"] = $PSBoundParameters["Verbose"]
@@ -25,7 +32,7 @@ function Add-EntraBetaAdministrativeUnitMember {
         }
         if ($null -ne $PSBoundParameters["MemberId"]) {
             $TmpValue = $PSBoundParameters["MemberId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/beta/directoryObjects/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
         if ($PSBoundParameters.ContainsKey("Debug")) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDeviceRegisteredOwner.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDeviceRegisteredOwner.ps1
index c23c2f54b8..f54fbcc283 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDeviceRegisteredOwner.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDeviceRegisteredOwner.ps1
@@ -17,6 +17,13 @@ function Add-EntraBetaDeviceRegisteredOwner {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
+
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
     
         if ($null -ne $PSBoundParameters["ProgressAction"]) {
             $params["ProgressAction"] = $PSBoundParameters["ProgressAction"]
@@ -35,7 +42,7 @@ function Add-EntraBetaDeviceRegisteredOwner {
         }
         if ($null -ne $PSBoundParameters["OwnerId"]) {
             $TmpValue = $PSBoundParameters["OwnerId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/beta/directoryObjects/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
         if ($null -ne $PSBoundParameters["DeviceId"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDeviceRegisteredUser.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDeviceRegisteredUser.ps1
index e8a7dad36d..a57657daf8 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDeviceRegisteredUser.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDeviceRegisteredUser.ps1
@@ -18,6 +18,12 @@ function Add-EntraBetaDeviceRegisteredUser {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
     
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["ProgressAction"]) {
             $params["ProgressAction"] = $PSBoundParameters["ProgressAction"]
         }
@@ -35,7 +41,7 @@ function Add-EntraBetaDeviceRegisteredUser {
         }
         if ($null -ne $PSBoundParameters["UserId"]) {
             $TmpValue = $PSBoundParameters["UserId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/beta/directoryObjects/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
         if ($null -ne $PSBoundParameters["DeviceId"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDirectoryRoleMember.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDirectoryRoleMember.ps1
index 7818f2b010..47d9be870c 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDirectoryRoleMember.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Add-EntraBetaDirectoryRoleMember.ps1
@@ -35,7 +35,7 @@ function Add-EntraBetaDirectoryRoleMember {
         }
         if ($null -ne $PSBoundParameters["MemberId"]) {
             $TmpValue = $PSBoundParameters["MemberId"]
-            $Value = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue"
+            $Value = "/beta/directoryObjects/$TmpValue"
             $params["OdataId"] = $Value
         }
         if ($null -ne $PSBoundParameters["DirectoryRoleId"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Confirm-EntraBetaDomain.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Confirm-EntraBetaDomain.ps1
index cd5c4b27b4..437266f8b3 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Confirm-EntraBetaDomain.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Confirm-EntraBetaDomain.ps1
@@ -15,7 +15,7 @@ function Confirm-EntraBetaDomain {
         $params = @{}
         $body = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand        
-        $params["Uri"] = "https://graph.microsoft.com/beta/domains/$DomainName/verify"
+        $params["Uri"] = "/beta/domains/$DomainName/verify"
         $params["Method"] = "POST"
         
         if ($null -ne $PSBoundParameters["ForceTakeover"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaDirectoryObject.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaDirectoryObject.ps1
index c235f792b7..47afd5abc1 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaDirectoryObject.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaDirectoryObject.ps1
@@ -23,12 +23,12 @@ function Get-EntraBetaDirectoryObject {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $body = @{}        
-        $URI = 'https://graph.microsoft.com/beta/directoryObjects/microsoft.graph.getByIds?$select=*'
+        $URI = '/beta/directoryObjects/microsoft.graph.getByIds?$select=*'
         if ($null -ne $PSBoundParameters["Property"]) {
             $selectProperties = $PSBoundParameters["Property"]
             $selectProperties = $selectProperties -Join ','
             $properties = "`$select=$($selectProperties)"
-            $URI = "https://graph.microsoft.com/beta/directoryObjects/microsoft.graph.getByIds?$properties"
+            $URI = "/beta/directoryObjects/microsoft.graph.getByIds?$properties"
         }
         if ($null -ne $PSBoundParameters["ObjectTypes"]) {
             $body["Types"] = $PSBoundParameters["ObjectTypes"]
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaDirectoryObjectOnPremisesProvisioningError.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaDirectoryObjectOnPremisesProvisioningError.ps1
index e103728ef5..5a2c9b0a89 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaDirectoryObjectOnPremisesProvisioningError.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaDirectoryObjectOnPremisesProvisioningError.ps1
@@ -27,7 +27,7 @@ function Get-EntraBetaDirectoryObjectOnPremisesProvisioningError {
 
         try {
             foreach ($obj in $Object) {
-                $uri = "https://graph.microsoft.com/beta/" + $obj + "?`$filter=onPremisesProvisioningErrors/any(o:o/category ne null)&`$select=Id,UserPrincipalName,DisplayName,Mail,ProxyAddresses,onPremisesProvisioningErrors,onPremisesSyncEnabled&`$top=999"
+                $uri = "/beta/" + $obj + "?`$filter=onPremisesProvisioningErrors/any(o:o/category ne null)&`$select=Id,UserPrincipalName,DisplayName,Mail,ProxyAddresses,onPremisesProvisioningErrors,onPremisesSyncEnabled&`$top=999"
                 $response = Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method GET
                 $response.value | ForEach-Object {
                     $_ | Add-Member -MemberType NoteProperty -Name ObjectType -Value $obj -Force
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaPartnerInformation.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaPartnerInformation.ps1
index 1a414c70f9..2cc782006d 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaPartnerInformation.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaPartnerInformation.ps1
@@ -23,7 +23,7 @@ function Get-EntraBetaPartnerInformation {
         if ([string]::IsNullOrWhiteSpace($TenantId)) {
             $TenantID = (Get-EntraContext).TenantId
         }
-        $response = Invoke-MgGraphRequest -Headers $customHeaders -Method GET -Uri "https://graph.microsoft.com/beta/organization/$TenantID/partnerInformation"
+        $response = Invoke-MgGraphRequest -Headers $customHeaders -Method GET -Uri "/beta/organization/$TenantID/partnerInformation"
         # Create a custom table
         $customTable = [PSCustomObject]@{
             "PartnerCompanyName"       = $response.companyName
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaSubscription.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaSubscription.ps1
index 8cc15a75b4..b755920d91 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaSubscription.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Get-EntraBetaSubscription.ps1
@@ -28,7 +28,7 @@ function Get-EntraBetaSubscription {
         $params = @{}
         $topCount = 0
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = "https://graph.microsoft.com/beta/directory/subscriptions"
+        $baseUri = "/beta/directory/subscriptions"
         $properties = "`$select=*"
     
         if ($PSBoundParameters.ContainsKey("Property")) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Restore-EntraBetaDeletedDirectoryObject.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Restore-EntraBetaDeletedDirectoryObject.ps1
index 7d8276eba3..69285e0760 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Restore-EntraBetaDeletedDirectoryObject.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Restore-EntraBetaDeletedDirectoryObject.ps1
@@ -17,7 +17,7 @@ function Restore-EntraBetaDeletedDirectoryObject {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $params["Uri"] = 'https://graph.microsoft.com/beta/directory/deletedItems/'   
+        $params["Uri"] = '/beta/directory/deletedItems/'   
         $params["Method"] = "POST"    
         if ($null -ne $PSBoundParameters["Id"]) {
             $params["Uri"] += $Id + "/microsoft.graph.restore"      
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Set-EntraBetaPartnerInformation.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Set-EntraBetaPartnerInformation.ps1
index cbf1b32b78..be32b17d75 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Set-EntraBetaPartnerInformation.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/DirectoryManagement/Set-EntraBetaPartnerInformation.ps1
@@ -66,9 +66,10 @@ function Set-EntraBetaPartnerInformation {
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
         if ([string]::IsNullOrWhiteSpace($TenantId)) {
+
             $TenantID = (Get-EntraContext).TenantId
         }
-        Invoke-MgGraphRequest -Headers $customHeaders -Method PATCH -Uri "https://graph.microsoft.com/beta/organization/$TenantID/partnerInformation" -Body $body
+        Invoke-MgGraphRequest -Headers $customHeaders -Method PATCH -Uri "/beta/organization/$TenantID/partnerInformation" -Body $body
     }
 }
 
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Add-EntraBetaGroupOwner.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Add-EntraBetaGroupOwner.ps1
index b3eb04110d..f5715d62cc 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Add-EntraBetaGroupOwner.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Add-EntraBetaGroupOwner.ps1
@@ -18,6 +18,7 @@ function Add-EntraBetaGroupOwner {
         [Guid] $OwnerId
     )
 
+
     begin {
         # Ensure connection to Microsoft Entra
         if (-not (Get-EntraContext)) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Get-EntraBetaGroupOwner.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Get-EntraBetaGroupOwner.ps1
index f3a10c6699..2039484be4 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Get-EntraBetaGroupOwner.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Get-EntraBetaGroupOwner.ps1
@@ -35,7 +35,7 @@ function Get-EntraBetaGroupOwner {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/beta/groups'
+        $baseUri = '/beta/groups'
         $properties = '$select=*'
         $Method = "GET"        
         if ($null -ne $PSBoundParameters["Property"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Get-EntraBetaObjectSetting.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Get-EntraBetaObjectSetting.ps1
index 173a0a19ef..3a4195a9ba 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Get-EntraBetaObjectSetting.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Get-EntraBetaObjectSetting.ps1
@@ -42,7 +42,7 @@ function Get-EntraBetaObjectSetting {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         $topCount = $null
-        $baseUri = "https://graph.microsoft.com/beta/$TargetType/$TargetObjectId/settings"
+        $baseUri = "/beta/$TargetType/$TargetObjectId/settings"
         $params["Method"] = "GET"
         $params["Uri"] = $baseUri + '?$select=*'
 
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Groups/New-EntraBetaObjectSetting.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Groups/New-EntraBetaObjectSetting.ps1
index 24d215cd8d..4f738718b8 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Groups/New-EntraBetaObjectSetting.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Groups/New-EntraBetaObjectSetting.ps1
@@ -47,7 +47,7 @@ function New-EntraBetaObjectSetting {
             $propertyValues = $_ | Select-Object -Property $NonEmptyProperties | ConvertTo-Json
             [regex]::Replace($propertyValues, '(?<=")(\w+)(?=":)', { $args[0].Groups[1].Value.ToLower() })
         }
-        $response = Invoke-GraphRequest -Headers $customHeaders -Method POST -Uri https://graph.microsoft.com/beta/$TargetType/$TargetObjectId/settings -Body $directorySettingsJson
+        $response = Invoke-GraphRequest -Headers $customHeaders -Method POST -Uri /beta/$TargetType/$TargetObjectId/settings -Body $directorySettingsJson
         $response = $response | ConvertTo-Json | ConvertFrom-Json
 
         $targetTypeList = @()
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Remove-EntraBetaObjectSetting.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Remove-EntraBetaObjectSetting.ps1
index 86a40581c1..7506130248 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Remove-EntraBetaObjectSetting.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Remove-EntraBetaObjectSetting.ps1
@@ -43,7 +43,7 @@ function Remove-EntraBetaObjectSetting {
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
         $Method = "DELETE"
-        $URI = ' https://graph.microsoft.com/beta/{0}/{1}/settings/{2}' -f $TargetType, $TargetObjectId, $ID
+        $URI = ' /beta/{0}/{1}/settings/{2}' -f $TargetType, $TargetObjectId, $ID
         $response = Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method $Method
         $response
     }       
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Set-EntraBetaObjectSetting.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Set-EntraBetaObjectSetting.ps1
index d922f02412..6ce715d54c 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Groups/Set-EntraBetaObjectSetting.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Groups/Set-EntraBetaObjectSetting.ps1
@@ -54,7 +54,7 @@ function Set-EntraBetaObjectSetting {
             $propertyValues = $_ | Select-Object -Property $NonEmptyProperties | ConvertTo-Json
             [regex]::Replace($propertyValues, '(?<=")(\w+)(?=":)', { $args[0].Groups[1].Value.ToLower() })
         }
-        $response = Invoke-GraphRequest -Headers $customHeaders -Method PATCH -Uri https://graph.microsoft.com/beta/$TargetType/$TargetObjectId/settings/$ID -Body $directorySettingsJson
+        $response = Invoke-GraphRequest -Headers $customHeaders -Method PATCH -Uri /beta/$TargetType/$TargetObjectId/settings/$ID -Body $directorySettingsJson
         $response | ConvertTo-Json | ConvertFrom-Json
     }      
 }
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Enable-EntraBetaGlobalSecureAccessTenant.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Enable-EntraBetaGlobalSecureAccessTenant.ps1
index d86493091b..6071038ad0 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Enable-EntraBetaGlobalSecureAccessTenant.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Enable-EntraBetaGlobalSecureAccessTenant.ps1
@@ -9,7 +9,7 @@ function Enable-EntraBetaGlobalSecureAccessTenant {
             $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
 
             # Invoke the API request to enable global secure access tenant
-            $response = Invoke-GraphRequest -Method POST -Headers $customHeaders -OutputType PSObject -Uri "https://graph.microsoft.com/beta/networkAccess/microsoft.graph.networkaccess.onboard"
+            $response = Invoke-GraphRequest -Method POST -Headers $customHeaders -OutputType PSObject -Uri "/beta/networkAccess/microsoft.graph.networkaccess.onboard"
 
             # Check the response and provide feedback
             if ($response) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaGlobalSecureAccessTenantStatus.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaGlobalSecureAccessTenantStatus.ps1
index dbce2a39e8..0560834e2e 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaGlobalSecureAccessTenantStatus.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaGlobalSecureAccessTenantStatus.ps1
@@ -9,7 +9,7 @@ function Get-EntraBetaGlobalSecureAccessTenantStatus {
             $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
 
             # Invoke the API request to get the tenant status
-            $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "https://graph.microsoft.com/beta/networkAccess/tenantStatus"
+            $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "/beta/networkAccess/tenantStatus"
 
             # Check the response and provide feedback
             if ($response) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaPrivateAccessApplication.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaPrivateAccessApplication.ps1
index b3577b18bf..42cbd00c65 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaPrivateAccessApplication.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaPrivateAccessApplication.ps1
@@ -24,19 +24,19 @@ function Get-EntraBetaPrivateAccessApplication {
             switch ($PSCmdlet.ParameterSetName) {
                 "AllPrivateAccessApps" {
                     # Retrieve all private access applications
-                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri 'https://graph.microsoft.com/beta/applications?$count=true&$select=displayName,appId,id,tags,createdDateTime,servicePrincipalType,createdDateTime,servicePrincipalNames&$filter=tags/Any(x: x eq ''PrivateAccessNonWebApplication'') or tags/Any(x: x eq ''NetworkAccessManagedApplication'') or tags/Any(x: x eq ''NetworkAccessQuickAccessApplication'')'
+                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri '/beta/applications?$count=true&$select=displayName,appId,id,tags,createdDateTime,servicePrincipalType,createdDateTime,servicePrincipalNames&$filter=tags/Any(x: x eq ''PrivateAccessNonWebApplication'') or tags/Any(x: x eq ''NetworkAccessManagedApplication'') or tags/Any(x: x eq ''NetworkAccessQuickAccessApplication'')'
                     $response.value
                     break
                 }
                 "SingleAppID" {
                     # Retrieve a single application by ID
-                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "https://graph.microsoft.com/beta/applications/$ApplicationId/?`$select=displayName,appId,id,tags,createdDateTime,servicePrincipalType,createdDateTime,servicePrincipalNames"
+                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "/beta/applications/$ApplicationId/?`$select=displayName,appId,id,tags,createdDateTime,servicePrincipalType,createdDateTime,servicePrincipalNames"
                     $response
                     break
                 }
                 "SingleAppName" {
                     # Retrieve a single application by name
-                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "https://graph.microsoft.com/beta/applications?`$count=true&`$select=displayName,appId,id,tags,createdDateTime,servicePrincipalType,createdDateTime,servicePrincipalNames&`$filter=DisplayName eq '$ApplicationName'"
+                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "/beta/applications?`$count=true&`$select=displayName,appId,id,tags,createdDateTime,servicePrincipalType,createdDateTime,servicePrincipalNames&`$filter=DisplayName eq '$ApplicationName'"
                     $response.value
                     break
                 }
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaPrivateAccessApplicationSegment.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaPrivateAccessApplicationSegment.ps1
index 525493a870..30019bc3c6 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaPrivateAccessApplicationSegment.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Get-EntraBetaPrivateAccessApplicationSegment.ps1
@@ -24,13 +24,13 @@ function Get-EntraBetaPrivateAccessApplicationSegment {
             switch ($PSCmdlet.ParameterSetName) {
                 "AllApplicationSegments" {
                     # Retrieve all application segments
-                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "https://graph.microsoft.com/beta/applications/$ApplicationId/onPremisesPublishing/segmentsConfiguration/microsoft.graph.ipSegmentConfiguration/applicationSegments"
+                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "/beta/applications/$ApplicationId/onPremisesPublishing/segmentsConfiguration/microsoft.graph.ipSegmentConfiguration/applicationSegments"
                     $response.value
                     break
                 }
                 "SingleApplicationSegment" {
                     # Retrieve a single application segment
-                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "https://graph.microsoft.com/beta/applications/$ApplicationId/onPremisesPublishing/segmentsConfiguration/microsoft.graph.ipSegmentConfiguration/applicationSegments/$ApplicationSegmentId"
+                    $response = Invoke-GraphRequest -Method GET -Headers $customHeaders -OutputType PSObject -Uri "/beta/applications/$ApplicationId/onPremisesPublishing/segmentsConfiguration/microsoft.graph.ipSegmentConfiguration/applicationSegments/$ApplicationSegmentId"
                     $response
                     break
                 }
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/New-EntraBetaPrivateAccessApplication.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/New-EntraBetaPrivateAccessApplication.ps1
index fd210f35c3..38f3c95c03 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/New-EntraBetaPrivateAccessApplication.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/New-EntraBetaPrivateAccessApplication.ps1
@@ -20,11 +20,14 @@ function New-EntraBetaPrivateAccessApplication {
             # Create custom headers for the request
             $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
 
+            $environment = (Get-EntraContext).Environment
+            $rootUri = (Get-EntraEnvironment -Name $environment).GraphEndpoint
+
             # Prepare the request body for instantiating the Private Access app
             $bodyJson = @{ displayName = $ApplicationName } | ConvertTo-Json -Depth 99 -Compress
 
             # Instantiate the Private Access app
-            $newApp = Invoke-GraphRequest -Method POST -Headers $customHeaders -Uri 'https://graph.microsoft.com/beta/applicationTemplates/8adf8e6e-67b2-4cf2-a259-e3dc5476c621/instantiate' -Body $bodyJson
+            $newApp = Invoke-GraphRequest -Method POST -Headers $customHeaders -Uri '/beta/applicationTemplates/8adf8e6e-67b2-4cf2-a259-e3dc5476c621/instantiate' -Body $bodyJson
 
             # Prepare the request body for setting the app to be accessible via the ZTNA client
             $bodyJson = @{
@@ -39,7 +42,7 @@ function New-EntraBetaPrivateAccessApplication {
             # Set the Private Access app to be accessible via the ZTNA client
             $params = @{
                 Method  = 'PATCH'
-                Uri     = "https://graph.microsoft.com/beta/applications/$newAppId/"
+                Uri     = "/beta/applications/$newAppId/"
                 Headers = $customHeaders
                 Body    = $bodyJson
             }
@@ -49,12 +52,12 @@ function New-EntraBetaPrivateAccessApplication {
             # If ConnectorGroupId has been specified, assign the connector group to the app
             if ($ConnectorGroupId) {
                 $bodyJson = @{
-                    "@odata.id" = "https://graph.microsoft.com/beta/onPremisesPublishingProfiles/applicationproxy/connectorGroups/$ConnectorGroupId"
+                    "@odata.id" = "$rootUri/beta/onPremisesPublishingProfiles/applicationproxy/connectorGroups/$ConnectorGroupId"
                 } | ConvertTo-Json -Depth 99 -Compress
                 
                 $params = @{
                     Method  = 'PUT'
-                    Uri     = "https://graph.microsoft.com/beta/applications/$newAppId/connectorGroup/`$ref"
+                    Uri     = "/beta/applications/$newAppId/connectorGroup/`$ref"
                     Headers = $customHeaders
                     Body    = $bodyJson
                 }
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/New-EntraBetaPrivateAccessApplicationSegment.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/New-EntraBetaPrivateAccessApplicationSegment.ps1
index cd7796a899..96300781c4 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/New-EntraBetaPrivateAccessApplicationSegment.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/New-EntraBetaPrivateAccessApplicationSegment.ps1
@@ -74,7 +74,7 @@ function New-EntraBetaPrivateAccessApplicationSegment {
             # Define the parameters for the API request
             $params = @{
                 Method     = 'POST'
-                Uri        = "https://graph.microsoft.com/beta/applications/$ApplicationId/onPremisesPublishing/segmentsConfiguration/microsoft.graph.ipSegmentConfiguration/applicationSegments/"
+                Uri        = "/beta/applications/$ApplicationId/onPremisesPublishing/segmentsConfiguration/microsoft.graph.ipSegmentConfiguration/applicationSegments/"
                 Headers    = $customHeaders
                 Body       = $bodyJson
                 OutputType = 'PSObject'
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Remove-EntraBetaPrivateAccessApplicationSegment.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Remove-EntraBetaPrivateAccessApplicationSegment.ps1
index 968f232cf1..b0f86d6a10 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Remove-EntraBetaPrivateAccessApplicationSegment.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/NetworkAccess/Remove-EntraBetaPrivateAccessApplicationSegment.ps1
@@ -22,7 +22,7 @@ function Remove-EntraBetaPrivateAccessApplicationSegment {
             $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
 
             # Construct the URI for the API request
-            $uri = "https://graph.microsoft.com/beta/applications/$ApplicationId/onPremisesPublishing/segmentsConfiguration/microsoft.graph.ipSegmentConfiguration/applicationSegments/$ApplicationSegmentId"
+            $uri = "/beta/applications/$ApplicationId/onPremisesPublishing/segmentsConfiguration/microsoft.graph.ipSegmentConfiguration/applicationSegments/$ApplicationSegmentId"
 
             # Invoke the API request to delete the application segment
             Invoke-GraphRequest -Method DELETE -Headers $customHeaders -OutputType PSObject -Uri $uri
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaApplicationSignInSummary.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaApplicationSignInSummary.ps1
index daf654305e..80d3cb1cfd 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaApplicationSignInSummary.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaApplicationSignInSummary.ps1
@@ -37,7 +37,7 @@ function Get-EntraBetaApplicationSignInSummary {
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
-        $URI = "https://graph.microsoft.com/beta/reports/getAzureADApplicationSignInSummary(period='D{0}'){1}{2}" -f $Days, $filterApplied, $topCount
+        $URI = "/beta/reports/getAzureADApplicationSignInSummary(period='D{0}'){1}{2}" -f $Days, $filterApplied, $topCount
         $response = (Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method $Method | ConvertTo-Json | ConvertFrom-Json).value
         
         $data = $response | ConvertTo-Json -Depth 10 | ConvertFrom-Json
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaAuthenticationMethodUserRegistrationDetailReport.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaAuthenticationMethodUserRegistrationDetailReport.ps1
index e4cf5e5d19..79cba94ae2 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaAuthenticationMethodUserRegistrationDetailReport.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaAuthenticationMethodUserRegistrationDetailReport.ps1
@@ -43,7 +43,7 @@ function Get-EntraBetaAuthenticationMethodUserRegistrationDetailReport {
         $params = @{}
         $topCount = 0
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = "https://graph.microsoft.com/beta/reports/authenticationMethods/userRegistrationDetails"
+        $baseUri = "/beta/reports/authenticationMethods/userRegistrationDetails"
         $properties = "`$select=*"
     
         if ($PSBoundParameters.ContainsKey("Property")) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaCrossTenantAccessActivity.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaCrossTenantAccessActivity.ps1
index fea5ea5867..c3b4c9d016 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaCrossTenantAccessActivity.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Reports/Get-EntraBetaCrossTenantAccessActivity.ps1
@@ -38,7 +38,7 @@ function Get-EntraBetaCrossTenantAccessActivity {
     process {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
 
-        $baseUri = "https://graph.microsoft.com/beta/auditLogs/signIns"
+        $baseUri = "/beta/auditLogs/signIns"
 
         $firstExecution = $true
 
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.ps1
index bade7a2736..ecd69da707 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.ps1
@@ -33,7 +33,7 @@ function Add-EntraBetaFeatureRolloutPolicyDirectoryObject {
         }
         if ($null -ne $PSBoundParameters["RefObjectId"]) {
             $TmpValue = $PSBoundParameters["RefObjectId"]
-            $Value = "https://graph.microsoft.com/v1.0/directoryObjects/$TmpValue"
+            $Value = "/beta/directoryObjects/$TmpValue"
             $params["OdataId"] = $Value
         }
         if ($null -ne $PSBoundParameters["OutVariable"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Add-EntraBetaServicePrincipalPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Add-EntraBetaServicePrincipalPolicy.ps1
index 5f8a969ede..beeba26e2f 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Add-EntraBetaServicePrincipalPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Add-EntraBetaServicePrincipalPolicy.ps1
@@ -16,15 +16,21 @@ function Add-EntraBetaServicePrincipalPolicy {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
         if ($null -ne $PSBoundParameters["ID"]) {
             $id = $PSBoundParameters["ID"]
         }
         if ($null -ne $PSBoundParameters["RefObjectId"]) {
             $RefObjectId = $PSBoundParameters["RefObjectId"]
         }
-        $uri = "https://graph.microsoft.com/beta/serviceprincipals/$id/Policies/" + '$ref'
+        $uri = "/beta/serviceprincipals/$id/Policies/" + '$ref'
         $body = @{
-            "@odata.id" = "https://graph.microsoft.com/beta/legacy/policies/$RefObjectId"
+            "@odata.id" = "$rootUri/beta/legacy/policies/$RefObjectId"
         }
         $body = $body | ConvertTo-Json
         
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaPolicy.ps1
index c71c2c1cb7..496162cd14 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaPolicy.ps1
@@ -19,7 +19,7 @@ function Get-EntraBetaPolicy {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUrl = "https://graph.microsoft.com/beta/policies/"
+        $baseUrl = "/beta/policies/"
         $endpoints = @("homeRealmDiscoveryPolicies", 
             "claimsMappingPolicies",
             "tokenIssuancePolicies", 
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaPolicyAppliedObject.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaPolicyAppliedObject.ps1
index dd5eb185b6..52a79eed1a 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaPolicyAppliedObject.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaPolicyAppliedObject.ps1
@@ -13,10 +13,10 @@ function Get-EntraBetaPolicyAppliedObject {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $Id = $PSBoundParameters["Id"]
-        $params["Uri"] = "https://graph.microsoft.com/beta/legacy/policies/$Id/appliesTo"
+        $params["Uri"] = "/beta/legacy/policies/$Id/appliesTo"
         $params["Method"] = "GET"
         if ($PSBoundParameters.ContainsKey("ID")) {
-            $params["Uri"] = "https://graph.microsoft.com/beta/legacy/policies/$Id/appliesTo"
+            $params["Uri"] = "/beta/legacy/policies/$Id/appliesTo"
         }
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaServicePrincipalPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaServicePrincipalPolicy.ps1
index 7ff625ee38..a73d7c5afd 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaServicePrincipalPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaServicePrincipalPolicy.ps1
@@ -19,7 +19,7 @@ function Get-EntraBetaServicePrincipalPolicy {
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
-        $URI = "https://graph.microsoft.com/beta/serviceprincipals/$Id/policies"
+        $URI = "/beta/serviceprincipals/$Id/policies"
         $response = (Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method $Method | ConvertTo-Json -Depth 20 | ConvertFrom-Json).value
                
         $data = $response 
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaUserAuthenticationMethod.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaUserAuthenticationMethod.ps1
index 6a763825ae..29e8e0c666 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaUserAuthenticationMethod.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaUserAuthenticationMethod.ps1
@@ -37,7 +37,7 @@ function Get-EntraBetaUserAuthenticationMethod {
             $params = @{}
             $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
             $encodedUserId = [System.Web.HttpUtility]::UrlEncode($UserId)
-            $uri = "https://graph.microsoft.com/beta/users/$encodedUserId/authentication/methods"
+            $uri = "/beta/users/$encodedUserId/authentication/methods"
 
             Write-Debug("============================ REQUEST DETAILS ============================")
             $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaUserAuthenticationRequirement.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaUserAuthenticationRequirement.ps1
index 6994be108c..0007a371c2 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaUserAuthenticationRequirement.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Get-EntraBetaUserAuthenticationRequirement.ps1
@@ -38,7 +38,7 @@ function Get-EntraBetaUserAuthenticationRequirement {
             $params = @{}
             $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
             $encodedUserId = [System.Web.HttpUtility]::UrlEncode($UserId)
-            $baseUri = "https://graph.microsoft.com/beta/users/$encodedUserId"
+            $baseUri = "/beta/users/$encodedUserId"
             $params["Uri"] = "$baseUri/authentication/requirements"
 
             Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/New-EntraBetaOauth2PermissionGrant.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/New-EntraBetaOauth2PermissionGrant.ps1
index 2e6ec61584..ad3bf014cd 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/New-EntraBetaOauth2PermissionGrant.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/New-EntraBetaOauth2PermissionGrant.ps1
@@ -30,7 +30,7 @@ function New-EntraBetaOauth2PermissionGrant {
     PROCESS {
         $params = @{}
         $body = @{}
-        $params["Uri"] = "https://graph.microsoft.com/beta/oauth2PermissionGrants"
+        $params["Uri"] = "/beta/oauth2PermissionGrants"
         $params["Method"] = "POST"
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
 
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/New-EntraBetaPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/New-EntraBetaPolicy.ps1
index 767df3b491..da8617bbf8 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/New-EntraBetaPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/New-EntraBetaPolicy.ps1
@@ -63,7 +63,7 @@ function New-EntraBetaPolicy {
             $respType = New-Object -TypeName Microsoft.Graph.Beta.PowerShell.Models.MicrosoftGraphPermissionGrantPolicy 
         }
 
-        $params["Uri"] = "https://graph.microsoft.com/beta/policies/" + $params.type
+        $params["Uri"] = "/beta/policies/" + $params.type
         $Definition = $PSBoundParameters["Definition"]
         $DisplayName = $PSBoundParameters["DisplayName"]
         $AlternativeIdentifier = $PSBoundParameters["AlternativeIdentifier"]
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaFeatureRolloutPolicyDirectoryObject.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaFeatureRolloutPolicyDirectoryObject.ps1
index cb65f52bd5..8b5580d1be 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaFeatureRolloutPolicyDirectoryObject.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaFeatureRolloutPolicyDirectoryObject.ps1
@@ -18,7 +18,7 @@ function Remove-EntraBetaFeatureRolloutPolicyDirectoryObject {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
-        $params["Uri"] = 'https://graph.microsoft.com/beta/policies/featureRolloutPolicies/{0}/appliesTo/{1}/$ref' -f $FeatureRolloutPolicyId, $DirectoryObjectId
+        $params["Uri"] = '/beta/policies/featureRolloutPolicies/{0}/appliesTo/{1}/$ref' -f $FeatureRolloutPolicyId, $DirectoryObjectId
         $params["Method"] = "DELETE"
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaPolicy.ps1
index 46adcb465e..6aff7e742d 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaPolicy.ps1
@@ -15,7 +15,7 @@ function Remove-EntraBetaPolicy {
         $array = ("activityBasedTimeoutPolicies",	"defaultAppManagementPolicy",	"appManagementPolicies",	"authenticationFlowsPolicy",	"authenticationMethodsPolicy",	"claimsMappingPolicies",	"featureRolloutPolicies",	"homeRealmDiscoveryPolicies",	"permissionGrantPolicies",	"tokenIssuancePolicies",	"tokenLifetimePolicies")
     
         foreach ($a in $array) {
-            $uri = "https://graph.microsoft.com/beta/policies/" + $a + "/" + $id
+            $uri = "/beta/policies/" + $a + "/" + $id
             try {
                 $response = Invoke-GraphRequest -Uri $uri -Method GET
                 break
@@ -26,7 +26,7 @@ function Remove-EntraBetaPolicy {
     
         $type = $Matches[1]
         if (($null -ne $PSBoundParameters["id"]) -and ($null -ne $type )) {
-            $URI = "https://graph.microsoft.com/beta/policies/" + $type + "/" + $id
+            $URI = "/beta/policies/" + $type + "/" + $id
         }
         $Method = "DELETE"
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaServicePrincipalPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaServicePrincipalPolicy.ps1
index 445424452f..c183369ba4 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaServicePrincipalPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Remove-EntraBetaServicePrincipalPolicy.ps1
@@ -25,7 +25,7 @@ function Remove-EntraBetaServicePrincipalPolicy {
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
-        $URI = 'https://graph.microsoft.com/beta/serviceprincipals/{0}/policies/{1}/$ref' -f $Id, $PolicyId
+        $URI = '/beta/serviceprincipals/{0}/policies/{1}/$ref' -f $Id, $PolicyId
         $response = Invoke-GraphRequest -Headers $customHeaders -Uri $uri -Method $Method
         $response
     }        
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Set-EntraBetaPolicy.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Set-EntraBetaPolicy.ps1
index 0c682740af..766f9cd4aa 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Set-EntraBetaPolicy.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Set-EntraBetaPolicy.ps1
@@ -61,7 +61,7 @@ function Set-EntraBetaPolicy {
         
         if (!$type) {
             foreach ($pType in $policyTypes) {
-                $uri = "https://graph.microsoft.com/beta/policies/" + $pType + "/" + $id
+                $uri = "/beta/policies/" + $pType + "/" + $id
                 try {
                     $response = Invoke-GraphRequest -Uri $uri -Method GET
                     break
@@ -91,7 +91,7 @@ function Set-EntraBetaPolicy {
                 $params["IsOrganizationDefault"] = $PSBoundParameters["IsOrganizationDefault"]
             }
             if (($null -ne $PSBoundParameters["id"]) -and ($null -ne $type )) {
-                $URI = "https://graph.microsoft.com/beta/policies/" + $type + "/" + $id
+                $URI = "/beta/policies/" + $type + "/" + $id
             }
             if ($null -ne $PSBoundParameters["IsOrganizationDefault"]) {
                 $params["IsOrganizationDefault"] = $PSBoundParameters["IsOrganizationDefault"]
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Update-EntraBetaOauth2PermissionGrant.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Update-EntraBetaOauth2PermissionGrant.ps1
index a70978de9e..0bfa363039 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Update-EntraBetaOauth2PermissionGrant.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Update-EntraBetaOauth2PermissionGrant.ps1
@@ -17,7 +17,7 @@ function Update-EntraBetaOauth2PermissionGrant {
         $params = @{}
         $body = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $params["Uri"] = "https://graph.microsoft.com/beta/oauth2PermissionGrants/"
+        $params["Uri"] = "/beta/oauth2PermissionGrants/"
         $params["Method"] = "PATCH"
         
         if ($null -ne $PSBoundParameters["OAuth2PermissionGrantId"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Update-EntraBetaUserAuthenticationRequirement.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Update-EntraBetaUserAuthenticationRequirement.ps1
index d863360fcd..ca1192b7e6 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Update-EntraBetaUserAuthenticationRequirement.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/SignIns/Update-EntraBetaUserAuthenticationRequirement.ps1
@@ -44,7 +44,7 @@ function Update-EntraBetaUserAuthenticationRequirement {
 
             # Proper URL encoding for the UserId to handle special characters
             $encodedUserId = [System.Web.HttpUtility]::UrlEncode($UserId)
-            $uri = "https://graph.microsoft.com/beta/users/$encodedUserId/authentication/requirements"
+            $uri = "/beta/users/$encodedUserId/authentication/requirements"
             
             # Create the body for the PATCH request
             $body = @{
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserDirectReport.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserDirectReport.ps1
index 342cb998cb..cfd4d96baa 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserDirectReport.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserDirectReport.ps1
@@ -32,7 +32,7 @@ function Get-EntraBetaUserDirectReport {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $topCount = $null
-        $baseUri = 'https://graph.microsoft.com/beta/users'
+        $baseUri = '/beta/users'
         $properties = '$select=*'
         $Method = "GET"
        
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserExtension.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserExtension.ps1
index 5982595f37..f6feacdb3b 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserExtension.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserExtension.ps1
@@ -24,7 +24,7 @@ function Get-EntraBetaUserExtension {
     PROCESS {    
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
-        $baseUri = "https://graph.microsoft.com/beta/users/$UserId"
+        $baseUri = "/beta/users/$UserId"
         $properties = '$select=Identities,OnPremisesDistinguishedName,EmployeeId,CreatedDateTime'        
         $params["Uri"] = "$baseUri/?$properties"        
         
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserSponsor.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserSponsor.ps1
index 39a7c216b6..e9bf95ce06 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserSponsor.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Get-EntraBetaUserSponsor.ps1
@@ -41,7 +41,7 @@ function Get-EntraBetaUserSponsor {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         $topCount = $null
-        $baseUri = "https://graph.microsoft.com/beta/users/$UserId/sponsors"
+        $baseUri = "/beta/users/$UserId/sponsors"
         $properties = '$select=*'
         $params["Method"] = "GET"
         $params["Uri"] = "$baseUri/?$properties"        
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/New-EntraBetaUser.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/New-EntraBetaUser.ps1
index 1061aadbc9..243320c413 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/New-EntraBetaUser.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/New-EntraBetaUser.ps1
@@ -226,7 +226,7 @@ function New-EntraBetaUser {
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
         $params = $params | ConvertTo-Json
-        $response = Invoke-GraphRequest -Headers $customHeaders -Uri 'https://graph.microsoft.com/v1.0/users?$select=*' -Method POST -Body $params
+        $response = Invoke-GraphRequest -Headers $customHeaders -Uri '/beta/users?$select=*' -Method POST -Body $params
         $response = $response | ConvertTo-Json | ConvertFrom-Json
         $response | ForEach-Object {
             if ($null -ne $_) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Remove-EntraBetaUserSponsor.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Remove-EntraBetaUserSponsor.ps1
index 7578aaed03..5f98169109 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Remove-EntraBetaUserSponsor.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Remove-EntraBetaUserSponsor.ps1
@@ -17,7 +17,7 @@ function Remove-EntraBetaUserSponsor {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{}
         
-        $params["Uri"] = "https://graph.microsoft.com/beta/users/$UserId/sponsors/$SponsorId/`$ref"
+        $params["Uri"] = "/beta/users/$UserId/sponsors/$SponsorId/`$ref"
         $params["Method"] = "DELETE"
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUser.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUser.ps1
index d77e66f63e..319e785c5b 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUser.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUser.ps1
@@ -154,7 +154,7 @@ function Set-EntraBetaUser {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
 
         # Microsoft Graph API URL for updating users
-        $graphUri = "https://graph.microsoft.com/beta/users/$UserId"
+        $graphUri = "/beta/users/$UserId"
 
         # Initialize hashtable for user properties
         $UserProperties = @{}
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserExtension.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserExtension.ps1
index c713fc1fa3..ae50f56b44 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserExtension.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserExtension.ps1
@@ -85,7 +85,7 @@ function Set-EntraBetaUserExtension {
             $params["Verbose"] = $PSBoundParameters["Verbose"]
         }
 
-        $uri = "https://graph.microsoft.com/beta/users/$UserId"
+        $uri = "/beta/users/$UserId"
 
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserLicense.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserLicense.ps1
index 811c4b3745..3f30ff4729 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserLicense.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserLicense.ps1
@@ -37,7 +37,7 @@ function Set-EntraBetaUserLicense {
         
         $customHeaders['Content-Type'] = 'application/json'
 
-        $graphApiEndpoint = "https://graph.microsoft.com/beta/users/$UserId/microsoft.graph.assignLicense"  
+        $graphApiEndpoint = "/beta/users/$UserId/microsoft.graph.assignLicense"  
         Write-Debug("============================ TRANSFORMATIONS ============================")
         $params.Keys | ForEach-Object { "$_ : $($params[$_])" } | Write-Debug
         Write-Debug("=========================================================================`n")
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserManager.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserManager.ps1
index c6d4191a96..9d4d6fed1b 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserManager.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserManager.ps1
@@ -18,6 +18,13 @@ function Set-EntraBetaUserManager {
         $params = @{}
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
     
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
+
         if ($null -ne $PSBoundParameters["ProgressAction"]) {
             $params["ProgressAction"] = $PSBoundParameters["ProgressAction"]
         }
@@ -35,7 +42,7 @@ function Set-EntraBetaUserManager {
         }
         if ($null -ne $PSBoundParameters["ManagerId"]) {
             $TmpValue = $PSBoundParameters["ManagerId"]
-            $Value = @{ "@odata.id" = "https://graph.microsoft.com/v1.0/users/$TmpValue" }
+            $Value = @{ "@odata.id" = "$rootUri/beta/users/$TmpValue" }
             $params["BodyParameter"] = $Value
         }
         if ($null -ne $PSBoundParameters["UserId"]) {
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserSponsor.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserSponsor.ps1
index da882f7d80..2032bdec55 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserSponsor.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Set-EntraBetaUserSponsor.ps1
@@ -35,7 +35,14 @@ function Set-EntraBetaUserSponsor {
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand     
         $customHeaders['Content-Type'] = 'application/json'
 
-        $batchEndpoint = "https://graph.microsoft.com/beta/`$batch"
+        $rootUri = (Get-EntraEnvironment -Name (Get-EntraContext).Environment).GraphEndpoint
+
+        if (-not $rootUri) {
+            $rootUri = "https://graph.microsoft.com"
+            Write-Verbose "Using default Graph endpoint: $rootUri"
+        }
+
+        $batchEndpoint = "/beta/`$batch"
         
         # Initialize request collection
         $requests = @()
@@ -50,7 +57,7 @@ function Set-EntraBetaUserSponsor {
                 method  = "POST"
                 url     = "/$targetEndpoint"
                 body    = @{
-                    "@odata.id" = "https://graph.microsoft.com/beta/$targetResource/$sponsorId"
+                    "@odata.id" = "$rootUri/beta/$targetResource/$sponsorId"
                 }
                 headers = @{
                     "Content-Type" = "application/json"
@@ -82,4 +89,4 @@ function Set-EntraBetaUserSponsor {
         }
     }
 }
-Set-Alias -Name Update-EntraBetaUserSponsor -Value Set-EntraBetaUserSponsor -Description "Set or update the sponsor information for a user." -Scope Global -Force
\ No newline at end of file
+Set-Alias -Name Update-EntraBetaUserSponsor -Value Set-EntraBetaUserSponsor -Description "Set or update the sponsor information for a user." -Scope Global -Force
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Update-EntraBetaSignedInUserPassword.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Update-EntraBetaSignedInUserPassword.ps1
index e47816a6f9..5e3cc56596 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Update-EntraBetaSignedInUserPassword.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Update-EntraBetaSignedInUserPassword.ps1
@@ -27,7 +27,7 @@ function Update-EntraBetaSignedInUserPassword {
         $newsecur = [System.Runtime.InteropServices.Marshal]::SecureStringToGlobalAllocUnicode($params.NewPassword)
         $new = [System.Runtime.InteropServices.Marshal]::PtrToStringUni($newsecur)
     
-        $params["Url"] = "https://graph.microsoft.com/beta/me/changePassword"
+        $params["Url"] = "/beta/me/changePassword"
         $body = @{
             currentPassword = $curr
             newPassword     = $new 
diff --git a/module/EntraBeta/Microsoft.Entra.Beta/Users/Update-EntraBetaUserFromFederated.ps1 b/module/EntraBeta/Microsoft.Entra.Beta/Users/Update-EntraBetaUserFromFederated.ps1
index dce9c0aa0b..2b53a6b053 100644
--- a/module/EntraBeta/Microsoft.Entra.Beta/Users/Update-EntraBetaUserFromFederated.ps1
+++ b/module/EntraBeta/Microsoft.Entra.Beta/Users/Update-EntraBetaUserFromFederated.ps1
@@ -31,7 +31,7 @@ function Update-EntraBetaUserFromFederated {
         $authenticationMethodId = "28c10230-6103-485e-b985-444c60001490"
         $customHeaders = New-EntraBetaCustomHeaders -Command $MyInvocation.MyCommand
         $params = @{ "UserId" = $UserPrincipalName }
-        $params["Url"] = "https://graph.microsoft.com/beta/users/$($UserPrincipalName)/authentication/methods/$authenticationMethodId/resetPassword"
+        $params["Url"] = "/beta/users/$($UserPrincipalName)/authentication/methods/$authenticationMethodId/resetPassword"
 
         # Handle password conversion securely
         $passwordRedacted = $false
diff --git a/test/Entra/Applications/Add-EntraApplicationOwner.Tests.ps1 b/test/Entra/Applications/Add-EntraApplicationOwner.Tests.ps1
index 300ebe72bd..c2715fc85a 100644
--- a/test/Entra/Applications/Add-EntraApplicationOwner.Tests.ps1
+++ b/test/Entra/Applications/Add-EntraApplicationOwner.Tests.ps1
@@ -7,6 +7,12 @@ BeforeAll {
     }
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.Applications
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Applications
     Mock -CommandName New-MgApplicationOwnerByRef -MockWith {} -ModuleName Microsoft.Entra.Applications
 }
   
diff --git a/test/Entra/Applications/Add-EntraServicePrincipalOwner.Tests.ps1 b/test/Entra/Applications/Add-EntraServicePrincipalOwner.Tests.ps1
index 85701a7846..7d689ca29f 100644
--- a/test/Entra/Applications/Add-EntraServicePrincipalOwner.Tests.ps1
+++ b/test/Entra/Applications/Add-EntraServicePrincipalOwner.Tests.ps1
@@ -7,6 +7,13 @@ BeforeAll {
     }
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.Applications
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Applications
+
     Mock -CommandName New-MgServicePrincipalOwnerByRef -MockWith {} -ModuleName Microsoft.Entra.Applications
 }
 
diff --git a/test/Entra/DirectoryManagement/Add-EntraAdministrativeUnitMember.Tests.ps1 b/test/Entra/DirectoryManagement/Add-EntraAdministrativeUnitMember.Tests.ps1
index 46735db910..c7a5bfff7c 100644
--- a/test/Entra/DirectoryManagement/Add-EntraAdministrativeUnitMember.Tests.ps1
+++ b/test/Entra/DirectoryManagement/Add-EntraAdministrativeUnitMember.Tests.ps1
@@ -8,6 +8,13 @@ BeforeAll {
 
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.DirectoryManagement
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.DirectoryManagement
+
     Mock -CommandName Invoke-GraphRequest -MockWith {} -ModuleName Microsoft.Entra.DirectoryManagement
 }
 Describe "Add-EntraAdministrativeUnitMember tests" {
diff --git a/test/Entra/DirectoryManagement/Add-EntraDeviceRegisteredOwner.Tests.ps1 b/test/Entra/DirectoryManagement/Add-EntraDeviceRegisteredOwner.Tests.ps1
index b99935127c..9dfe2581b5 100644
--- a/test/Entra/DirectoryManagement/Add-EntraDeviceRegisteredOwner.Tests.ps1
+++ b/test/Entra/DirectoryManagement/Add-EntraDeviceRegisteredOwner.Tests.ps1
@@ -8,6 +8,12 @@ BeforeAll {
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
     Mock -CommandName New-MgDeviceRegisteredOwnerByRef -MockWith {} -ModuleName Microsoft.Entra.DirectoryManagement
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.DirectoryManagement
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.DirectoryManagement
 }
 
 Describe "Add-EntraDeviceRegisteredOwner" {
diff --git a/test/Entra/DirectoryManagement/Add-EntraDeviceRegisteredUser.Tests.ps1 b/test/Entra/DirectoryManagement/Add-EntraDeviceRegisteredUser.Tests.ps1
index d09564b97c..d5e0b39010 100644
--- a/test/Entra/DirectoryManagement/Add-EntraDeviceRegisteredUser.Tests.ps1
+++ b/test/Entra/DirectoryManagement/Add-EntraDeviceRegisteredUser.Tests.ps1
@@ -8,6 +8,12 @@ BeforeAll {
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
     Mock -CommandName New-MgDeviceRegisteredUserByRef -MockWith {} -ModuleName Microsoft.Entra.DirectoryManagement
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.DirectoryManagement
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.DirectoryManagement
 }
 
 Describe "Add-EntraDeviceRegisteredUser" {
diff --git a/test/Entra/DirectoryManagement/Add-EntraDirectoryRoleMember.Tests.ps1 b/test/Entra/DirectoryManagement/Add-EntraDirectoryRoleMember.Tests.ps1
index 729d9f4587..bc1d927630 100644
--- a/test/Entra/DirectoryManagement/Add-EntraDirectoryRoleMember.Tests.ps1
+++ b/test/Entra/DirectoryManagement/Add-EntraDirectoryRoleMember.Tests.ps1
@@ -48,7 +48,7 @@ Describe "Add-EntraDirectoryRoleMember" {
 
             $result = Add-EntraDirectoryRoleMember -DirectoryRoleId "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb" -MemberId "bbbbbbbb-1111-2222-3333-cccccccccccc"
             $params = Get-Parameters -data $result
-            $value = "https://graph.microsoft.com/v1.0/directoryObjects/"
+            $value = "/v1.0/directoryObjects/"
             $params.OdataId | Should -Be $value"bbbbbbbb-1111-2222-3333-cccccccccccc"
         }
         It "Should contain 'User-Agent' header" {
diff --git a/test/Entra/DirectoryManagement/Get-EntraDirectoryObjectOnPremisesProvisioningError.Tests.ps1 b/test/Entra/DirectoryManagement/Get-EntraDirectoryObjectOnPremisesProvisioningError.Tests.ps1
index 97ef335dc6..744380fb62 100644
--- a/test/Entra/DirectoryManagement/Get-EntraDirectoryObjectOnPremisesProvisioningError.Tests.ps1
+++ b/test/Entra/DirectoryManagement/Get-EntraDirectoryObjectOnPremisesProvisioningError.Tests.ps1
@@ -32,6 +32,13 @@ BeforeAll {
             $response
         )
     }
+
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.DirectoryManagement
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.DirectoryManagement
     
     Mock -CommandName Invoke-GraphRequest -MockWith $scriptblock -ModuleName Microsoft.Entra.DirectoryManagement
 }
diff --git a/test/Entra/Users/Set-EntraUserManager.Tests.ps1 b/test/Entra/Users/Set-EntraUserManager.Tests.ps1
index 27f67a4a8d..6d12053b8b 100644
--- a/test/Entra/Users/Set-EntraUserManager.Tests.ps1
+++ b/test/Entra/Users/Set-EntraUserManager.Tests.ps1
@@ -8,6 +8,12 @@ BeforeAll {
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
     Mock -CommandName Set-MgUserManagerByRef -MockWith {} -ModuleName Microsoft.Entra.Users
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.Users
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Users
 }
 
 Describe "Set-EntraUserManager" {
diff --git a/test/Entra/Users/Set-EntraUserSponsor.Tests.ps1 b/test/Entra/Users/Set-EntraUserSponsor.Tests.ps1
index d0e0724358..d51d8cd252 100644
--- a/test/Entra/Users/Set-EntraUserSponsor.Tests.ps1
+++ b/test/Entra/Users/Set-EntraUserSponsor.Tests.ps1
@@ -46,7 +46,16 @@ BeforeAll {
         }
     }
     Mock -CommandName Invoke-GraphRequest -MockWith $scriptblock -ModuleName Microsoft.Entra.Users
-    Mock -CommandName Get-EntraContext -MockWith { @{Scopes = @("User.ReadWrite.All") } } -ModuleName Microsoft.Entra.Users
+    Mock -CommandName Get-EntraContext -MockWith { 
+        @{
+            Environment = "Global"           
+            Scopes = @("User.ReadWrite.All") 
+        } 
+    } -ModuleName Microsoft.Entra.Users
+
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Users
 }
 
 Describe "Set-EntraUserSponsor" {
diff --git a/test/EntraBeta/Applications/Add-EntraBetaApplicationPolicy.Tests.ps1 b/test/EntraBeta/Applications/Add-EntraBetaApplicationPolicy.Tests.ps1
index 21e8e720d6..fdb0bf496b 100644
--- a/test/EntraBeta/Applications/Add-EntraBetaApplicationPolicy.Tests.ps1
+++ b/test/EntraBeta/Applications/Add-EntraBetaApplicationPolicy.Tests.ps1
@@ -9,6 +9,12 @@ BeforeAll {
     
 
     Mock -CommandName Invoke-GraphRequest -MockWith {} -ModuleName Microsoft.Entra.Beta.Applications
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.Beta.Applications
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Beta.Applications
 }
 
 Describe "Add-EntraBetaApplicationPolicy" {
diff --git a/test/EntraBeta/Applications/New-EntraBetaApplicationFromApplicationTemplate.Tests.ps1 b/test/EntraBeta/Applications/New-EntraBetaApplicationFromApplicationTemplate.Tests.ps1
index 2b974bb211..8b30836bda 100644
--- a/test/EntraBeta/Applications/New-EntraBetaApplicationFromApplicationTemplate.Tests.ps1
+++ b/test/EntraBeta/Applications/New-EntraBetaApplicationFromApplicationTemplate.Tests.ps1
@@ -8,7 +8,7 @@ BeforeAll {
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
     $response = @{
-        "@odata.context"   = 'https://graph.microsoft.com/v1.0/`$metadata#microsoft.graph.applicationServicePrincipal'
+        "@odata.context"   = 'https://graph.microsoft.com/beta/`$metadata#microsoft.graph.applicationServicePrincipal'
         "servicePrincipal" = @{
             "oauth2PermissionScopes"             = $null
             "servicePrincipalType"               = "Application"
diff --git a/test/EntraBeta/DirectoryManagement/Add-EntraBetaAdministrativeUnitMember.Tests.ps1 b/test/EntraBeta/DirectoryManagement/Add-EntraBetaAdministrativeUnitMember.Tests.ps1
index 4d79d595c1..61f023ad48 100644
--- a/test/EntraBeta/DirectoryManagement/Add-EntraBetaAdministrativeUnitMember.Tests.ps1
+++ b/test/EntraBeta/DirectoryManagement/Add-EntraBetaAdministrativeUnitMember.Tests.ps1
@@ -9,6 +9,12 @@ BeforeAll {
     
 
     Mock -CommandName New-MgBetaAdministrativeUnitMemberByRef -MockWith {} -ModuleName Microsoft.Entra.Beta.DirectoryManagement
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.Beta.DirectoryManagement
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Beta.DirectoryManagement
 }
 
 Describe "Add-EntraBetaAdministrativeUnitMember" {
diff --git a/test/EntraBeta/DirectoryManagement/Add-EntraBetaDeviceRegisteredOwner.Tests.ps1 b/test/EntraBeta/DirectoryManagement/Add-EntraBetaDeviceRegisteredOwner.Tests.ps1
index 12df3cf689..68788b3780 100644
--- a/test/EntraBeta/DirectoryManagement/Add-EntraBetaDeviceRegisteredOwner.Tests.ps1
+++ b/test/EntraBeta/DirectoryManagement/Add-EntraBetaDeviceRegisteredOwner.Tests.ps1
@@ -7,6 +7,12 @@ BeforeAll {
     }
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.Beta.DirectoryManagement
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Beta.DirectoryManagement
     Mock -CommandName New-MgBetaDeviceRegisteredOwnerByRef -MockWith {} -ModuleName Microsoft.Entra.Beta.DirectoryManagement
 }
 
@@ -48,7 +54,7 @@ Describe "Add-EntraBetaDeviceRegisteredOwner" {
 
             Add-EntraBetaDeviceRegisteredOwner -DeviceId "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb" -OwnerId "bbbbbbbb-1111-2222-3333-cccccccccccc"
             $value = @{
-                "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/bbbbbbbb-1111-2222-3333-cccccccccccc"
+                "@odata.id" = "https://graph.microsoft.com/beta/directoryObjects/bbbbbbbb-1111-2222-3333-cccccccccccc"
             }
             Should -Invoke -CommandName New-MgBetaDeviceRegisteredOwnerByRef -ModuleName Microsoft.Entra.Beta.DirectoryManagement -Times 1 -ParameterFilter {
                 $BodyParameter.AdditionalProperties.'@odata.id' | Should -Be $value.'@odata.id'
diff --git a/test/EntraBeta/DirectoryManagement/Add-EntraBetaDeviceRegisteredUser.Tests.ps1 b/test/EntraBeta/DirectoryManagement/Add-EntraBetaDeviceRegisteredUser.Tests.ps1
index 8218db0dc4..ea0af03a22 100644
--- a/test/EntraBeta/DirectoryManagement/Add-EntraBetaDeviceRegisteredUser.Tests.ps1
+++ b/test/EntraBeta/DirectoryManagement/Add-EntraBetaDeviceRegisteredUser.Tests.ps1
@@ -7,6 +7,12 @@ BeforeAll {
     }
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.Beta.DirectoryManagement
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Beta.DirectoryManagement
     Mock -CommandName New-MgBetaDeviceRegisteredUserByRef -MockWith {} -ModuleName Microsoft.Entra.Beta.DirectoryManagement
 }
 
@@ -48,7 +54,7 @@ Describe "Add-EntraBetaDeviceRegisteredUser" {
 
             Add-EntraBetaDeviceRegisteredUser -DeviceId "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb" -UserId "bbbbbbbb-1111-2222-3333-cccccccccccc"
             $value = @{
-                "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/bbbbbbbb-1111-2222-3333-cccccccccccc"
+                "@odata.id" = "https://graph.microsoft.com/beta/directoryObjects/bbbbbbbb-1111-2222-3333-cccccccccccc"
             }
             Should -Invoke -CommandName New-MgBetaDeviceRegisteredUserByRef -ModuleName Microsoft.Entra.Beta.DirectoryManagement -Times 1 -ParameterFilter {
                 $BodyParameter.AdditionalProperties.'@odata.id' | Should -Be $value.'@odata.id'
diff --git a/test/EntraBeta/DirectoryManagement/Get-EntraBetaDeletedDirectoryObject.Tests.ps1 b/test/EntraBeta/DirectoryManagement/Get-EntraBetaDeletedDirectoryObject.Tests.ps1
index 2844decc6d..6bbb5df085 100644
--- a/test/EntraBeta/DirectoryManagement/Get-EntraBetaDeletedDirectoryObject.Tests.ps1
+++ b/test/EntraBeta/DirectoryManagement/Get-EntraBetaDeletedDirectoryObject.Tests.ps1
@@ -12,7 +12,7 @@ BeforeAll {
             [PSCustomObject]@{
                 Id                   = "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb"
                 AdditionalProperties = @{
-                    '@odata.context'  = 'https://graph.microsoft.com/v1.0/$metadata#directoryObjects/$entity'
+                    '@odata.context'  = 'https://graph.microsoft.com/beta/$metadata#directoryObjects/$entity'
                     '@odata.type'     = '#microsoft.graph.group'
                     'createdDateTime' = '2025-02-07T08:09:31Z'
                     'creationOptions' = @("Option1", "Option2")
diff --git a/test/EntraBeta/Groups/New-EntraBetaGroupAppRoleAssignment.Tests.ps1 b/test/EntraBeta/Groups/New-EntraBetaGroupAppRoleAssignment.Tests.ps1
index 702c7e47a2..2f6ba90359 100644
--- a/test/EntraBeta/Groups/New-EntraBetaGroupAppRoleAssignment.Tests.ps1
+++ b/test/EntraBeta/Groups/New-EntraBetaGroupAppRoleAssignment.Tests.ps1
@@ -19,7 +19,7 @@ BeforeAll {
                 "ResourceId"           = "aaaaaaaa-bbbb-cccc-1111-222222222222"
                 "ResourceDisplayName"  = "Mock-Group"
                 "PrincipalType"        = "PrincipalType"
-                "AdditionalProperties" = @{"@odata.context" = "https://graph.microsoft.com/v1.0/`$metadata#groups('aaaaaaaa-1111-2222-3333-cccccccccccc')/appRoleAssignments/`$entity" }
+                "AdditionalProperties" = @{"@odata.context" = "https://graph.microsoft.com/beta/`$metadata#groups('aaaaaaaa-1111-2222-3333-cccccccccccc')/appRoleAssignments/`$entity" }
                 "Parameters"           = $args
             }
         )
diff --git a/test/EntraBeta/SignIns/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.Tests.ps1 b/test/EntraBeta/SignIns/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.Tests.ps1
index 0b073e343f..8475bace40 100644
--- a/test/EntraBeta/SignIns/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.Tests.ps1
+++ b/test/EntraBeta/SignIns/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.Tests.ps1
@@ -48,7 +48,7 @@ Describe "Add-EntraBetaFeatureRolloutPolicyDirectoryObject" {
             Mock -CommandName New-MgBetaDirectoryFeatureRolloutPolicyApplyToByRef -MockWith {$args} -ModuleName Microsoft.Entra.Beta.SignIns
 
             $result = Add-EntraBetaFeatureRolloutPolicyDirectoryObject -Id "aaaabbbb-0000-cccc-1111-dddd2222eeee" -RefObjectId "bbbbcccc-1111-dddd-2222-eeee3333ffff"
-            $value = "https://graph.microsoft.com/v1.0/directoryObjects/bbbbcccc-1111-dddd-2222-eeee3333ffff" 
+            $value = "/beta/directoryObjects/bbbbcccc-1111-dddd-2222-eeee3333ffff" 
             $params= Get-Parameters -data $result
             $params.OdataId | Should -Be $value
         }
diff --git a/test/EntraBeta/SignIns/Add-EntraBetaServicePrincipalPolicy.Tests.ps1 b/test/EntraBeta/SignIns/Add-EntraBetaServicePrincipalPolicy.Tests.ps1
index c36fd7b21d..44af95d8c4 100644
--- a/test/EntraBeta/SignIns/Add-EntraBetaServicePrincipalPolicy.Tests.ps1
+++ b/test/EntraBeta/SignIns/Add-EntraBetaServicePrincipalPolicy.Tests.ps1
@@ -9,6 +9,12 @@ BeforeAll {
     
 
     Mock -CommandName Invoke-GraphRequest -MockWith {} -ModuleName Microsoft.Entra.Beta.SignIns
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.Beta.SignIns
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Beta.SignIns
 }
 
 Describe "Add-EntraBetaServicePrincipalPolicy" {
diff --git a/test/EntraBeta/SignIns/Get-EntraBetaPolicy.Tests.ps1 b/test/EntraBeta/SignIns/Get-EntraBetaPolicy.Tests.ps1
index c087759d75..b4b03447e1 100644
--- a/test/EntraBeta/SignIns/Get-EntraBetaPolicy.Tests.ps1
+++ b/test/EntraBeta/SignIns/Get-EntraBetaPolicy.Tests.ps1
@@ -35,7 +35,7 @@ BeforeAll {
         }
 
         $response = @{
-            '@odata.context' = 'https://graph.microsoft.com/v1.0/`$metadata#policies'
+            '@odata.context' = 'https://graph.microsoft.com/beta/`$metadata#policies'
             Value            = $policyObject.value
         }
 
diff --git a/test/EntraBeta/SignIns/Remove-EntraBetaPolicy.Tests.ps1 b/test/EntraBeta/SignIns/Remove-EntraBetaPolicy.Tests.ps1
index a374362967..4e568d25b3 100644
--- a/test/EntraBeta/SignIns/Remove-EntraBetaPolicy.Tests.ps1
+++ b/test/EntraBeta/SignIns/Remove-EntraBetaPolicy.Tests.ps1
@@ -9,7 +9,7 @@ BeforeAll {
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
     $ScriptBlock = {        
         $response = @{
-            '@odata.context' = 'https://graph.microsoft.com/v1.0/`$metadata#policies/homeRealmDiscoveryPolicies/`$entity'            
+            '@odata.context' = 'https://graph.microsoft.com/beta/`$metadata#policies/homeRealmDiscoveryPolicies/`$entity'            
         }
 
         return $response            
diff --git a/test/EntraBeta/SignIns/Set-EntraBetaPolicy.Tests.ps1 b/test/EntraBeta/SignIns/Set-EntraBetaPolicy.Tests.ps1
index 2154dcbf2c..44f09c3acf 100644
--- a/test/EntraBeta/SignIns/Set-EntraBetaPolicy.Tests.ps1
+++ b/test/EntraBeta/SignIns/Set-EntraBetaPolicy.Tests.ps1
@@ -12,7 +12,7 @@ BeforeAll {
         #Write-Host "Mocking Set-EntraBetaPolicy with parameters: $($args | ConvertTo-Json -Depth 3)"
         
         $response = @{
-            '@odata.context' = 'https://graph.microsoft.com/v1.0/`$metadata#policies/homeRealmDiscoveryPolicies/`$entity'            
+            '@odata.context' = 'https://graph.microsoft.com/beta/`$metadata#policies/homeRealmDiscoveryPolicies/`$entity'            
         }
 
         return $response
diff --git a/test/EntraBeta/Users/Set-EntraBetaUserManager.Tests.ps1 b/test/EntraBeta/Users/Set-EntraBetaUserManager.Tests.ps1
index 8049152f96..a4bd282e7f 100644
--- a/test/EntraBeta/Users/Set-EntraBetaUserManager.Tests.ps1
+++ b/test/EntraBeta/Users/Set-EntraBetaUserManager.Tests.ps1
@@ -8,6 +8,12 @@ BeforeAll {
     Import-Module (Join-Path $PSScriptRoot "..\..\Common-Functions.ps1") -Force
 
     Mock -CommandName Set-MgBetaUserManagerByRef -MockWith {} -ModuleName Microsoft.Entra.Beta.Users
+    Mock -CommandName Get-EntraContext -MockWith { @{
+        Environment = "Global"
+    }} -ModuleName Microsoft.Entra.Beta.Users
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Beta.Users
 }
 
 Describe "Set-EntraBetaUserManager" {
diff --git a/test/EntraBeta/Users/Set-EntraBetaUserSponsor.Tests.ps1 b/test/EntraBeta/Users/Set-EntraBetaUserSponsor.Tests.ps1
index 01cf7a9f1e..566e0b94d3 100644
--- a/test/EntraBeta/Users/Set-EntraBetaUserSponsor.Tests.ps1
+++ b/test/EntraBeta/Users/Set-EntraBetaUserSponsor.Tests.ps1
@@ -46,7 +46,15 @@ BeforeAll {
         }
     }
     Mock -CommandName Invoke-GraphRequest -MockWith $scriptblock -ModuleName Microsoft.Entra.Beta.Users
-    Mock -CommandName Get-EntraContext -MockWith { @{Scopes = @("User.ReadWrite.All") } } -ModuleName Microsoft.Entra.Beta.Users
+    Mock -CommandName Get-EntraContext -MockWith { 
+        @{
+            Environment="Global"
+            Scopes = @("User.ReadWrite.All") 
+        }
+    } -ModuleName Microsoft.Entra.Beta.Users
+    Mock -CommandName Get-EntraEnvironment -MockWith {return @{
+        GraphEndpoint = "https://graph.microsoft.com"
+    }} -ModuleName Microsoft.Entra.Beta.Users
 }
 
 Describe "Set-EntraBetaUserSponsor" {
diff --git a/test_legacy/module/EntraBeta/Add-EntraBetaDeviceRegisteredOwner.Tests.ps1 b/test_legacy/module/EntraBeta/Add-EntraBetaDeviceRegisteredOwner.Tests.ps1
index 0a27c6b750..c4b89b3a3f 100644
--- a/test_legacy/module/EntraBeta/Add-EntraBetaDeviceRegisteredOwner.Tests.ps1
+++ b/test_legacy/module/EntraBeta/Add-EntraBetaDeviceRegisteredOwner.Tests.ps1
@@ -48,7 +48,7 @@ Describe "Add-EntraBetaDeviceRegisteredOwner" {
 
             Add-EntraBetaDeviceRegisteredOwner -DeviceId "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb" -RefObjectId "bbbbbbbb-1111-2222-3333-cccccccccccc"
              $value = @{
-                "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/bbbbbbbb-1111-2222-3333-cccccccccccc"}
+                "@odata.id" = "https://graph.microsoft.com/beta/directoryObjects/bbbbbbbb-1111-2222-3333-cccccccccccc"}
                 Should -Invoke -CommandName New-MgBetaDeviceRegisteredOwnerByRef -ModuleName Microsoft.Graph.Entra.Beta -Times 1 -ParameterFilter {
                     $BodyParameter.AdditionalProperties.'@odata.id' | Should -Be $value.'@odata.id'
                     Write-Host $BodyParameter.AdditionalProperties.'@odata.id'
diff --git a/test_legacy/module/EntraBeta/Add-EntraBetaDeviceRegisteredUser.Tests.ps1 b/test_legacy/module/EntraBeta/Add-EntraBetaDeviceRegisteredUser.Tests.ps1
index 7cb9090940..c54eabfcc9 100644
--- a/test_legacy/module/EntraBeta/Add-EntraBetaDeviceRegisteredUser.Tests.ps1
+++ b/test_legacy/module/EntraBeta/Add-EntraBetaDeviceRegisteredUser.Tests.ps1
@@ -48,7 +48,7 @@ Describe "Add-EntraBetaDeviceRegisteredUser" {
 
             Add-EntraBetaDeviceRegisteredUser -DeviceId "aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb" -RefObjectId "bbbbbbbb-1111-2222-3333-cccccccccccc"
              $value = @{
-                "@odata.id" = "https://graph.microsoft.com/v1.0/directoryObjects/bbbbbbbb-1111-2222-3333-cccccccccccc"}
+                "@odata.id" = "https://graph.microsoft.com/beta/directoryObjects/bbbbbbbb-1111-2222-3333-cccccccccccc"}
             Should -Invoke -CommandName New-MgBetaDeviceRegisteredUserByRef -ModuleName Microsoft.Graph.Entra.Beta -Times 1 -ParameterFilter {
                 $BodyParameter.AdditionalProperties.'@odata.id' | Should -Be $value.'@odata.id'
                 Write-Host $BodyParameter.AdditionalProperties.'@odata.id'
diff --git a/test_legacy/module/EntraBeta/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.Tests.ps1 b/test_legacy/module/EntraBeta/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.Tests.ps1
index 9c7fa5afc6..51525f29de 100644
--- a/test_legacy/module/EntraBeta/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.Tests.ps1
+++ b/test_legacy/module/EntraBeta/Add-EntraBetaFeatureRolloutPolicyDirectoryObject.Tests.ps1
@@ -48,7 +48,7 @@ Describe "Add-EntraBetaFeatureRolloutPolicyDirectoryObject" {
             Mock -CommandName New-MgBetaDirectoryFeatureRolloutPolicyApplyToByRef -MockWith {$args} -ModuleName Microsoft.Graph.Entra.Beta
 
             $result = Add-EntraBetaFeatureRolloutPolicyDirectoryObject -Id "aaaabbbb-0000-cccc-1111-dddd2222eeee" -RefObjectId "bbbbcccc-1111-dddd-2222-eeee3333ffff"
-            $value = "https://graph.microsoft.com/v1.0/directoryObjects/bbbbcccc-1111-dddd-2222-eeee3333ffff" 
+            $value = "https://graph.microsoft.com/beta/directoryObjects/bbbbcccc-1111-dddd-2222-eeee3333ffff" 
             $params= Get-Parameters -data $result
             $params.OdataId | Should -Be $value
         }
diff --git a/test_legacy/module/EntraBeta/Get-EntraBetaPolicy.Tests.ps1 b/test_legacy/module/EntraBeta/Get-EntraBetaPolicy.Tests.ps1
index 54cc6668ea..17679c61e7 100644
--- a/test_legacy/module/EntraBeta/Get-EntraBetaPolicy.Tests.ps1
+++ b/test_legacy/module/EntraBeta/Get-EntraBetaPolicy.Tests.ps1
@@ -35,7 +35,7 @@ BeforeAll {
         }
 
         $response = @{
-            '@odata.context' = 'https://graph.microsoft.com/v1.0/$metadata#policies'
+            '@odata.context' = 'https://graph.microsoft.com/beta/$metadata#policies'
             Value            = $policyObject.value
         }
 
diff --git a/test_legacy/module/EntraBeta/New-EntraBetaGroupAppRoleAssignment.Tests.ps1 b/test_legacy/module/EntraBeta/New-EntraBetaGroupAppRoleAssignment.Tests.ps1
index e89b86f51f..eaaba6e1fa 100644
--- a/test_legacy/module/EntraBeta/New-EntraBetaGroupAppRoleAssignment.Tests.ps1
+++ b/test_legacy/module/EntraBeta/New-EntraBetaGroupAppRoleAssignment.Tests.ps1
@@ -19,7 +19,7 @@ BeforeAll {
               "ResourceId"                   = "aaaaaaaa-bbbb-cccc-1111-222222222222"
               "ResourceDisplayName"          = "Mock-Group"
               "PrincipalType"                = "PrincipalType"
-              "AdditionalProperties"         = @{"@odata.context" = "https://graph.microsoft.com/v1.0/`$metadata#groups('aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb')/appRoleAssignments/`$entity"}
+              "AdditionalProperties"         = @{"@odata.context" = "https://graph.microsoft.com/beta/`$metadata#groups('aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb')/appRoleAssignments/`$entity"}
               "Parameters"                   = $args
             }
         )
diff --git a/test_legacy/module/EntraBeta/Remove-EntraBetaPolicy.Tests.ps1 b/test_legacy/module/EntraBeta/Remove-EntraBetaPolicy.Tests.ps1
index 47d5aa76c0..3523178a2c 100644
--- a/test_legacy/module/EntraBeta/Remove-EntraBetaPolicy.Tests.ps1
+++ b/test_legacy/module/EntraBeta/Remove-EntraBetaPolicy.Tests.ps1
@@ -9,7 +9,7 @@ BeforeAll {
     Import-Module (Join-Path $psscriptroot "..\Common-Functions.ps1") -Force
     $ScriptBlock = {        
         $response = @{
-            '@odata.context' = 'https://graph.microsoft.com/v1.0/$metadata#policies/homeRealmDiscoveryPolicies/$entity'            
+            '@odata.context' = 'https://graph.microsoft.com/beta/$metadata#policies/homeRealmDiscoveryPolicies/$entity'            
         }
 
         return $response            
diff --git a/test_legacy/module/EntraBeta/Set-EntraBetaPolicy.Tests.ps1 b/test_legacy/module/EntraBeta/Set-EntraBetaPolicy.Tests.ps1
index b785bafcca..ae3dace568 100644
--- a/test_legacy/module/EntraBeta/Set-EntraBetaPolicy.Tests.ps1
+++ b/test_legacy/module/EntraBeta/Set-EntraBetaPolicy.Tests.ps1
@@ -12,7 +12,7 @@ BeforeAll {
         #Write-Host "Mocking set-EntraPolicy with parameters: $($args | ConvertTo-Json -Depth 3)"
         
         $response = @{
-            '@odata.context' = 'https://graph.microsoft.com/v1.0/$metadata#policies/homeRealmDiscoveryPolicies/$entity'            
+            '@odata.context' = 'https://graph.microsoft.com/beta/$metadata#policies/homeRealmDiscoveryPolicies/$entity'            
         }
 
         return $response