diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml
index 65f3a2106016..a151938e6300 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-tests.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-tests.yml
@@ -54,23 +54,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)
-        Location: 'eastus2euap'
         ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
+        Location: 'eastus2euap'
       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/communication/Azure.Communication.CallAutomation/tests.yml b/sdk/communication/Azure.Communication.CallAutomation/tests.yml
index 2628a9d6474f..aaef5c694c83 100644
--- a/sdk/communication/Azure.Communication.CallAutomation/tests.yml
+++ b/sdk/communication/Azure.Communication.CallAutomation/tests.yml
@@ -10,7 +10,7 @@ extends:
       Public:
         ServiceConnection: azure-sdk-tests
         SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePublicMsft.json   
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         SubscriptionConfigurations:
           - $(sub-config-communication-services-cloud-test-resources-common)
           - $(sub-config-communication-services-cloud-test-resources-net)
diff --git a/sdk/communication/Azure.Communication.CallingServer/tests.yml b/sdk/communication/Azure.Communication.CallingServer/tests.yml
index c0ed92755f72..22e4107f906f 100644
--- a/sdk/communication/Azure.Communication.CallingServer/tests.yml
+++ b/sdk/communication/Azure.Communication.CallingServer/tests.yml
@@ -10,7 +10,7 @@ extends:
       Public:
         ServiceConnection: azure-sdk-tests
         SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePublicMsft.json   
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         SubscriptionConfigurations:
           - $(sub-config-communication-services-cloud-test-resources-common)
           - $(sub-config-communication-services-cloud-test-resources-net)
diff --git a/sdk/communication/Azure.Communication.Email/tests.yml b/sdk/communication/Azure.Communication.Email/tests.yml
index 2d03abe98a09..24286be95d28 100644
--- a/sdk/communication/Azure.Communication.Email/tests.yml
+++ b/sdk/communication/Azure.Communication.Email/tests.yml
@@ -30,4 +30,4 @@ extends:
     ${{ if eq(parameters.runOnlyPPE, false) }}:
       Clouds: Public,PPE,Int
     TestResourceDirectories:
-      - communication/Azure.Communication.Email/
\ No newline at end of file
+      - communication/Azure.Communication.Email/
diff --git a/sdk/digitaltwins/tests.yml b/sdk/digitaltwins/tests.yml
index ef2a0b428260..f75d7c49f83f 100644
--- a/sdk/digitaltwins/tests.yml
+++ b/sdk/digitaltwins/tests.yml
@@ -6,6 +6,8 @@ extends:
     ServiceDirectory: digitaltwins
     CloudConfig:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+        ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         Location: westcentralus
     Clouds: Public
diff --git a/sdk/documentintelligence/tests.yml b/sdk/documentintelligence/tests.yml
index 47b72a566551..f36931843304 100644
--- a/sdk/documentintelligence/tests.yml
+++ b/sdk/documentintelligence/tests.yml
@@ -6,6 +6,8 @@ extends:
     ServiceDirectory: documentintelligence
     CloudConfig:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+        ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         Location: 'eastus'
     SupportedClouds: 'Public'
diff --git a/sdk/extension-wcf/tests.yml b/sdk/extension-wcf/tests.yml
index c25c4f047827..53fbe6244970 100644
--- a/sdk/extension-wcf/tests.yml
+++ b/sdk/extension-wcf/tests.yml
@@ -9,7 +9,9 @@ extends:
     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
diff --git a/sdk/formrecognizer/tests.yml b/sdk/formrecognizer/tests.yml
index f71d85cf9e38..178ce8561bdf 100644
--- a/sdk/formrecognizer/tests.yml
+++ b/sdk/formrecognizer/tests.yml
@@ -13,10 +13,14 @@ extends:
     TimeoutInMinutes: 180
     CloudConfig:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+        ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         Location: '${{ parameters.Location }}'
       Canary:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+        ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         Location: 'centraluseuap'
     Clouds: 'Public'
     SupportedClouds: 'Public, Canary'
diff --git a/sdk/keyvault/tests.yml b/sdk/keyvault/tests.yml
index 61f5c8b96bf3..7593754fe258 100644
--- a/sdk/keyvault/tests.yml
+++ b/sdk/keyvault/tests.yml
@@ -11,15 +11,17 @@ extends:
     SupportedClouds: 'Public,UsGov,Canary'
     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)
       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:
@@ -28,8 +30,9 @@ extends:
         MatrixReplace:
          - 'ArmTemplateParameters=(.*)enableAttestation.*?\$true(.*)/$1enableAttestation \= $false$2'
       UsGov:
-        SubscriptionConfiguration: $(sub-config-gov-test-resources)
         ServiceConnection: usgov_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureUsGovMsft.json
         MatrixFilters:
          - ArmTemplateParameters=^(?!.*enableHsm.*true)
     MatrixConfigs:
diff --git a/sdk/monitor/Azure.Monitor.Ingestion/tests.yml b/sdk/monitor/Azure.Monitor.Ingestion/tests.yml
index 6b17ea7079a0..2a63070f55c2 100644
--- a/sdk/monitor/Azure.Monitor.Ingestion/tests.yml
+++ b/sdk/monitor/Azure.Monitor.Ingestion/tests.yml
@@ -4,12 +4,5 @@ extends:
     template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
     parameters:
       ServiceDirectory: monitor
-      CloudConfig:
-        Public:
-          SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-        UsGov:
-          SubscriptionConfiguration: $(sub-config-gov-test-resources)
-        China:
-          SubscriptionConfiguration: $(sub-config-cn-test-resources)
       SupportedClouds: 'Public,UsGov,China'
       Project: Azure.Monitor.Ingestion
diff --git a/sdk/search/tests.yml b/sdk/search/tests.yml
index 70bc6397ace9..f718501131cf 100644
--- a/sdk/search/tests.yml
+++ b/sdk/search/tests.yml
@@ -13,9 +13,13 @@ extends:
     SupportedClouds: 'Preview,UsGov'
     CloudConfig:
       Preview:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
+        ServiceConnection: azure-sdk-tests-preview
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePreviewMsft.json
         Location: 'westus'
       UsGov:
-        SubscriptionConfiguration: $(sub-config-gov-test-resources)
+        ServiceConnection: usgov_azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzureUsGovMsft.json
     EnvVars:
       AZURE_SEARCH_TEST_MODE: Live
diff --git a/sdk/storage/tests.datamovement.yml b/sdk/storage/tests.datamovement.yml
index 5ade75c541c0..e46100e4fc19 100644
--- a/sdk/storage/tests.datamovement.yml
+++ b/sdk/storage/tests.datamovement.yml
@@ -10,7 +10,9 @@ extends:
     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
diff --git a/sdk/storage/tests.functions.yml b/sdk/storage/tests.functions.yml
index 55a5afadb16a..892c26267508 100644
--- a/sdk/storage/tests.functions.yml
+++ b/sdk/storage/tests.functions.yml
@@ -10,7 +10,9 @@ extends:
     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
diff --git a/sdk/storage/tests.mgmt.yml b/sdk/storage/tests.mgmt.yml
index f6bd4ad1c418..6e1cd0ccea45 100644
--- a/sdk/storage/tests.mgmt.yml
+++ b/sdk/storage/tests.mgmt.yml
@@ -10,7 +10,9 @@ extends:
     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
diff --git a/sdk/storage/tests.yml b/sdk/storage/tests.yml
index 89d19a3c55a3..aa89c7677ca3 100644
--- a/sdk/storage/tests.yml
+++ b/sdk/storage/tests.yml
@@ -10,8 +10,9 @@ extends:
     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
diff --git a/sdk/textanalytics/tests.yml b/sdk/textanalytics/tests.yml
index 180550a49b96..bc8f56d3baa1 100644
--- a/sdk/textanalytics/tests.yml
+++ b/sdk/textanalytics/tests.yml
@@ -12,12 +12,18 @@ extends:
     ServiceDirectory: textanalytics
     CloudConfig:
       Public:
-        SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
+        ServiceConnection: azure-sdk-tests
+        SubscriptionConfigurationFilePaths:
+          - eng/common/TestResources/sub-config/AzurePublicMsft.json
         Location: '${{ parameters.Location }}'
       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
     SupportedClouds: 'Public,UsGov,China'
     # temporary env vars for custom text features
     EnvVars: