diff --git a/.apigentools-info b/.apigentools-info
index 871825ed5e6..22e293670a7 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.4.1.dev11",
-            "regenerated": "2021-08-25 12:39:32.590874",
-            "spec_repo_commit": "db0de24"
+            "regenerated": "2021-08-26 13:14:25.061734",
+            "spec_repo_commit": "49b34e1"
         },
         "v2": {
             "apigentools_version": "1.4.1.dev11",
-            "regenerated": "2021-08-25 12:41:07.457136",
-            "spec_repo_commit": "db0de24"
+            "regenerated": "2021-08-26 13:15:53.142049",
+            "spec_repo_commit": "49b34e1"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/templates/configuration.mustache b/.generator/templates/configuration.mustache
index 8841ae13af0..9920f986e53 100644
--- a/.generator/templates/configuration.mustache
+++ b/.generator/templates/configuration.mustache
@@ -79,6 +79,9 @@ export function createConfiguration(conf: ConfigurationParameters = {}): Configu
     if (process.env.DD_SITE) {
         let serverConf = server1.getConfiguration();
         server1.setVariables({"site": process.env.DD_SITE} as (typeof serverConf));
+        for (const op in operationServers) {
+            (operationServers[op][0] as any).setVariables({ site: process.env.DD_SITE });
+        }
     }
 
     const authMethods = conf.authMethods || {};
diff --git a/packages/datadog-api-client-v1/configuration.ts b/packages/datadog-api-client-v1/configuration.ts
index bdb4f35ad12..4acb3269c39 100644
--- a/packages/datadog-api-client-v1/configuration.ts
+++ b/packages/datadog-api-client-v1/configuration.ts
@@ -86,6 +86,11 @@ export function createConfiguration(
   if (process.env.DD_SITE) {
     const serverConf = server1.getConfiguration();
     server1.setVariables({ site: process.env.DD_SITE } as typeof serverConf);
+    for (const op in operationServers) {
+      (operationServers[op][0] as any).setVariables({
+        site: process.env.DD_SITE,
+      });
+    }
   }
 
   const authMethods = conf.authMethods || {};
diff --git a/packages/datadog-api-client-v2/configuration.ts b/packages/datadog-api-client-v2/configuration.ts
index bdb4f35ad12..4acb3269c39 100644
--- a/packages/datadog-api-client-v2/configuration.ts
+++ b/packages/datadog-api-client-v2/configuration.ts
@@ -86,6 +86,11 @@ export function createConfiguration(
   if (process.env.DD_SITE) {
     const serverConf = server1.getConfiguration();
     server1.setVariables({ site: process.env.DD_SITE } as typeof serverConf);
+    for (const op in operationServers) {
+      (operationServers[op][0] as any).setVariables({
+        site: process.env.DD_SITE,
+      });
+    }
   }
 
   const authMethods = conf.authMethods || {};