diff --git a/eng/pipelines/templates/stages/archetype-sdk-client.yml b/eng/pipelines/templates/stages/archetype-sdk-client.yml
index 5b4ae1ba7..a9bc6a575 100644
--- a/eng/pipelines/templates/stages/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/stages/archetype-sdk-client.yml
@@ -49,14 +49,8 @@ parameters:
   default:
     Public:
       SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
-      # TODO: Migrate location override into azure-sdk-tools eng/common
-      # See https://github.com/Azure/azure-sdk-tools/issues/3398
-      Location: 'westus'
     Preview:
       SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
-      # TODO: Migrate location override into azure-sdk-tools eng/common
-      # See https://github.com/Azure/azure-sdk-tools/issues/3398
-      Location: 'westus'
     Canary:
       SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
       Location: 'eastus2euap'