diff --git a/.apigentools-info b/.apigentools-info
index 19996058b7..39ddf40852 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2023-12-06 21:12:03.452706",
-            "spec_repo_commit": "09d1112a"
+            "regenerated": "2023-12-07 15:26:39.803971",
+            "spec_repo_commit": "440c93b5"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2023-12-06 21:12:03.472732",
-            "spec_repo_commit": "09d1112a"
+            "regenerated": "2023-12-07 15:26:39.818123",
+            "spec_repo_commit": "440c93b5"
         }
     }
 }
\ No newline at end of file
diff --git a/tests/v2/cassettes/test_scenarios/test_configure_tags_for_multiple_metrics_returns_accepted_response.frozen b/tests/v2/cassettes/test_scenarios/test_configure_tags_for_multiple_metrics_returns_accepted_response.frozen
index e9526d4baf..bdcf91b332 100644
--- a/tests/v2/cassettes/test_scenarios/test_configure_tags_for_multiple_metrics_returns_accepted_response.frozen
+++ b/tests/v2/cassettes/test_scenarios/test_configure_tags_for_multiple_metrics_returns_accepted_response.frozen
@@ -1 +1 @@
-2022-05-12T09:52:29.805Z
\ No newline at end of file
+2023-12-07T15:20:06.421Z
\ No newline at end of file
diff --git a/tests/v2/cassettes/test_scenarios/test_configure_tags_for_multiple_metrics_returns_accepted_response.yaml b/tests/v2/cassettes/test_scenarios/test_configure_tags_for_multiple_metrics_returns_accepted_response.yaml
index f1bbefbbdf..9feae4c740 100644
--- a/tests/v2/cassettes/test_scenarios/test_configure_tags_for_multiple_metrics_returns_accepted_response.yaml
+++ b/tests/v2/cassettes/test_scenarios/test_configure_tags_for_multiple_metrics_returns_accepted_response.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: '{"data":{"attributes":{"email":"Test-Configure_tags_for_multiple_metrics_returns_Accepted_response-1652349149@datadoghq.com","title":"user
+    body: '{"data":{"attributes":{"email":"Test-Configure_tags_for_multiple_metrics_returns_Accepted_response-1701962406@datadoghq.com","title":"user
       title"},"type":"users"}}'
     headers:
       accept:
@@ -11,8 +11,10 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/users
   response:
     body:
-      string: '{"data":{"type":"users","id":"3cf23548-d1d9-11ec-ad3d-da7ad0900002","attributes":{"name":null,"handle":"test-configure_tags_for_multiple_metrics_returns_accepted_response-1652349149@datadoghq.com","created_at":"2022-05-12T09:52:30.224025+00:00","modified_at":"2022-05-12T09:52:30.279356+00:00","email":"test-configure_tags_for_multiple_metrics_returns_accepted_response-1652349149@datadoghq.com","icon":"https://secure.gravatar.com/avatar/37b97ed3403eaebb504eab5b74a44f2a?s=48&d=retro","title":"user
-        title","verified":false,"service_account":false,"disabled":false,"allowed_login_methods":[],"status":"Pending"},"relationships":{"roles":{"data":[]},"org":{"data":{"type":"orgs","id":"4dee724d-00cc-11ea-a77b-570c9d03c6c5"}}}}}'
+      string: '{"data":{"type":"users","id":"1a6aac59-9514-11ee-8d56-0adb1a638a47","attributes":{"name":null,"handle":"test-configure_tags_for_multiple_metrics_returns_accepted_response-1701962406@datadoghq.com","created_at":"2023-12-07T15:20:07.014747+00:00","modified_at":"2023-12-07T15:20:07.014747+00:00","email":"test-configure_tags_for_multiple_metrics_returns_accepted_response-1701962406@datadoghq.com","icon":"https://secure.gravatar.com/avatar/0a707b27174d49cd592ec7a4fc13bc4d?s=48&d=retro","title":"user
+        title","verified":false,"service_account":false,"disabled":false,"allowed_login_methods":[],"status":"Pending"},"relationships":{"roles":{"data":[]},"org":{"data":{"type":"orgs","id":"3386799c-00cc-11ea-a77b-eb0f88a49e0f"}}}}}
+
+        '
     headers:
       content-type:
       - application/json
@@ -20,7 +22,7 @@ interactions:
       code: 201
       message: Created
 - request:
-    body: '{"data":{"attributes":{"emails":["test-configure_tags_for_multiple_metrics_returns_accepted_response-1652349149@datadoghq.com"],"tags":["test","testconfiguretagsformultiplemetricsreturnsacceptedresponse1652349149"]},"id":"system.load.1","type":"metric_bulk_configure_tags"}}'
+    body: '{"data":{"attributes":{"emails":["test-configure_tags_for_multiple_metrics_returns_accepted_response-1701962406@datadoghq.com"],"tags":["test","testconfiguretagsformultiplemetricsreturnsacceptedresponse1701962406"]},"id":"system.load.1","type":"metric_bulk_configure_tags"}}'
     headers:
       accept:
       - application/json
@@ -30,7 +32,9 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/metrics/config/bulk-tags
   response:
     body:
-      string: '{"data":{"type":"metric_bulk_configure_tags","id":"system.load.1","attributes":{"tags":["test","testconfiguretagsformultiplemetricsreturnsacceptedresponse1652349149"],"emails":["test-configure_tags_for_multiple_metrics_returns_accepted_response-1652349149@datadoghq.com"],"status":"Accepted"}}}'
+      string: '{"data":{"type":"metric_bulk_configure_tags","id":"system.load.1","attributes":{"tags":["test","testconfiguretagsformultiplemetricsreturnsacceptedresponse1701962406"],"emails":["test-configure_tags_for_multiple_metrics_returns_accepted_response-1701962406@datadoghq.com"],"status":"Accepted","exclude_tags_mode":null}}}
+
+        '
     headers:
       content-type:
       - application/json
@@ -38,7 +42,7 @@ interactions:
       code: 202
       message: Accepted
 - request:
-    body: '{"data":{"attributes":{"emails":["test-configure_tags_for_multiple_metrics_returns_accepted_response-1652349149@datadoghq.com"],"status":"Accepted","tags":["test","testconfiguretagsformultiplemetricsreturnsacceptedresponse1652349149"]},"id":"system.load.1","type":"metric_bulk_configure_tags"}}'
+    body: '{"data":{"attributes":{"emails":["test-configure_tags_for_multiple_metrics_returns_accepted_response-1701962406@datadoghq.com"]},"id":"system.load.1","type":"metric_bulk_configure_tags"}}'
     headers:
       accept:
       - application/json
@@ -48,7 +52,9 @@ interactions:
     uri: https://api.datadoghq.com/api/v2/metrics/config/bulk-tags
   response:
     body:
-      string: '{"data":{"type":"metric_bulk_configure_tags","id":"system.load.1","attributes":{"emails":["test-configure_tags_for_multiple_metrics_returns_accepted_response-1652349149@datadoghq.com"],"status":"Accepted"}}}'
+      string: '{"data":{"type":"metric_bulk_configure_tags","id":"system.load.1","attributes":{"emails":["test-configure_tags_for_multiple_metrics_returns_accepted_response-1701962406@datadoghq.com"],"status":"Accepted"}}}
+
+        '
     headers:
       content-type:
       - application/json
@@ -61,7 +67,7 @@ interactions:
       accept:
       - '*/*'
     method: DELETE
-    uri: https://api.datadoghq.com/api/v2/users/3cf23548-d1d9-11ec-ad3d-da7ad0900002
+    uri: https://api.datadoghq.com/api/v2/users/1a6aac59-9514-11ee-8d56-0adb1a638a47
   response:
     body:
       string: ''
diff --git a/tests/v2/features/undo.json b/tests/v2/features/undo.json
index 3830272741..fa0946c219 100644
--- a/tests/v2/features/undo.json
+++ b/tests/v2/features/undo.json
@@ -968,7 +968,7 @@
       "parameters": [
         {
           "name": "body",
-          "source": ""
+          "template": "{\n  \"data\": {\n    \"id\":\"{{ data.id }}\",\n    \"type\":\"metric_bulk_configure_tags\",\n    \"attributes\": {\n      \"emails\": [\"{{ data.attributes.emails[0] }}\"]\n    }\n  }\n}"
         }
       ],
       "type": "unsafe"