diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml
index a6cad4dd6333..09d4db61b94a 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-tests.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-tests.yml
@@ -60,23 +60,26 @@ parameters:
     type: object
     default:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
         ServiceConnection: azure-sdk-tests
         SubscriptionConfigurationFilePaths:
           - eng/common/TestResources/sub-config/AzurePublicMsft.json
       Preview:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
         ServiceConnection: azure-sdk-tests-preview
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePreviewMsft.json
       Canary:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
         ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         Location: 'centraluseuap'
       UsGov:
-        SubscriptionConfiguration: $(sub-config-gov-test-resources)
         ServiceConnection: usgov_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureUsGovMsft.json
       China:
-        SubscriptionConfiguration: $(sub-config-cn-test-resources)
         ServiceConnection: china_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureChinaMsft.json
   - name: MatrixConfigs
     type: object
     default:
diff --git a/sdk/documentintelligence/tests.native.yml b/sdk/documentintelligence/tests.native.yml
index a940be13ad4f..25bd28e73cf9 100644
--- a/sdk/documentintelligence/tests.native.yml
+++ b/sdk/documentintelligence/tests.native.yml
@@ -11,7 +11,6 @@ extends:
         safeName: azureaidocumentintelligence
     CloudConfig:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
         ServiceConnection: azure-sdk-tests
         SubscriptionConfigurationFilePaths:
           - eng/common/TestResources/sub-config/AzurePublicMsft.json
diff --git a/sdk/documentintelligence/tests.yml b/sdk/documentintelligence/tests.yml
index e02a4d600c97..48abae511009 100644
--- a/sdk/documentintelligence/tests.yml
+++ b/sdk/documentintelligence/tests.yml
@@ -10,11 +10,10 @@ extends:
         groupId: com.azure
         safeName: azureaidocumentintelligence
     CloudConfig:
-      CanaryPreview:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
-        ServiceConnection: azure-sdk-tests
+      Preview:
+        ServiceConnection: azure-sdk-tests-preview
         SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePublicMsft.json
+          - eng/common/TestResources/sub-config/AzurePreviewMsft.json
         Location: 'eastus'
-    Clouds: 'CanaryPreview'
-    SupportedClouds: 'CanaryPreview'
+    Clouds: 'Preview'
+    SupportedClouds: 'Preview'
diff --git a/sdk/formrecognizer/tests.native.yml b/sdk/formrecognizer/tests.native.yml
index d9c9e473005d..76c34289a991 100644
--- a/sdk/formrecognizer/tests.native.yml
+++ b/sdk/formrecognizer/tests.native.yml
@@ -11,8 +11,8 @@ extends:
         safeName: azureaiformrecognizer
     CloudConfig:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-        Location: 'eastus'
         ServiceConnection: azure-sdk-tests
-        SubscriptionConfigurationFilePath: eng/common/TestResources/sub-config/AzurePublicMsft.json
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
+        Location: 'eastus'
     SupportedClouds: 'Public'
diff --git a/sdk/formrecognizer/tests.yml b/sdk/formrecognizer/tests.yml
index 7ae5d47f3495..6949b578beb7 100644
--- a/sdk/formrecognizer/tests.yml
+++ b/sdk/formrecognizer/tests.yml
@@ -11,8 +11,8 @@ extends:
         safeName: azureaiformrecognizer
     CloudConfig:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-        Location: 'centraluseuap'
         ServiceConnection: azure-sdk-tests
-        SubscriptionConfigurationFilePath: eng/common/TestResources/sub-config/AzurePublicMsft.json
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
+        Location: 'centraluseuap'
     SupportedClouds: 'Public'
diff --git a/sdk/keyvault/tests-jca.yml b/sdk/keyvault/tests-jca.yml
index 77f9cbf88c4f..37fb253b55bf 100644
--- a/sdk/keyvault/tests-jca.yml
+++ b/sdk/keyvault/tests-jca.yml
@@ -12,22 +12,29 @@ extends:
       AZURE_LOG_LEVEL: 2
     CloudConfig:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+        ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         ${{ if not(contains(variables['Build.DefinitionName'], 'tests-weekly')) }}:
           MatrixFilters:
             - ArmTemplateParameters=^(?!.*enableHsm.*true)
       UsGov:
-        SubscriptionConfiguration: $(sub-config-gov-test-resources)
+        ServiceConnection: usgov_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureUsGovMsft.json
         MatrixFilters:
           - ArmTemplateParameters=^(?!.*enableHsm.*true)
       China:
-        SubscriptionConfiguration: $(sub-config-cn-test-resources)
+        ServiceConnection: china_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureChinaMsft.json
         MatrixFilters:
           - ArmTemplateParameters=^(?!.*enableHsm.*true)
       Canary:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-        Location: 'centraluseuap'
         ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
+        Location: 'centraluseuap'
         # Managed HSM test resources are expensive and provisioning has not been reliable.
         # Given test coverage of non-canary regions we probably don't need to test in canary.
         MatrixFilters:
diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml
index 6828621ef180..c9ee547124f8 100644
--- a/sdk/keyvault/tests.yml
+++ b/sdk/keyvault/tests.yml
@@ -15,24 +15,26 @@ extends:
         ServiceConnection: azure-sdk-tests
         SubscriptionConfigurationFilePaths:
           - eng/common/TestResources/sub-config/AzurePublicMsft.json
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
         ${{ if not(contains(variables['Build.DefinitionName'], 'tests-weekly')) }}:
           MatrixFilters:
             - ArmTemplateParameters=^(?!.*enableHsm.*true)
       UsGov:
-        SubscriptionConfiguration: $(sub-config-gov-test-resources)
         ServiceConnection: usgov_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureUsGovMsft.json
         MatrixFilters:
           - ArmTemplateParameters=^(?!.*enableHsm.*true)
       China:
-        SubscriptionConfiguration: $(sub-config-cn-test-resources)
         ServiceConnection: china_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureChinaMsft.json
         MatrixFilters:
           - ArmTemplateParameters=^(?!.*enableHsm.*true)
       Canary:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-        Location: 'centraluseuap'
         ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
+        Location: 'centraluseuap'
         # Managed HSM test resources are expensive and provisioning has not been reliable.
         # Given test coverage of non-canary regions we probably don't need to test in canary.
         MatrixFilters:
diff --git a/sdk/search/tests.yml b/sdk/search/tests.yml
index cde839faa490..3fc225594f65 100644
--- a/sdk/search/tests.yml
+++ b/sdk/search/tests.yml
@@ -9,15 +9,18 @@ extends:
     TimeoutInMinutes: 60
     CloudConfig:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
         ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         Location: eastus
       UsGov:
-        SubscriptionConfiguration: $(sub-config-gov-test-resources)
         ServiceConnection: usgov_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureUsGovMsft.json
       China:
-        SubscriptionConfiguration: $(sub-config-cn-test-resources)
         ServiceConnection: china_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureChinaMsft.json
     EnvVars:
       AZURE_SEARCH_TEST_MODE: Live
     Artifacts:
diff --git a/sdk/servicebus/tests.yml b/sdk/servicebus/tests.yml
index fb27e1db3671..4fc1387295c2 100644
--- a/sdk/servicebus/tests.yml
+++ b/sdk/servicebus/tests.yml
@@ -12,7 +12,6 @@ extends:
         ServiceConnection: azure-sdk-tests
         SubscriptionConfigurationFilePaths:
           - eng/common/TestResources/sub-config/AzurePublicMsft.json
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
     EnvVars:
       AZURE_LOG_LEVEL: 1
     AdditionalMatrixConfigs:
diff --git a/sdk/spring/pipeline/tests-supported-spring-versions-template.yml b/sdk/spring/pipeline/tests-supported-spring-versions-template.yml
index d6f2d503b694..0c10f204d3bd 100644
--- a/sdk/spring/pipeline/tests-supported-spring-versions-template.yml
+++ b/sdk/spring/pipeline/tests-supported-spring-versions-template.yml
@@ -44,16 +44,17 @@ stages:
       Clouds: "Public"
       CloudConfig:
         Public:
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ServiceConnection: azure-sdk-tests
           SubscriptionConfigurationFilePaths:
             - eng/common/TestResources/sub-config/AzurePublicMsft.json
         UsGov:
-          SubscriptionConfiguration: $(sub-config-gov-test-resources)
           ServiceConnection: usgov_azure-sdk-tests
+          SubscriptionConfigurationFilePaths:
+            - eng/common/TestResources/sub-config/AzureUsGovMsft.json
         China:
-          SubscriptionConfiguration: $(sub-config-cn-test-resources)
           ServiceConnection: china_azure-sdk-tests
+          SubscriptionConfigurationFilePaths:
+            - eng/common/TestResources/sub-config/AzureChinaMsft.json
           Location: "chinanorth3"
       TestResourceDirectories: ${{ parameters.TestResourceDirectories }}
       Artifacts: ${{ parameters.Artifacts }}
diff --git a/sdk/storage/tests-template.yml b/sdk/storage/tests-template.yml
index 7d53c0c368fe..02d580c6269e 100644
--- a/sdk/storage/tests-template.yml
+++ b/sdk/storage/tests-template.yml
@@ -48,8 +48,9 @@ stages:
       Location: canadacentral
       CloudConfig:
         Preview:
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
           ServiceConnection: azure-sdk-tests-preview
+          SubscriptionConfigurationFilePaths:
+            - eng/common/TestResources/sub-config/AzurePreviewMsft.json
         PrivatePreview:
           SubscriptionConfiguration: $(sub-config-storage-test-resources)
       Clouds: Preview