diff --git a/.apigentools-info b/.apigentools-info
index 6f95206d815..1bc2c049a5d 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.2",
-            "regenerated": "2022-03-25 15:29:48.241851",
-            "spec_repo_commit": "21c754c0"
+            "regenerated": "2022-03-25 20:48:28.119080",
+            "spec_repo_commit": "e401bea6"
         },
         "v2": {
             "apigentools_version": "1.6.2",
-            "regenerated": "2022-03-25 15:29:48.259537",
-            "spec_repo_commit": "21c754c0"
+            "regenerated": "2022-03-25 20:48:28.136587",
+            "spec_repo_commit": "e401bea6"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index d884e9d359e..7aff45d8d26 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -12893,8 +12893,6 @@ components:
       - lambda_functions_percentage
       - lambda_invocations_usage
       - lambda_invocations_percentage
-      - lambda_usage
-      - lambda_percentage
       - estimated_indexed_logs_usage
       - estimated_indexed_logs_percentage
       type: string
@@ -12919,8 +12917,6 @@ components:
       - LAMBDA_FUNCTIONS_PERCENTAGE
       - LAMBDA_INVOCATIONS_USAGE
       - LAMBDA_INVOCATIONS_PERCENTAGE
-      - LAMBDA_USAGE
-      - LAMBDA_PERCENTAGE
       - ESTIMATED_INDEXED_LOGS_USAGE
       - ESTIMATED_INDEXED_LOGS_PERCENTAGE
     UsageAttributionSupportedMetrics:
@@ -12936,14 +12932,12 @@ components:
       - infra_host_usage
       - custom_timeseries_percentage
       - container_percentage
-      - lambda_usage
       - api_usage
       - apm_host_percentage
       - infra_host_percentage
       - snmp_usage
       - browser_percentage
       - api_percentage
-      - lambda_percentage
       - npm_host_usage
       - lambda_functions_usage
       - lambda_functions_percentage
@@ -12973,14 +12967,12 @@ components:
       - INFRA_HOST_USAGE
       - CUSTOM_TIMESERIES_PERCENTAGE
       - CONTAINER_PERCENTAGE
-      - LAMBDA_USAGE
       - API_USAGE
       - APM_HOST_PERCENTAGE
       - INFRA_HOST_PERCENTAGE
       - SNMP_USAGE
       - BROWSER_PERCENTAGE
       - API_PERCENTAGE
-      - LAMBDA_PERCENTAGE
       - NPM_HOST_USAGE
       - LAMBDA_FUNCTIONS_USAGE
       - LAMBDA_FUNCTIONS_PERCENTAGE
@@ -13138,20 +13130,6 @@ components:
           description: The Lambda invocation usage by tag(s).
           format: double
           type: number
-        lambda_percentage:
-          description: 'The percentage of Lambda function usage by tag(s).
-
-
-            **Note** this field is deprecated. Use lambda_functions_percentage instead.'
-          format: double
-          type: number
-        lambda_usage:
-          description: 'The Lambda function usage by tag(s).
-
-
-            **Note** this field is deprecated. Use lambda_functions_usage instead.'
-          format: double
-          type: number
         npm_host_percentage:
           description: The percentage of network host usage by tag(s).
           format: double
diff --git a/packages/datadog-api-client-v1/models/ObjectSerializer.ts b/packages/datadog-api-client-v1/models/ObjectSerializer.ts
index 6f2d0ac7560..1621526a87f 100644
--- a/packages/datadog-api-client-v1/models/ObjectSerializer.ts
+++ b/packages/datadog-api-client-v1/models/ObjectSerializer.ts
@@ -1014,8 +1014,6 @@ const enumsMap: { [key: string]: any[] } = {
     "lambda_functions_percentage",
     "lambda_invocations_usage",
     "lambda_invocations_percentage",
-    "lambda_usage",
-    "lambda_percentage",
     "estimated_indexed_logs_usage",
     "estimated_indexed_logs_percentage",
   ],
@@ -1029,14 +1027,12 @@ const enumsMap: { [key: string]: any[] } = {
     "infra_host_usage",
     "custom_timeseries_percentage",
     "container_percentage",
-    "lambda_usage",
     "api_usage",
     "apm_host_percentage",
     "infra_host_percentage",
     "snmp_usage",
     "browser_percentage",
     "api_percentage",
-    "lambda_percentage",
     "npm_host_usage",
     "lambda_functions_usage",
     "lambda_functions_percentage",
diff --git a/packages/datadog-api-client-v1/models/UsageAttributionSort.ts b/packages/datadog-api-client-v1/models/UsageAttributionSort.ts
index 9a4075c8ebe..1732ad90b3e 100644
--- a/packages/datadog-api-client-v1/models/UsageAttributionSort.ts
+++ b/packages/datadog-api-client-v1/models/UsageAttributionSort.ts
@@ -29,8 +29,6 @@ export type UsageAttributionSort =
   | typeof LAMBDA_FUNCTIONS_PERCENTAGE
   | typeof LAMBDA_INVOCATIONS_USAGE
   | typeof LAMBDA_INVOCATIONS_PERCENTAGE
-  | typeof LAMBDA_USAGE
-  | typeof LAMBDA_PERCENTAGE
   | typeof ESTIMATED_INDEXED_LOGS_USAGE
   | typeof ESTIMATED_INDEXED_LOGS_PERCENTAGE;
 export const API_PERCENTAGE = "api_percentage";
@@ -53,8 +51,6 @@ export const LAMBDA_FUNCTIONS_USAGE = "lambda_functions_usage";
 export const LAMBDA_FUNCTIONS_PERCENTAGE = "lambda_functions_percentage";
 export const LAMBDA_INVOCATIONS_USAGE = "lambda_invocations_usage";
 export const LAMBDA_INVOCATIONS_PERCENTAGE = "lambda_invocations_percentage";
-export const LAMBDA_USAGE = "lambda_usage";
-export const LAMBDA_PERCENTAGE = "lambda_percentage";
 export const ESTIMATED_INDEXED_LOGS_USAGE = "estimated_indexed_logs_usage";
 export const ESTIMATED_INDEXED_LOGS_PERCENTAGE =
   "estimated_indexed_logs_percentage";
diff --git a/packages/datadog-api-client-v1/models/UsageAttributionSupportedMetrics.ts b/packages/datadog-api-client-v1/models/UsageAttributionSupportedMetrics.ts
index 71d8c0ac684..37794195fd5 100644
--- a/packages/datadog-api-client-v1/models/UsageAttributionSupportedMetrics.ts
+++ b/packages/datadog-api-client-v1/models/UsageAttributionSupportedMetrics.ts
@@ -18,14 +18,12 @@ export type UsageAttributionSupportedMetrics =
   | typeof INFRA_HOST_USAGE
   | typeof CUSTOM_TIMESERIES_PERCENTAGE
   | typeof CONTAINER_PERCENTAGE
-  | typeof LAMBDA_USAGE
   | typeof API_USAGE
   | typeof APM_HOST_PERCENTAGE
   | typeof INFRA_HOST_PERCENTAGE
   | typeof SNMP_USAGE
   | typeof BROWSER_PERCENTAGE
   | typeof API_PERCENTAGE
-  | typeof LAMBDA_PERCENTAGE
   | typeof NPM_HOST_USAGE
   | typeof LAMBDA_FUNCTIONS_USAGE
   | typeof LAMBDA_FUNCTIONS_PERCENTAGE
@@ -53,14 +51,12 @@ export const NPM_HOST_PERCENTAGE = "npm_host_percentage";
 export const INFRA_HOST_USAGE = "infra_host_usage";
 export const CUSTOM_TIMESERIES_PERCENTAGE = "custom_timeseries_percentage";
 export const CONTAINER_PERCENTAGE = "container_percentage";
-export const LAMBDA_USAGE = "lambda_usage";
 export const API_USAGE = "api_usage";
 export const APM_HOST_PERCENTAGE = "apm_host_percentage";
 export const INFRA_HOST_PERCENTAGE = "infra_host_percentage";
 export const SNMP_USAGE = "snmp_usage";
 export const BROWSER_PERCENTAGE = "browser_percentage";
 export const API_PERCENTAGE = "api_percentage";
-export const LAMBDA_PERCENTAGE = "lambda_percentage";
 export const NPM_HOST_USAGE = "npm_host_usage";
 export const LAMBDA_FUNCTIONS_USAGE = "lambda_functions_usage";
 export const LAMBDA_FUNCTIONS_PERCENTAGE = "lambda_functions_percentage";
diff --git a/packages/datadog-api-client-v1/models/UsageAttributionValues.ts b/packages/datadog-api-client-v1/models/UsageAttributionValues.ts
index a7f25939e06..190b4edc614 100644
--- a/packages/datadog-api-client-v1/models/UsageAttributionValues.ts
+++ b/packages/datadog-api-client-v1/models/UsageAttributionValues.ts
@@ -135,14 +135,6 @@ export class UsageAttributionValues {
    * The Lambda invocation usage by tag(s).
    */
   "lambdaInvocationsUsage"?: number;
-  /**
-   * The percentage of Lambda function usage by tag(s).  **Note** this field is deprecated. Use lambda_functions_percentage instead.
-   */
-  "lambdaPercentage"?: number;
-  /**
-   * The Lambda function usage by tag(s).  **Note** this field is deprecated. Use lambda_functions_usage instead.
-   */
-  "lambdaUsage"?: number;
   /**
    * The percentage of network host usage by tag(s).
    */
@@ -335,16 +327,6 @@ export class UsageAttributionValues {
       type: "number",
       format: "double",
     },
-    lambdaPercentage: {
-      baseName: "lambda_percentage",
-      type: "number",
-      format: "double",
-    },
-    lambdaUsage: {
-      baseName: "lambda_usage",
-      type: "number",
-      format: "double",
-    },
     npmHostPercentage: {
       baseName: "npm_host_percentage",
       type: "number",