diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 293f5a5bef56..c5d6e7796bc7 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -39,26 +39,11 @@ parameters:
     type: object
     default:
       Public:
-        ServiceConnection: azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePublicMsft.json
-      Preview:
-        ServiceConnection: azure-sdk-tests-preview
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePreviewMsft.json
-      Canary:
-        ServiceConnection: azure-sdk-tests-preview
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePreviewMsft.json
-        Location: 'centraluseuap'
+      # Canary regions are currently not supported in TME so disabling for now
+      # Canary:
+      #   Location: 'centraluseuap'
       UsGov:
-        ServiceConnection: usgov_azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzureUsGovMsft.json
       China:
-        ServiceConnection: china_azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzureChinaMsft.json
   - name: MatrixConfigs
     type: object
     default:
@@ -213,11 +198,11 @@ extends:
                                     - ${{ cloudReplace }}
                                 - ${{ parameters.MatrixReplace }}
                               CloudConfig:
+                                Cloud: ${{ cloud.key }}
+                                Location: ${{ coalesce(cloud.value.Location, parameters.Location) }}
+                                ServiceConnection: ${{ coalesce(cloud.value.ServiceConnection, lower(format('azure-sdk-tests-{0}', cloud.key))) }}
                                 SubscriptionConfiguration: ${{ cloud.value.SubscriptionConfiguration }}
                                 SubscriptionConfigurations: ${{ cloud.value.SubscriptionConfigurations }}
-                                Location: ${{ coalesce(parameters.Location, cloud.value.Location) }}
-                                Cloud: ${{ cloud.key }}
-                                ServiceConnection: ${{ cloud.value.ServiceConnection }}
                                 SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }}
 
       # The Prerelease and Release stages are conditioned on:
diff --git a/sdk/ai/azopenai/ci.yml b/sdk/ai/azopenai/ci.yml
index b1c5ee618039..2724b10fcc21 100644
--- a/sdk/ai/azopenai/ci.yml
+++ b/sdk/ai/azopenai/ci.yml
@@ -35,11 +35,7 @@ extends:
       UsePipelineProxy: false
       CloudConfig:
         Public:
-          ServiceConnection: azure-sdk-tests
-          SubscriptionConfigurationFilePaths:
-            - eng/common/TestResources/sub-config/AzurePublicMsft.json
           SubscriptionConfigurations:
-            - $(sub-config-azure-cloud-test-resources)
             - $(sub-config-openai-test-resources) # TestSecrets-openai
       EnvVars:
         AZURE_TEST_RUN_LIVE: "true" # use when utilizing the New-TestResources Script
diff --git a/sdk/ai/azopenaiassistants/ci.yml b/sdk/ai/azopenaiassistants/ci.yml
index f0087e7f60ab..b21cd1314384 100644
--- a/sdk/ai/azopenaiassistants/ci.yml
+++ b/sdk/ai/azopenaiassistants/ci.yml
@@ -35,11 +35,7 @@ extends:
       UsePipelineProxy: false
       CloudConfig:
         Public:
-          ServiceConnection: azure-sdk-tests
-          SubscriptionConfigurationFilePaths:
-            - eng/common/TestResources/sub-config/AzurePublicMsft.json
           SubscriptionConfigurations:
-            - $(sub-config-azure-cloud-test-resources)
             - $(sub-config-openai-test-resources) # TestSecrets-openai
       EnvVars:
         AZURE_TEST_RUN_LIVE: "true" # use when utilizing the New-TestResources Script
diff --git a/sdk/ai/azopenaiextensions/ci.yml b/sdk/ai/azopenaiextensions/ci.yml
index ecfb5ebca949..7fcd48c87f80 100644
--- a/sdk/ai/azopenaiextensions/ci.yml
+++ b/sdk/ai/azopenaiextensions/ci.yml
@@ -36,11 +36,7 @@ extends:
     ExcludeGoNMinus2: true
     CloudConfig:
       Public:
-        ServiceConnection: azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         SubscriptionConfigurations:
-          - $(sub-config-azure-cloud-test-resources)
           - $(sub-config-openai-test-resources) # TestSecrets-openai
     EnvVars:
       AZURE_TEST_RUN_LIVE: "true" # use when utilizing the New-TestResources Script
diff --git a/sdk/azidentity/ci.yml b/sdk/azidentity/ci.yml
index a246bdcfd845..2b9d920217a3 100644
--- a/sdk/azidentity/ci.yml
+++ b/sdk/azidentity/ci.yml
@@ -26,11 +26,7 @@ extends:
     parameters:
       CloudConfig:
         Public:
-          ServiceConnection: azure-sdk-tests
-          SubscriptionConfigurationFilePaths:
-            - eng/common/TestResources/sub-config/AzurePublicMsft.json
           SubscriptionConfigurations:
-            - $(sub-config-azure-cloud-test-resources)
             - $(sub-config-identity-test-resources)
       EnableRaceDetector: true
       RunLiveTests: true
diff --git a/sdk/containers/azcontainerregistry/ci.yml b/sdk/containers/azcontainerregistry/ci.yml
index 6fe6d6823144..5ff81c29d8ce 100644
--- a/sdk/containers/azcontainerregistry/ci.yml
+++ b/sdk/containers/azcontainerregistry/ci.yml
@@ -26,7 +26,6 @@ extends:
   parameters:
     ServiceDirectory: 'containers/azcontainerregistry'
     RunLiveTests: true
-    UseFederatedAuth: true
     UsePipelineProxy: false
     TestRunTime: '30m'
     SupportedClouds: 'Public,UsGov'
diff --git a/sdk/messaging/azeventhubs/ci.yml b/sdk/messaging/azeventhubs/ci.yml
index 18ed0dff5c91..ab79ba009161 100644
--- a/sdk/messaging/azeventhubs/ci.yml
+++ b/sdk/messaging/azeventhubs/ci.yml
@@ -33,4 +33,3 @@ extends:
       AZURE_TENANT_ID: $(AZEVENTHUBS_TENANT_ID)
       AZURE_CLIENT_SECRET: $(AZEVENTHUBS_CLIENT_SECRET)
       AZURE_SUBSCRIPTION_ID: $(AZEVENTHUBS_SUBSCRIPTION_ID)
-    UseFederatedAuth: true
diff --git a/sdk/messaging/azservicebus/ci.yml b/sdk/messaging/azservicebus/ci.yml
index 022975500bf5..f4f00f3623f7 100644
--- a/sdk/messaging/azservicebus/ci.yml
+++ b/sdk/messaging/azservicebus/ci.yml
@@ -30,17 +30,8 @@ extends:
     SupportedClouds: 'China'
     CloudConfig:
       Public:
-        ServiceConnection: azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePublicMsft.json
       UsGov:
-        ServiceConnection: usgov_azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzureUsGovMsft.json
       China:
-        ServiceConnection: china_azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzureChinaMsft.json
         MatrixReplace:
           # Use dedicated pool with regional affinity to China cloud
           - Pool=(.*)-general/$1-asia
diff --git a/sdk/messaging/azwebpubsub/ci.yml b/sdk/messaging/azwebpubsub/ci.yml
index 2241bc2695a8..b205f835dd57 100644
--- a/sdk/messaging/azwebpubsub/ci.yml
+++ b/sdk/messaging/azwebpubsub/ci.yml
@@ -26,5 +26,4 @@ extends:
   template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml
   parameters:
     ServiceDirectory: 'messaging/azwebpubsub'
-    UseFederatedAuth: true
     UsePipelineProxy: false
diff --git a/sdk/messaging/eventgrid/azsystemevents/ci.yml b/sdk/messaging/eventgrid/azsystemevents/ci.yml
index c6da79fb1ece..fbd72cdcf51d 100644
--- a/sdk/messaging/eventgrid/azsystemevents/ci.yml
+++ b/sdk/messaging/eventgrid/azsystemevents/ci.yml
@@ -33,4 +33,3 @@ extends:
         AZURE_TENANT_ID: $(AZSYSTEMEVENTS_TENANT_ID)
         AZURE_CLIENT_SECRET: $(AZSYSTEMEVENTS_CLIENT_SECRET)
         AZURE_SUBSCRIPTION_ID: $(AZSYSTEMEVENTS_SUBSCRIPTION_ID)
-      UseFederatedAuth: true
diff --git a/sdk/security/keyvault/azadmin/ci.yml b/sdk/security/keyvault/azadmin/ci.yml
index fd7080262b46..ae76efce5b0c 100644
--- a/sdk/security/keyvault/azadmin/ci.yml
+++ b/sdk/security/keyvault/azadmin/ci.yml
@@ -26,7 +26,6 @@ extends:
   parameters:
     TimeoutInMinutes: 120
     ServiceDirectory: 'security/keyvault/azadmin'
-    UseFederatedAuth: true
     UsePipelineProxy: false
 
     # Due to the high cost of Managed HSMs, which keyvault-admin requires, we only want to run
diff --git a/sdk/security/keyvault/azcertificates/ci.yml b/sdk/security/keyvault/azcertificates/ci.yml
index 9c3d798971c6..e1679da83c24 100644
--- a/sdk/security/keyvault/azcertificates/ci.yml
+++ b/sdk/security/keyvault/azcertificates/ci.yml
@@ -27,7 +27,6 @@ extends:
   parameters:
     ServiceDirectory: 'security/keyvault/azcertificates'
     RunLiveTests: true
-    UseFederatedAuth: true
     UsePipelineProxy: false
     SupportedClouds: 'Public,UsGov,China'
     TestRunTime: '900s'
diff --git a/sdk/security/keyvault/azkeys/ci.yml b/sdk/security/keyvault/azkeys/ci.yml
index 0767f623b689..75586518a616 100644
--- a/sdk/security/keyvault/azkeys/ci.yml
+++ b/sdk/security/keyvault/azkeys/ci.yml
@@ -31,19 +31,10 @@ extends:
     SupportedClouds: 'Public,UsGov,China'
     CloudConfig:
       Public:
-        ServiceConnection: azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePublicMsft.json
       UsGov:
-        ServiceConnection: usgov_azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzureUsGovMsft.json
         MatrixFilters:
          - ArmTemplateParameters=^(?!.*enableHsm.*true)
       China:
-        ServiceConnection: china_azure-sdk-tests
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzureChinaMsft.json
         MatrixFilters:
          - ArmTemplateParameters=^(?!.*enableHsm.*true)
 
diff --git a/sdk/security/keyvault/azsecrets/ci.yml b/sdk/security/keyvault/azsecrets/ci.yml
index 7b208a0b4999..0ccdf387aa9e 100644
--- a/sdk/security/keyvault/azsecrets/ci.yml
+++ b/sdk/security/keyvault/azsecrets/ci.yml
@@ -27,6 +27,5 @@ extends:
   parameters:
     ServiceDirectory: 'security/keyvault/azsecrets'
     RunLiveTests: true
-    UseFederatedAuth: true
     UsePipelineProxy: false
     SupportedClouds: 'Public,UsGov,China'