diff --git a/packages/samples/common-types/openapi/v3/types.json b/packages/samples/common-types/openapi/v3/types.json
index f69f5b0899..67b02967ad 100644
--- a/packages/samples/common-types/openapi/v3/types.json
+++ b/packages/samples/common-types/openapi/v3/types.json
@@ -709,7 +709,7 @@
       "required": true,
       "type": "string",
       "minLength": 1,
-      "x-ms-parameter-location": "method",
+      "x-ms-parameter-location": "client",
       "x-ms-client-name": "apiVersion"
     },
     "LocationParameter": {
@@ -747,7 +747,7 @@
       "description": "The ID of the target subscription.  The value must be an UUID.",
       "required": true,
       "type": "string",
-      "x-ms-parameter-location": "method"
+      "x-ms-parameter-location": "client"
     }
   }
 }
\ No newline at end of file
diff --git a/packages/samples/common-types/openapi/v4/types.json b/packages/samples/common-types/openapi/v4/types.json
index 258b93f348..b849c6ced6 100644
--- a/packages/samples/common-types/openapi/v4/types.json
+++ b/packages/samples/common-types/openapi/v4/types.json
@@ -720,7 +720,7 @@
       "required": true,
       "type": "string",
       "minLength": 1,
-      "x-ms-parameter-location": "method",
+      "x-ms-parameter-location": "client",
       "x-ms-client-name": "apiVersion"
     },
     "LocationParameter": {
@@ -779,7 +779,7 @@
       "required": true,
       "type": "string",
       "format": "uuid",
-      "x-ms-parameter-location": "method"
+      "x-ms-parameter-location": "client"
     },
     "TenantIdParameter": {
       "name": "tenantId",
diff --git a/packages/samples/common-types/openapi/v5/types.json b/packages/samples/common-types/openapi/v5/types.json
index 47e8491dae..56edf6eb39 100644
--- a/packages/samples/common-types/openapi/v5/types.json
+++ b/packages/samples/common-types/openapi/v5/types.json
@@ -720,7 +720,7 @@
       "required": true,
       "type": "string",
       "minLength": 1,
-      "x-ms-parameter-location": "method",
+      "x-ms-parameter-location": "client",
       "x-ms-client-name": "apiVersion"
     },
     "LocationParameter": {
@@ -779,7 +779,7 @@
       "required": true,
       "type": "string",
       "format": "uuid",
-      "x-ms-parameter-location": "method"
+      "x-ms-parameter-location": "client"
     },
     "TenantIdParameter": {
       "name": "tenantId",
diff --git a/packages/samples/common-types/src/types.tsp b/packages/samples/common-types/src/types.tsp
index 02c44006e3..4aebb339f2 100644
--- a/packages/samples/common-types/src/types.tsp
+++ b/packages/samples/common-types/src/types.tsp
@@ -5,11 +5,8 @@ using OpenAPI;
 
 namespace Azure.ResourceManager.CommonTypes;
 
-@@extension(OperationIdParameter, "x-ms-parameter-location", "method");
-
-@@extension(ResourceGroupNameParameter, "x-ms-parameter-location", "method");
-
-@@extension(LocationParameter, "x-ms-parameter-location", "method");
+@@extension(ApiVersionParameter.apiVersion, "x-ms-parameter-location", "client");
+@@extension(SubscriptionIdParameter.subscriptionId, "x-ms-parameter-location", "client");
 
 op registerParams(
   ...ApiVersionParameter,