diff --git a/website/static/billing-api/api_index.html b/website/static/billing-api/api_index.html
index af6460b79..43a61337f 100644
--- a/website/static/billing-api/api_index.html
+++ b/website/static/billing-api/api_index.html
@@ -559,7 +559,7 @@ <h3 id="_index">Index</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-18 15:56:31 UTC
+Last updated 2024-12-23 11:22:21 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/common_data_formats.html b/website/static/billing-api/common_data_formats.html
index 299867fd1..b89b53818 100644
--- a/website/static/billing-api/common_data_formats.html
+++ b/website/static/billing-api/common_data_formats.html
@@ -519,7 +519,7 @@ <h3 id="paging">Paging</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-18 15:56:31 UTC
+Last updated 2024-12-23 11:22:21 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/index.html b/website/static/billing-api/index.html
index a3e13acb5..187e21962 100644
--- a/website/static/billing-api/index.html
+++ b/website/static/billing-api/index.html
@@ -1048,14 +1048,14 @@ <h3 id="mesh_objects"><a class="link" href="#mesh_objects">meshObjects</a></h3>
 
 {
   "_links" : {
-    "meshchargebacks" : {
-      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}",
-      "templated" : true
-    },
     "meshtenantusagereports" : {
       "href" : "https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}",
       "templated" : true
     },
+    "meshchargebacks" : {
+      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}",
+      "templated" : true
+    },
     "self" : {
       "href" : "https://mesh-billing-url/api/meshobjects"
     }
@@ -1228,7 +1228,7 @@ <h5 id="_list_meshtenantusagereports"><a class="link" href="#_list_meshtenantusa
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-        "lastModified" : "2024-12-18T15:57:55.476548100Z",
+        "lastModified" : "2024-12-23T11:23:38.685776600Z",
         "finalized" : true
       },
       "spec" : {
@@ -1473,7 +1473,7 @@ <h5 id="_get_meshtenantusagereport"><a class="link" href="#_get_meshtenantusager
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-    "lastModified" : "2024-12-18T15:57:55.476548100Z",
+    "lastModified" : "2024-12-23T11:23:38.685776600Z",
     "finalized" : true
   },
   "spec" : {
@@ -1660,7 +1660,7 @@ <h5 id="_list_meshchargebacks"><a class="link" href="#_list_meshchargebacks">Lis
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-18T15:57:53.024736400Z",
+        "createdOn" : "2024-12-23T11:23:36.017533500Z",
         "finalized" : true
       },
       "spec" : {
@@ -1722,7 +1722,7 @@ <h5 id="_list_meshchargebacks"><a class="link" href="#_list_meshchargebacks">Lis
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-18T15:57:53.026423600Z",
+        "createdOn" : "2024-12-23T11:23:36.019450900Z",
         "finalized" : true
       },
       "spec" : {
@@ -2015,7 +2015,7 @@ <h5 id="_get_meshchargeback"><a class="link" href="#_get_meshchargeback">Get mes
   "apiVersion" : "v3",
   "metadata" : {
     "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-    "createdOn" : "2024-12-18T15:57:53.024736400Z",
+    "createdOn" : "2024-12-23T11:23:36.017533500Z",
     "finalized" : true
   },
   "spec" : {
@@ -2356,7 +2356,7 @@ <h5 id="_put_meshresourceusagereports"><a class="link" href="#_put_meshresourceu
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-18 15:56:31 UTC
+Last updated 2024-12-23 11:22:21 UTC
 </div>
 </div>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/github.min.css">
diff --git a/website/static/billing-api/mesh_chargeback.html b/website/static/billing-api/mesh_chargeback.html
index f42d87ee9..6ab1752f6 100644
--- a/website/static/billing-api/mesh_chargeback.html
+++ b/website/static/billing-api/mesh_chargeback.html
@@ -593,7 +593,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-18T15:57:53.024736400Z",
+        "createdOn" : "2024-12-23T11:23:36.017533500Z",
         "finalized" : true
       },
       "spec" : {
@@ -655,7 +655,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-18T15:57:53.026423600Z",
+        "createdOn" : "2024-12-23T11:23:36.019450900Z",
         "finalized" : true
       },
       "spec" : {
@@ -948,7 +948,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
   "apiVersion" : "v3",
   "metadata" : {
     "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-    "createdOn" : "2024-12-18T15:57:53.024736400Z",
+    "createdOn" : "2024-12-23T11:23:36.017533500Z",
     "finalized" : true
   },
   "spec" : {
@@ -1013,7 +1013,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-18 15:56:31 UTC
+Last updated 2024-12-23 11:22:21 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/mesh_objects.html b/website/static/billing-api/mesh_objects.html
index f5b2267e5..2457a50be 100644
--- a/website/static/billing-api/mesh_objects.html
+++ b/website/static/billing-api/mesh_objects.html
@@ -548,14 +548,14 @@ <h3 id="mesh_objects">meshObjects</h3>
 
 {
   "_links" : {
-    "meshchargebacks" : {
-      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}",
-      "templated" : true
-    },
     "meshtenantusagereports" : {
       "href" : "https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}",
       "templated" : true
     },
+    "meshchargebacks" : {
+      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}",
+      "templated" : true
+    },
     "self" : {
       "href" : "https://mesh-billing-url/api/meshobjects"
     }
@@ -728,7 +728,7 @@ <h5 id="_list_meshtenantusagereports">List meshTenantUsageReports</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-        "lastModified" : "2024-12-18T15:57:55.476548100Z",
+        "lastModified" : "2024-12-23T11:23:38.685776600Z",
         "finalized" : true
       },
       "spec" : {
@@ -973,7 +973,7 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-    "lastModified" : "2024-12-18T15:57:55.476548100Z",
+    "lastModified" : "2024-12-23T11:23:38.685776600Z",
     "finalized" : true
   },
   "spec" : {
@@ -1160,7 +1160,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-18T15:57:53.024736400Z",
+        "createdOn" : "2024-12-23T11:23:36.017533500Z",
         "finalized" : true
       },
       "spec" : {
@@ -1222,7 +1222,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-18T15:57:53.026423600Z",
+        "createdOn" : "2024-12-23T11:23:36.019450900Z",
         "finalized" : true
       },
       "spec" : {
@@ -1515,7 +1515,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
   "apiVersion" : "v3",
   "metadata" : {
     "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-    "createdOn" : "2024-12-18T15:57:53.024736400Z",
+    "createdOn" : "2024-12-23T11:23:36.017533500Z",
     "finalized" : true
   },
   "spec" : {
@@ -1854,7 +1854,7 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-18 15:56:31 UTC
+Last updated 2024-12-23 11:22:21 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/mesh_resource_usage_report.html b/website/static/billing-api/mesh_resource_usage_report.html
index 1da8e1915..dbcd301a9 100644
--- a/website/static/billing-api/mesh_resource_usage_report.html
+++ b/website/static/billing-api/mesh_resource_usage_report.html
@@ -716,7 +716,7 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-18 15:56:31 UTC
+Last updated 2024-12-23 11:22:21 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/mesh_tenant_usage_reports.html b/website/static/billing-api/mesh_tenant_usage_reports.html
index 9542b3ab9..a9929839b 100644
--- a/website/static/billing-api/mesh_tenant_usage_reports.html
+++ b/website/static/billing-api/mesh_tenant_usage_reports.html
@@ -605,7 +605,7 @@ <h5 id="_list_meshtenantusagereports">List meshTenantUsageReports</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-        "lastModified" : "2024-12-18T15:57:55.476548100Z",
+        "lastModified" : "2024-12-23T11:23:38.685776600Z",
         "finalized" : true
       },
       "spec" : {
@@ -850,7 +850,7 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-    "lastModified" : "2024-12-18T15:57:55.476548100Z",
+    "lastModified" : "2024-12-23T11:23:38.685776600Z",
     "finalized" : true
   },
   "spec" : {
@@ -887,7 +887,7 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-18 15:56:31 UTC
+Last updated 2024-12-23 11:22:21 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/meshmetering-openapi-docs.json b/website/static/billing-api/meshmetering-openapi-docs.json
index 94bc69129..3c58ad8e4 100644
--- a/website/static/billing-api/meshmetering-openapi-docs.json
+++ b/website/static/billing-api/meshmetering-openapi-docs.json
@@ -67,7 +67,7 @@
                 },
                 "examples" : {
                   "meshObjectsRoot" : {
-                    "value" : "{\n  \"_links\" : {\n    \"meshchargebacks\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}\",\n      \"templated\" : true\n    },\n    \"meshtenantusagereports\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects\"\n    }\n  }\n}"
+                    "value" : "{\n  \"_links\" : {\n    \"meshtenantusagereports\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshchargebacks\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -159,7 +159,7 @@
                 },
                 "examples" : {
                   "meshChargebackList" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-18T15:57:53.026423600Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-23T11:23:36.017533500Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-23T11:23:36.019450900Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -275,7 +275,7 @@
                 },
                 "examples" : {
                   "meshTenantUsageReportsList" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-23T11:23:38.685776600Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -311,7 +311,7 @@
                 },
                 "examples" : {
                   "meshChargeback" : {
-                    "value" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-23T11:23:36.017533500Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -347,7 +347,7 @@
                 },
                 "examples" : {
                   "meshTenantUsageReport" : {
-                    "value" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-23T11:23:38.685776600Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -531,6 +531,54 @@
           }
         }
       },
+      "meshTenantUsageReportsList" : {
+        "title" : "meshTenantUsageReportsList",
+        "required" : [ "_embedded", "_links", "page" ],
+        "type" : "object",
+        "properties" : {
+          "_links" : {
+            "type" : "object",
+            "description" : "Currently only contains the self link and <<paging,pagination>> links."
+          },
+          "_embedded" : {
+            "required" : [ "meshTenantUsageReports" ],
+            "type" : "object",
+            "properties" : {
+              "meshTenantUsageReports" : {
+                "type" : "array",
+                "description" : "List of <<mesh_tenantUsageReport_response_fields,meshTenantUsageReport>>.",
+                "items" : {
+                  "oneOf" : [ {
+                    "type" : "object"
+                  }, {
+                    "type" : "boolean"
+                  }, {
+                    "type" : "string"
+                  }, {
+                    "type" : "number"
+                  } ]
+                }
+              }
+            },
+            "description" : "Contains the actual content of the paged response."
+          },
+          "page" : {
+            "type" : "object",
+            "description" : "See <<paging,Paging information>>."
+          }
+        }
+      },
+      "meshObjectsRoot" : {
+        "title" : "meshObjectsRoot",
+        "required" : [ "_links" ],
+        "type" : "object",
+        "properties" : {
+          "_links" : {
+            "type" : "object",
+            "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user."
+          }
+        }
+      },
       "meshChargeback" : {
         "title" : "meshChargeback",
         "required" : [ "_links", "apiVersion", "kind", "metadata", "spec", "status" ],
@@ -697,54 +745,6 @@
             "description" : "All fields in this section provide detailed content of the meshChargeback."
           }
         }
-      },
-      "meshObjectsRoot" : {
-        "title" : "meshObjectsRoot",
-        "required" : [ "_links" ],
-        "type" : "object",
-        "properties" : {
-          "_links" : {
-            "type" : "object",
-            "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user."
-          }
-        }
-      },
-      "meshTenantUsageReportsList" : {
-        "title" : "meshTenantUsageReportsList",
-        "required" : [ "_embedded", "_links", "page" ],
-        "type" : "object",
-        "properties" : {
-          "_links" : {
-            "type" : "object",
-            "description" : "Currently only contains the self link and <<paging,pagination>> links."
-          },
-          "_embedded" : {
-            "required" : [ "meshTenantUsageReports" ],
-            "type" : "object",
-            "properties" : {
-              "meshTenantUsageReports" : {
-                "type" : "array",
-                "description" : "List of <<mesh_tenantUsageReport_response_fields,meshTenantUsageReport>>.",
-                "items" : {
-                  "oneOf" : [ {
-                    "type" : "object"
-                  }, {
-                    "type" : "boolean"
-                  }, {
-                    "type" : "string"
-                  }, {
-                    "type" : "number"
-                  } ]
-                }
-              }
-            },
-            "description" : "Contains the actual content of the paged response."
-          },
-          "page" : {
-            "type" : "object",
-            "description" : "See <<paging,Paging information>>."
-          }
-        }
       }
     },
     "securitySchemes" : {
diff --git a/website/static/billing-api/meshmetering-postman-collection-original.json b/website/static/billing-api/meshmetering-postman-collection-original.json
index a55225158..364c12505 100644
--- a/website/static/billing-api/meshmetering-postman-collection-original.json
+++ b/website/static/billing-api/meshmetering-postman-collection-original.json
@@ -95,7 +95,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshchargebacks\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}\",\n      \"templated\" : true\n    },\n    \"meshtenantusagereports\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshtenantusagereports\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshchargebacks\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -200,7 +200,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-18T15:57:53.026423600Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-23T11:23:36.017533500Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-23T11:23:36.019450900Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -329,7 +329,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-23T11:23:38.685776600Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -376,7 +376,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-23T11:23:36.017533500Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -423,7 +423,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-23T11:23:38.685776600Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}",
       "code" : 200
     } ]
   } ],
diff --git a/website/static/billing-api/meshmetering-postman-collection.json b/website/static/billing-api/meshmetering-postman-collection.json
index 688836c39..d8624fff7 100644
--- a/website/static/billing-api/meshmetering-postman-collection.json
+++ b/website/static/billing-api/meshmetering-postman-collection.json
@@ -91,7 +91,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshchargebacks\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}\",\n      \"templated\" : true\n    },\n    \"meshtenantusagereports\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshtenantusagereports\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshchargebacks\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -194,7 +194,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-18T15:57:53.026423600Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-23T11:23:36.017533500Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-23T11:23:36.019450900Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -321,7 +321,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-23T11:23:38.685776600Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -366,7 +366,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-23T11:23:36.017533500Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -411,7 +411,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-23T11:23:38.685776600Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}",
       "code" : 200
     } ]
   } ],
diff --git a/website/static/billing-api/meshmetering-swagger-docs.json b/website/static/billing-api/meshmetering-swagger-docs.json
index 649821b4b..b89758bec 100644
--- a/website/static/billing-api/meshmetering-swagger-docs.json
+++ b/website/static/billing-api/meshmetering-swagger-docs.json
@@ -52,7 +52,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshobjects.v1.hal+json" : "{\n  \"_links\" : {\n    \"meshchargebacks\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}\",\n      \"templated\" : true\n    },\n    \"meshtenantusagereports\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshobjects.v1.hal+json" : "{\n  \"_links\" : {\n    \"meshtenantusagereports\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports{?workspaceIdentifier,projectIdentifier,platformFullIdentifier,period,reportCategory,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshchargebacks\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks{?workspaceIdentifier,projectIdentifier,period,finalized,legacy,finalizedSince,cancelledSince}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshObjectsRoot"
@@ -122,7 +122,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-18T15:57:53.026423600Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-23T11:23:36.017533500Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-23T11:23:36.019450900Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshChargebackList"
@@ -210,7 +210,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-23T11:23:38.685776600Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshTenantUsageReportsList"
@@ -238,7 +238,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-18T15:57:53.024736400Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-23T11:23:36.017533500Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshChargeback"
@@ -266,7 +266,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-18T15:57:55.476548100Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-23T11:23:38.685776600Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshTenantUsageReport"
@@ -453,6 +453,17 @@
         }
       }
     },
+    "meshObjectsRoot" : {
+      "type" : "object",
+      "required" : [ "_links" ],
+      "properties" : {
+        "_links" : {
+          "type" : "object",
+          "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user.",
+          "properties" : { }
+        }
+      }
+    },
     "meshTenantUsageReportsList" : {
       "type" : "object",
       "required" : [ "_embedded", "_links", "page" ],
@@ -481,17 +492,6 @@
         }
       }
     },
-    "meshObjectsRoot" : {
-      "type" : "object",
-      "required" : [ "_links" ],
-      "properties" : {
-        "_links" : {
-          "type" : "object",
-          "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user.",
-          "properties" : { }
-        }
-      }
-    },
     "apiRoot" : {
       "type" : "object",
       "required" : [ "_links" ],
diff --git a/website/static/billing-api/overview.html b/website/static/billing-api/overview.html
index eb79da64a..a3164f7f0 100644
--- a/website/static/billing-api/overview.html
+++ b/website/static/billing-api/overview.html
@@ -582,7 +582,7 @@ <h2 id="_data_types">Data Types</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-18 15:56:31 UTC
+Last updated 2024-12-23 11:22:21 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/technical_specification.html b/website/static/billing-api/technical_specification.html
index 4b77ea5b3..1d89103d4 100644
--- a/website/static/billing-api/technical_specification.html
+++ b/website/static/billing-api/technical_specification.html
@@ -627,7 +627,7 @@ <h3 id="versioning">Versioning</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-18 15:56:31 UTC
+Last updated 2024-12-23 11:22:21 UTC
 </div>
 </div>
 </body>