diff --git a/.apigentools-info b/.apigentools-info
index 3023740da0f..c09aca0ffc8 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-12-20 16:44:27.418644",
-            "spec_repo_commit": "ec3c91a9"
+            "regenerated": "2022-12-21 08:59:16.961898",
+            "spec_repo_commit": "8c6f581a"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-12-20 16:44:27.430114",
-            "spec_repo_commit": "ec3c91a9"
+            "regenerated": "2022-12-21 08:59:16.973588",
+            "spec_repo_commit": "8c6f581a"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index fb4e260e6fe..7b456544dbc 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -1434,7 +1434,11 @@ components:
         by:
           additionalProperties:
             description: The values for each group-by.
-            type: string
+            oneOf:
+            - type: string
+            - format: double
+              type: number
+            - type: boolean
           description: The key-value pairs for each group-by.
           example:
             '@ci.provider.name': gitlab
@@ -1687,7 +1691,11 @@ components:
         by:
           additionalProperties:
             description: The values for each group-by.
-            type: string
+            oneOf:
+            - type: string
+            - format: double
+              type: number
+            - type: boolean
           description: The key-value pairs for each group-by.
           example:
             '@test.service': web-ui-tests
diff --git a/api/datadogV2/model_ci_app_pipelines_bucket_response.go b/api/datadogV2/model_ci_app_pipelines_bucket_response.go
index d9c7281e13c..b0cc5e217d3 100644
--- a/api/datadogV2/model_ci_app_pipelines_bucket_response.go
+++ b/api/datadogV2/model_ci_app_pipelines_bucket_response.go
@@ -11,7 +11,7 @@ import (
 // CIAppPipelinesBucketResponse Bucket values.
 type CIAppPipelinesBucketResponse struct {
 	// The key-value pairs for each group-by.
-	By map[string]string `json:"by,omitempty"`
+	By map[string]interface{} `json:"by,omitempty"`
 	// A map of the metric name to value for regular compute, or a list of values for a timeseries.
 	Computes map[string]CIAppAggregateBucketValue `json:"computes,omitempty"`
 	// UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct
@@ -37,9 +37,9 @@ func NewCIAppPipelinesBucketResponseWithDefaults() *CIAppPipelinesBucketResponse
 }
 
 // GetBy returns the By field value if set, zero value otherwise.
-func (o *CIAppPipelinesBucketResponse) GetBy() map[string]string {
+func (o *CIAppPipelinesBucketResponse) GetBy() map[string]interface{} {
 	if o == nil || o.By == nil {
-		var ret map[string]string
+		var ret map[string]interface{}
 		return ret
 	}
 	return o.By
@@ -47,7 +47,7 @@ func (o *CIAppPipelinesBucketResponse) GetBy() map[string]string {
 
 // GetByOk returns a tuple with the By field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *CIAppPipelinesBucketResponse) GetByOk() (*map[string]string, bool) {
+func (o *CIAppPipelinesBucketResponse) GetByOk() (*map[string]interface{}, bool) {
 	if o == nil || o.By == nil {
 		return nil, false
 	}
@@ -59,8 +59,8 @@ func (o *CIAppPipelinesBucketResponse) HasBy() bool {
 	return o != nil && o.By != nil
 }
 
-// SetBy gets a reference to the given map[string]string and assigns it to the By field.
-func (o *CIAppPipelinesBucketResponse) SetBy(v map[string]string) {
+// SetBy gets a reference to the given map[string]interface{} and assigns it to the By field.
+func (o *CIAppPipelinesBucketResponse) SetBy(v map[string]interface{}) {
 	o.By = v
 }
 
@@ -115,7 +115,7 @@ func (o CIAppPipelinesBucketResponse) MarshalJSON() ([]byte, error) {
 func (o *CIAppPipelinesBucketResponse) UnmarshalJSON(bytes []byte) (err error) {
 	raw := map[string]interface{}{}
 	all := struct {
-		By       map[string]string                    `json:"by,omitempty"`
+		By       map[string]interface{}               `json:"by,omitempty"`
 		Computes map[string]CIAppAggregateBucketValue `json:"computes,omitempty"`
 	}{}
 	err = json.Unmarshal(bytes, &all)
diff --git a/api/datadogV2/model_ci_app_tests_bucket_response.go b/api/datadogV2/model_ci_app_tests_bucket_response.go
index 044bb374717..09960b257ba 100644
--- a/api/datadogV2/model_ci_app_tests_bucket_response.go
+++ b/api/datadogV2/model_ci_app_tests_bucket_response.go
@@ -11,7 +11,7 @@ import (
 // CIAppTestsBucketResponse Bucket values.
 type CIAppTestsBucketResponse struct {
 	// The key-value pairs for each group-by.
-	By map[string]string `json:"by,omitempty"`
+	By map[string]interface{} `json:"by,omitempty"`
 	// A map of the metric name to value for regular compute, or a list of values for a timeseries.
 	Computes map[string]CIAppAggregateBucketValue `json:"computes,omitempty"`
 	// UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct
@@ -37,9 +37,9 @@ func NewCIAppTestsBucketResponseWithDefaults() *CIAppTestsBucketResponse {
 }
 
 // GetBy returns the By field value if set, zero value otherwise.
-func (o *CIAppTestsBucketResponse) GetBy() map[string]string {
+func (o *CIAppTestsBucketResponse) GetBy() map[string]interface{} {
 	if o == nil || o.By == nil {
-		var ret map[string]string
+		var ret map[string]interface{}
 		return ret
 	}
 	return o.By
@@ -47,7 +47,7 @@ func (o *CIAppTestsBucketResponse) GetBy() map[string]string {
 
 // GetByOk returns a tuple with the By field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *CIAppTestsBucketResponse) GetByOk() (*map[string]string, bool) {
+func (o *CIAppTestsBucketResponse) GetByOk() (*map[string]interface{}, bool) {
 	if o == nil || o.By == nil {
 		return nil, false
 	}
@@ -59,8 +59,8 @@ func (o *CIAppTestsBucketResponse) HasBy() bool {
 	return o != nil && o.By != nil
 }
 
-// SetBy gets a reference to the given map[string]string and assigns it to the By field.
-func (o *CIAppTestsBucketResponse) SetBy(v map[string]string) {
+// SetBy gets a reference to the given map[string]interface{} and assigns it to the By field.
+func (o *CIAppTestsBucketResponse) SetBy(v map[string]interface{}) {
 	o.By = v
 }
 
@@ -115,7 +115,7 @@ func (o CIAppTestsBucketResponse) MarshalJSON() ([]byte, error) {
 func (o *CIAppTestsBucketResponse) UnmarshalJSON(bytes []byte) (err error) {
 	raw := map[string]interface{}{}
 	all := struct {
-		By       map[string]string                    `json:"by,omitempty"`
+		By       map[string]interface{}               `json:"by,omitempty"`
 		Computes map[string]CIAppAggregateBucketValue `json:"computes,omitempty"`
 	}{}
 	err = json.Unmarshal(bytes, &all)