diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index 5fba6f8dea..2059f5d113 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -55,26 +55,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
-        SubscriptionConfigurationFilePaths:
-          - eng/common/TestResources/sub-config/AzurePublicMsft.json
-        Location: 'eastus2euap'
+      # 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: Clouds
     type: string
     default: Public
diff --git a/eng/pipelines/templates/stages/archetype-sdk-tests.yml b/eng/pipelines/templates/stages/archetype-sdk-tests.yml
index 989baaaf82..e6a77c875a 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-tests.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-tests.yml
@@ -60,12 +60,12 @@ stages:
               OsVmImage: $(LINUXVMIMAGE)
               Pool: $(LINUXPOOL)
               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 }}
                 SubscriptionConfigurationFilePaths: ${{ cloud.value.SubscriptionConfigurationFilePaths }}
-                ServiceConnection: ${{ cloud.value.ServiceConnection }}
               AdditionalParameters:
                 Location: ${{ parameters.Location}}
                 ServiceDirectory: ${{ parameters.ServiceDirectory}}
diff --git a/sdk/attestation/ci.yml b/sdk/attestation/ci.yml
index 9be5362525..3edd41ac61 100644
--- a/sdk/attestation/ci.yml
+++ b/sdk/attestation/ci.yml
@@ -26,7 +26,6 @@ extends:
     template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
     parameters:
       ServiceDirectory: attestation
-      Clouds: Public
       Location: WestUS
       CtestRegex: azure-security-attestation.*
       LiveTestCtestRegex: azure-security-attestation.*
diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml
index ddf0129e76..25472319d5 100644
--- a/sdk/storage/ci.yml
+++ b/sdk/storage/ci.yml
@@ -31,8 +31,6 @@ extends:
       LineCoverageTarget: 81
       BranchCoverageTarget: 47
       LiveTestCtestRegex: azure-storage
-      Clouds: Preview
-      SupportedClouds: Preview
       Artifacts:
         - Name: azure-storage-common
           Path: azure-storage-common
diff --git a/sdk/tables/ci.yml b/sdk/tables/ci.yml
index 350b30e121..3046c5f43b 100644
--- a/sdk/tables/ci.yml
+++ b/sdk/tables/ci.yml
@@ -31,8 +31,6 @@ extends:
       LineCoverageTarget: 77
       BranchCoverageTarget: 42
       LiveTestCtestRegex: azure-data
-      Clouds: Preview
-      SupportedClouds: Preview
       Artifacts:
         - Name: azure-data-tables
           Path: azure-data-tables