diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
index 96018843d061..892532128f0a 100644
--- a/.generator/schemas/v2/openapi.yaml
+++ b/.generator/schemas/v2/openapi.yaml
@@ -141466,7 +141466,11 @@ paths:
           - cloud_cost_management_write
   /api/v2/cost/oci_config:
     get:
-      description: List the OCI configs.
+      deprecated: true
+      description: |-
+        **Note**: This endpoint is deprecated. View OCI accounts in Cloud Cost Settings in the Datadog web application instead.
+
+        List the OCI configs.
       operationId: ListCostOCIConfigs
       responses:
         "200":
@@ -141507,6 +141511,7 @@ paths:
         operator: OR
         permissions:
           - cloud_cost_management_read
+      x-sunset: "2027-01-01"
   /api/v2/cost/recommendations:
     post:
       description: List cost recommendations matching a filter, with pagination and sorting.
diff --git a/features/generated-test/test-server b/features/generated-test/test-server
index 899230cbccd5..a7224b2c64cd 100755
--- a/features/generated-test/test-server
+++ b/features/generated-test/test-server
@@ -16,7 +16,7 @@ import re
 import tempfile
 import threading
 import uuid
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from http import HTTPStatus
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 from pathlib import Path
@@ -435,7 +435,8 @@ def _json_contains(actual: Any, expected: Any) -> bool:
         return all(key in actual and _json_contains(actual[key], value) for key, value in expected.items())
     if isinstance(expected, list) and isinstance(actual, list):
         return len(expected) == len(actual) and all(
-            _json_contains(actual_item, expected_item) for actual_item, expected_item in zip(actual, expected)
+            _json_contains(actual_item, expected_item)
+            for actual_item, expected_item in zip(actual, expected, strict=False)
         )
     return actual == expected
 
@@ -460,7 +461,7 @@ def _slug(value: str) -> str:
 
 
 def _now_iso() -> str:
-    return datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
+    return datetime.now(UTC).isoformat().replace("+00:00", "Z")
 
 
 def _read_json(path: Path) -> dict[str, Any]:
diff --git a/services/cloud_cost_management/src/v2/CloudCostManagementApi.ts b/services/cloud_cost_management/src/v2/CloudCostManagementApi.ts
index 291ad0705c61..66027c5196ef 100644
--- a/services/cloud_cost_management/src/v2/CloudCostManagementApi.ts
+++ b/services/cloud_cost_management/src/v2/CloudCostManagementApi.ts
@@ -10749,6 +10749,8 @@ export class CloudCostManagementApi {
   }
 
   /**
+   * **Note**: This endpoint is deprecated. View OCI accounts in Cloud Cost Settings in the Datadog web application instead.
+   *
    * List the OCI configs.
    * @param param The request object
    */