From c322361b5cfe69abbecb0cafb07dd665772d5845 Mon Sep 17 00:00:00 2001
From: "github-merge-queue[bot]"
 <118344674+github-merge-queue[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:52:58 +0000
Subject: [PATCH 1/3] docs: update meshStack API docs from latest develop build

---
 website/static/billing-api/api_index.html     |  2 +-
 .../static/billing-api/cloud-resources.html   |  6 +-
 .../billing-api/common_data_formats.html      |  2 +-
 website/static/billing-api/index.html         | 72 +++++++++----------
 .../static/billing-api/mesh_chargeback.html   | 42 +++++------
 website/static/billing-api/mesh_objects.html  | 68 +++++++++---------
 .../mesh_resource_usage_report.html           |  8 +--
 .../mesh_tenant_usage_reports.html            | 14 ++--
 .../meshmetering-openapi-docs.json            | 14 ++--
 ...hmetering-postman-collection-original.json | 18 ++---
 .../meshmetering-postman-collection.json      | 22 +++---
 .../meshmetering-swagger-docs.json            | 14 ++--
 website/static/billing-api/overview.html      |  2 +-
 .../billing-api/technical_specification.html  |  2 +-
 14 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/website/static/billing-api/api_index.html b/website/static/billing-api/api_index.html
index 233ad474c..bfdbd0c98 100644
--- a/website/static/billing-api/api_index.html
+++ b/website/static/billing-api/api_index.html
@@ -567,7 +567,7 @@ <h3 id="_index">Index</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/cloud-resources.html b/website/static/billing-api/cloud-resources.html
index 6176b2fa5..f06d2561e 100644
--- a/website/static/billing-api/cloud-resources.html
+++ b/website/static/billing-api/cloud-resources.html
@@ -707,9 +707,9 @@ <h4 id="resources-getExternalCloudResources">getExternalCloudResources</h4>
     "paged" : true,
     "unpaged" : false
   },
+  "last" : true,
   "totalPages" : 1,
   "totalElements" : 1,
-  "last" : true,
   "size" : 20,
   "number" : 0,
   "sort" : {
@@ -717,8 +717,8 @@ <h4 id="resources-getExternalCloudResources">getExternalCloudResources</h4>
     "sorted" : true,
     "unsorted" : false
   },
-  "numberOfElements" : 1,
   "first" : true,
+  "numberOfElements" : 1,
   "empty" : false
 }</code></pre>
 </div>
@@ -728,7 +728,7 @@ <h4 id="resources-getExternalCloudResources">getExternalCloudResources</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 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 84c08e04b..72c4bfee6 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-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/index.html b/website/static/billing-api/index.html
index 6cd310c49..a55b48fc7 100644
--- a/website/static/billing-api/index.html
+++ b/website/static/billing-api/index.html
@@ -1061,14 +1061,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"
     }
@@ -1241,7 +1241,7 @@ <h5 id="_list_meshtenantusagereports"><a class="link" href="#_list_meshtenantusa
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-        "lastModified" : "2024-10-30T17:48:32.593083500Z",
+        "lastModified" : "2024-11-06T13:34:42.164566300Z",
         "finalized" : true
       },
       "spec" : {
@@ -1254,8 +1254,8 @@ <h5 id="_list_meshtenantusagereports"><a class="link" href="#_list_meshtenantusa
       "status" : {
         "projectIdentifier" : "testProject",
         "timeframe" : {
-          "from" : "2024-10-01T00:00:00Z",
-          "to" : "2024-11-01T00:00:00Z"
+          "from" : "2024-11-01T00:00:00Z",
+          "to" : "2024-12-01T00:00:00Z"
         },
         "netAmounts" : [ {
           "currency" : "EUR",
@@ -1486,7 +1486,7 @@ <h5 id="_get_meshtenantusagereport"><a class="link" href="#_get_meshtenantusager
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-    "lastModified" : "2024-10-30T17:48:32.593083500Z",
+    "lastModified" : "2024-11-06T13:34:42.164566300Z",
     "finalized" : true
   },
   "spec" : {
@@ -1499,8 +1499,8 @@ <h5 id="_get_meshtenantusagereport"><a class="link" href="#_get_meshtenantusager
   "status" : {
     "projectIdentifier" : "testProject",
     "timeframe" : {
-      "from" : "2024-10-01T00:00:00Z",
-      "to" : "2024-11-01T00:00:00Z"
+      "from" : "2024-11-01T00:00:00Z",
+      "to" : "2024-12-01T00:00:00Z"
     },
     "netAmounts" : [ {
       "currency" : "EUR",
@@ -1672,13 +1672,13 @@ <h5 id="_list_meshchargebacks"><a class="link" href="#_list_meshchargebacks">Lis
       "kind" : "meshChargeback",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "2024-10-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-10-30T17:48:30.578961200Z",
+        "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
+        "createdOn" : "2024-11-06T13:34:39.519450400Z",
         "finalized" : true
       },
       "spec" : {
         "projectIdentifier" : "testProject",
-        "period" : "2024-10-01Z",
+        "period" : "2024-11-01Z",
         "tags" : {
           "paymentIdentifier" : [ "123" ]
         },
@@ -1686,8 +1686,8 @@ <h5 id="_list_meshchargebacks"><a class="link" href="#_list_meshchargebacks">Lis
       },
       "status" : {
         "timeframe" : {
-          "from" : "2024-10-01T00:00:00Z",
-          "to" : "2024-11-01T00:00:00Z"
+          "from" : "2024-11-01T00:00:00Z",
+          "to" : "2024-12-01T00:00:00Z"
         },
         "lineItems" : [ {
           "reportCategory" : "BILLING",
@@ -1727,27 +1727,27 @@ <h5 id="_list_meshchargebacks"><a class="link" href="#_list_meshchargebacks">Lis
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
+          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject"
         }
       }
     }, {
       "kind" : "meshChargeback",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "2024-09-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-10-30T17:48:30.580673200Z",
+        "name" : "2024-10-01Z/testPartner:testWorkspace:testProject",
+        "createdOn" : "2024-11-06T13:34:39.520904700Z",
         "finalized" : true
       },
       "spec" : {
         "projectIdentifier" : "testProject",
-        "period" : "2024-09-01Z",
+        "period" : "2024-10-01Z",
         "tags" : { },
         "workspaceIdentifier" : "testWorkspace"
       },
       "status" : {
         "timeframe" : {
-          "from" : "2024-09-01T00:00:00Z",
-          "to" : "2024-10-01T00:00:00Z"
+          "from" : "2024-10-01T00:00:00Z",
+          "to" : "2024-11-01T00:00:00Z"
         },
         "lineItems" : [ ],
         "netAmounts" : [ {
@@ -1759,7 +1759,7 @@ <h5 id="_list_meshchargebacks"><a class="link" href="#_list_meshchargebacks">Lis
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-09-01Z/testPartner%3AtestWorkspace%3AtestProject"
+          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
         }
       }
     } ]
@@ -1806,7 +1806,7 @@ <h5 id="_get_meshchargeback"><a class="link" href="#_get_meshchargeback">Get mes
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json
 Host: mesh-billing-url</code></pre>
@@ -1815,7 +1815,7 @@ <h5 id="_get_meshchargeback"><a class="link" href="#_get_meshchargeback">Get mes
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -2027,13 +2027,13 @@ <h5 id="_get_meshchargeback"><a class="link" href="#_get_meshchargeback">Get mes
   "kind" : "meshChargeback",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "2024-10-01Z/testPartner:testWorkspace:testProject",
-    "createdOn" : "2024-10-30T17:48:30.578961200Z",
+    "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
+    "createdOn" : "2024-11-06T13:34:39.519450400Z",
     "finalized" : true
   },
   "spec" : {
     "projectIdentifier" : "testProject",
-    "period" : "2024-10-01Z",
+    "period" : "2024-11-01Z",
     "tags" : {
       "paymentIdentifier" : [ "123" ]
     },
@@ -2041,8 +2041,8 @@ <h5 id="_get_meshchargeback"><a class="link" href="#_get_meshchargeback">Get mes
   },
   "status" : {
     "timeframe" : {
-      "from" : "2024-10-01T00:00:00Z",
-      "to" : "2024-11-01T00:00:00Z"
+      "from" : "2024-11-01T00:00:00Z",
+      "to" : "2024-12-01T00:00:00Z"
     },
     "lineItems" : [ {
       "reportCategory" : "BILLING",
@@ -2082,7 +2082,7 @@ <h5 id="_get_meshchargeback"><a class="link" href="#_get_meshchargeback">Get mes
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
+      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject"
     }
   }
 }</code></pre>
@@ -2103,7 +2103,7 @@ <h5 id="_put_meshresourceusagereports"><a class="link" href="#_put_meshresourceu
 meshTenantUsageReports.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">/api/meshobjects/meshresourceusagereports/{tenantIdentifier}/{period}</caption>
+<caption class="title">/api/meshobjects/meshresourceusagereports/{platformTenantId}/{period}</caption>
 <colgroup>
 <col style="width: 50%;">
 <col style="width: 50%;">
@@ -2116,8 +2116,8 @@ <h5 id="_put_meshresourceusagereports"><a class="link" href="#_put_meshresourceu
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>tenantIdentifier</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">A unique identifier for the tenant causing the costs.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>platformTenantId</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The Platform Tenant ID of the tenant causing the costs.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>period</code></p></td>
@@ -2631,9 +2631,9 @@ <h4 id="resources-getExternalCloudResources"><a class="link" href="#resources-ge
     "paged" : true,
     "unpaged" : false
   },
+  "last" : true,
   "totalPages" : 1,
   "totalElements" : 1,
-  "last" : true,
   "size" : 20,
   "number" : 0,
   "sort" : {
@@ -2641,8 +2641,8 @@ <h4 id="resources-getExternalCloudResources"><a class="link" href="#resources-ge
     "sorted" : true,
     "unsorted" : false
   },
-  "numberOfElements" : 1,
   "first" : true,
+  "numberOfElements" : 1,
   "empty" : false
 }</code></pre>
 </div>
@@ -2654,7 +2654,7 @@ <h4 id="resources-getExternalCloudResources"><a class="link" href="#resources-ge
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 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 ec5a534a9..570834870 100644
--- a/website/static/billing-api/mesh_chargeback.html
+++ b/website/static/billing-api/mesh_chargeback.html
@@ -592,13 +592,13 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "kind" : "meshChargeback",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "2024-10-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-10-30T17:48:30.578961200Z",
+        "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
+        "createdOn" : "2024-11-06T13:34:39.519450400Z",
         "finalized" : true
       },
       "spec" : {
         "projectIdentifier" : "testProject",
-        "period" : "2024-10-01Z",
+        "period" : "2024-11-01Z",
         "tags" : {
           "paymentIdentifier" : [ "123" ]
         },
@@ -606,8 +606,8 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       },
       "status" : {
         "timeframe" : {
-          "from" : "2024-10-01T00:00:00Z",
-          "to" : "2024-11-01T00:00:00Z"
+          "from" : "2024-11-01T00:00:00Z",
+          "to" : "2024-12-01T00:00:00Z"
         },
         "lineItems" : [ {
           "reportCategory" : "BILLING",
@@ -647,27 +647,27 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
+          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject"
         }
       }
     }, {
       "kind" : "meshChargeback",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "2024-09-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-10-30T17:48:30.580673200Z",
+        "name" : "2024-10-01Z/testPartner:testWorkspace:testProject",
+        "createdOn" : "2024-11-06T13:34:39.520904700Z",
         "finalized" : true
       },
       "spec" : {
         "projectIdentifier" : "testProject",
-        "period" : "2024-09-01Z",
+        "period" : "2024-10-01Z",
         "tags" : { },
         "workspaceIdentifier" : "testWorkspace"
       },
       "status" : {
         "timeframe" : {
-          "from" : "2024-09-01T00:00:00Z",
-          "to" : "2024-10-01T00:00:00Z"
+          "from" : "2024-10-01T00:00:00Z",
+          "to" : "2024-11-01T00:00:00Z"
         },
         "lineItems" : [ ],
         "netAmounts" : [ {
@@ -679,7 +679,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-09-01Z/testPartner%3AtestWorkspace%3AtestProject"
+          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
         }
       }
     } ]
@@ -726,7 +726,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json
 Host: mesh-billing-url</code></pre>
@@ -735,7 +735,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -947,13 +947,13 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
   "kind" : "meshChargeback",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "2024-10-01Z/testPartner:testWorkspace:testProject",
-    "createdOn" : "2024-10-30T17:48:30.578961200Z",
+    "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
+    "createdOn" : "2024-11-06T13:34:39.519450400Z",
     "finalized" : true
   },
   "spec" : {
     "projectIdentifier" : "testProject",
-    "period" : "2024-10-01Z",
+    "period" : "2024-11-01Z",
     "tags" : {
       "paymentIdentifier" : [ "123" ]
     },
@@ -961,8 +961,8 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
   },
   "status" : {
     "timeframe" : {
-      "from" : "2024-10-01T00:00:00Z",
-      "to" : "2024-11-01T00:00:00Z"
+      "from" : "2024-11-01T00:00:00Z",
+      "to" : "2024-12-01T00:00:00Z"
     },
     "lineItems" : [ {
       "reportCategory" : "BILLING",
@@ -1002,7 +1002,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
+      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject"
     }
   }
 }</code></pre>
@@ -1013,7 +1013,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/mesh_objects.html b/website/static/billing-api/mesh_objects.html
index e15607326..7ac31dac9 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-10-30T17:48:32.593083500Z",
+        "lastModified" : "2024-11-06T13:34:42.164566300Z",
         "finalized" : true
       },
       "spec" : {
@@ -741,8 +741,8 @@ <h5 id="_list_meshtenantusagereports">List meshTenantUsageReports</h5>
       "status" : {
         "projectIdentifier" : "testProject",
         "timeframe" : {
-          "from" : "2024-10-01T00:00:00Z",
-          "to" : "2024-11-01T00:00:00Z"
+          "from" : "2024-11-01T00:00:00Z",
+          "to" : "2024-12-01T00:00:00Z"
         },
         "netAmounts" : [ {
           "currency" : "EUR",
@@ -973,7 +973,7 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-    "lastModified" : "2024-10-30T17:48:32.593083500Z",
+    "lastModified" : "2024-11-06T13:34:42.164566300Z",
     "finalized" : true
   },
   "spec" : {
@@ -986,8 +986,8 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
   "status" : {
     "projectIdentifier" : "testProject",
     "timeframe" : {
-      "from" : "2024-10-01T00:00:00Z",
-      "to" : "2024-11-01T00:00:00Z"
+      "from" : "2024-11-01T00:00:00Z",
+      "to" : "2024-12-01T00:00:00Z"
     },
     "netAmounts" : [ {
       "currency" : "EUR",
@@ -1159,13 +1159,13 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "kind" : "meshChargeback",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "2024-10-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-10-30T17:48:30.578961200Z",
+        "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
+        "createdOn" : "2024-11-06T13:34:39.519450400Z",
         "finalized" : true
       },
       "spec" : {
         "projectIdentifier" : "testProject",
-        "period" : "2024-10-01Z",
+        "period" : "2024-11-01Z",
         "tags" : {
           "paymentIdentifier" : [ "123" ]
         },
@@ -1173,8 +1173,8 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       },
       "status" : {
         "timeframe" : {
-          "from" : "2024-10-01T00:00:00Z",
-          "to" : "2024-11-01T00:00:00Z"
+          "from" : "2024-11-01T00:00:00Z",
+          "to" : "2024-12-01T00:00:00Z"
         },
         "lineItems" : [ {
           "reportCategory" : "BILLING",
@@ -1214,27 +1214,27 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
+          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject"
         }
       }
     }, {
       "kind" : "meshChargeback",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "2024-09-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-10-30T17:48:30.580673200Z",
+        "name" : "2024-10-01Z/testPartner:testWorkspace:testProject",
+        "createdOn" : "2024-11-06T13:34:39.520904700Z",
         "finalized" : true
       },
       "spec" : {
         "projectIdentifier" : "testProject",
-        "period" : "2024-09-01Z",
+        "period" : "2024-10-01Z",
         "tags" : { },
         "workspaceIdentifier" : "testWorkspace"
       },
       "status" : {
         "timeframe" : {
-          "from" : "2024-09-01T00:00:00Z",
-          "to" : "2024-10-01T00:00:00Z"
+          "from" : "2024-10-01T00:00:00Z",
+          "to" : "2024-11-01T00:00:00Z"
         },
         "lineItems" : [ ],
         "netAmounts" : [ {
@@ -1246,7 +1246,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-09-01Z/testPartner%3AtestWorkspace%3AtestProject"
+          "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
         }
       }
     } ]
@@ -1293,7 +1293,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%253AtestWorkspace%253AtestProject HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json
 Host: mesh-billing-url</code></pre>
@@ -1302,7 +1302,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%253AtestWorkspace%253AtestProject' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshchargeback.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -1514,13 +1514,13 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
   "kind" : "meshChargeback",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "2024-10-01Z/testPartner:testWorkspace:testProject",
-    "createdOn" : "2024-10-30T17:48:30.578961200Z",
+    "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
+    "createdOn" : "2024-11-06T13:34:39.519450400Z",
     "finalized" : true
   },
   "spec" : {
     "projectIdentifier" : "testProject",
-    "period" : "2024-10-01Z",
+    "period" : "2024-11-01Z",
     "tags" : {
       "paymentIdentifier" : [ "123" ]
     },
@@ -1528,8 +1528,8 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
   },
   "status" : {
     "timeframe" : {
-      "from" : "2024-10-01T00:00:00Z",
-      "to" : "2024-11-01T00:00:00Z"
+      "from" : "2024-11-01T00:00:00Z",
+      "to" : "2024-12-01T00:00:00Z"
     },
     "lineItems" : [ {
       "reportCategory" : "BILLING",
@@ -1569,7 +1569,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
+      "href" : "https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject"
     }
   }
 }</code></pre>
@@ -1590,7 +1590,7 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 meshTenantUsageReports.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 13. /api/meshobjects/meshresourceusagereports/{tenantIdentifier}/{period}</caption>
+<caption class="title">Table 13. /api/meshobjects/meshresourceusagereports/{platformTenantId}/{period}</caption>
 <colgroup>
 <col style="width: 50%;">
 <col style="width: 50%;">
@@ -1603,8 +1603,8 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>tenantIdentifier</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">A unique identifier for the tenant causing the costs.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>platformTenantId</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The Platform Tenant ID of the tenant causing the costs.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>period</code></p></td>
@@ -1854,7 +1854,7 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 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 58bb501c3..d653a3995 100644
--- a/website/static/billing-api/mesh_resource_usage_report.html
+++ b/website/static/billing-api/mesh_resource_usage_report.html
@@ -453,7 +453,7 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 meshTenantUsageReports.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 1. /api/meshobjects/meshresourceusagereports/{tenantIdentifier}/{period}</caption>
+<caption class="title">Table 1. /api/meshobjects/meshresourceusagereports/{platformTenantId}/{period}</caption>
 <colgroup>
 <col style="width: 50%;">
 <col style="width: 50%;">
@@ -466,8 +466,8 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 </thead>
 <tbody>
 <tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><code>tenantIdentifier</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">A unique identifier for the tenant causing the costs.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>platformTenantId</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The Platform Tenant ID of the tenant causing the costs.</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>period</code></p></td>
@@ -716,7 +716,7 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 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 40dfcaba2..69978de9b 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-10-30T17:48:32.593083500Z",
+        "lastModified" : "2024-11-06T13:34:42.164566300Z",
         "finalized" : true
       },
       "spec" : {
@@ -618,8 +618,8 @@ <h5 id="_list_meshtenantusagereports">List meshTenantUsageReports</h5>
       "status" : {
         "projectIdentifier" : "testProject",
         "timeframe" : {
-          "from" : "2024-10-01T00:00:00Z",
-          "to" : "2024-11-01T00:00:00Z"
+          "from" : "2024-11-01T00:00:00Z",
+          "to" : "2024-12-01T00:00:00Z"
         },
         "netAmounts" : [ {
           "currency" : "EUR",
@@ -850,7 +850,7 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-    "lastModified" : "2024-10-30T17:48:32.593083500Z",
+    "lastModified" : "2024-11-06T13:34:42.164566300Z",
     "finalized" : true
   },
   "spec" : {
@@ -863,8 +863,8 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
   "status" : {
     "projectIdentifier" : "testProject",
     "timeframe" : {
-      "from" : "2024-10-01T00:00:00Z",
-      "to" : "2024-11-01T00:00:00Z"
+      "from" : "2024-11-01T00:00:00Z",
+      "to" : "2024-12-01T00:00:00Z"
     },
     "netAmounts" : [ {
       "currency" : "EUR",
@@ -887,7 +887,7 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 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 406b953bc..424f91e64 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-10-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-10-30T17:48:30.578961200Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-10-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-10-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-09-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-10-30T17:48:30.580673200Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-09-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-09-01T00:00:00Z\",\n          \"to\" : \"2024-10-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-09-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-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-11-06T13:34:39.519450400Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\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          \"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-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-10-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-11-06T13:34:39.520904700Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-10-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-10-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-10-30T17:48:32.593083500Z\",\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-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-11-06T13:34:42.164566300Z\",\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-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-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}"
                   }
                 }
               }
@@ -287,7 +287,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject" : {
+    "/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshChargeback",
@@ -311,7 +311,7 @@
                 },
                 "examples" : {
                   "meshChargeback" : {
-                    "value" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-10-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-10-30T17:48:30.578961200Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-10-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-10-01T00:00:00Z\",\n      \"to\" : \"2024-11-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-10-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-11-06T13:34:39.519450400Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-11-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\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      \"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-11-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-10-30T17:48:32.593083500Z\",\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-10-01T00:00:00Z\",\n      \"to\" : \"2024-11-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-11-06T13:34:42.164566300Z\",\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-11-01T00:00:00Z\",\n      \"to\" : \"2024-12-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}"
                   }
                 }
               }
@@ -438,7 +438,7 @@
                 },
                 "examples" : {
                   "getExternalCloudResources" : {
-                    "value" : "{\n  \"content\" : [ {\n    \"metadata\" : {\n      \"customer\" : \"example-customer\",\n      \"project\" : \"example-project\",\n      \"platform\" : \"os.eu-de-central\",\n      \"tenantId\" : \"f7ac731cc11f40efbc03a9f9e1d1d21f\",\n      \"projectOwner\" : \"project-owner@example.com\",\n      \"tags\" : {\n        \"costCenter\" : [ \"1234\" ]\n      }\n    },\n    \"resource\" : {\n      \"resourceId\" : \"a9debfe41a6d4d09a677da737b907d5e\",\n      \"resourceType\" : \"VirtualMachine\",\n      \"createdAt\" : \"2020-03-20T15:00:00Z\",\n      \"displayName\" : \"My virtual machine\",\n      \"lastObservedAt\" : \"2020-04-01T12:00:00Z\",\n      \"terminatedAt\" : \"2020-04-25T09:00:00Z\",\n      \"resourceMeta\" : {\n        \"ipAddress\" : \"12.34.56.78\"\n      },\n      \"status\" : \"Terminated\"\n    }\n  } ],\n  \"pageable\" : {\n    \"pageNumber\" : 0,\n    \"pageSize\" : 20,\n    \"sort\" : {\n      \"empty\" : false,\n      \"sorted\" : true,\n      \"unsorted\" : false\n    },\n    \"offset\" : 0,\n    \"paged\" : true,\n    \"unpaged\" : false\n  },\n  \"totalPages\" : 1,\n  \"totalElements\" : 1,\n  \"last\" : true,\n  \"size\" : 20,\n  \"number\" : 0,\n  \"sort\" : {\n    \"empty\" : false,\n    \"sorted\" : true,\n    \"unsorted\" : false\n  },\n  \"numberOfElements\" : 1,\n  \"first\" : true,\n  \"empty\" : false\n}"
+                    "value" : "{\n  \"content\" : [ {\n    \"metadata\" : {\n      \"customer\" : \"example-customer\",\n      \"project\" : \"example-project\",\n      \"platform\" : \"os.eu-de-central\",\n      \"tenantId\" : \"f7ac731cc11f40efbc03a9f9e1d1d21f\",\n      \"projectOwner\" : \"project-owner@example.com\",\n      \"tags\" : {\n        \"costCenter\" : [ \"1234\" ]\n      }\n    },\n    \"resource\" : {\n      \"resourceId\" : \"a9debfe41a6d4d09a677da737b907d5e\",\n      \"resourceType\" : \"VirtualMachine\",\n      \"createdAt\" : \"2020-03-20T15:00:00Z\",\n      \"displayName\" : \"My virtual machine\",\n      \"lastObservedAt\" : \"2020-04-01T12:00:00Z\",\n      \"terminatedAt\" : \"2020-04-25T09:00:00Z\",\n      \"resourceMeta\" : {\n        \"ipAddress\" : \"12.34.56.78\"\n      },\n      \"status\" : \"Terminated\"\n    }\n  } ],\n  \"pageable\" : {\n    \"pageNumber\" : 0,\n    \"pageSize\" : 20,\n    \"sort\" : {\n      \"empty\" : false,\n      \"sorted\" : true,\n      \"unsorted\" : false\n    },\n    \"offset\" : 0,\n    \"paged\" : true,\n    \"unpaged\" : false\n  },\n  \"last\" : true,\n  \"totalPages\" : 1,\n  \"totalElements\" : 1,\n  \"size\" : 20,\n  \"number\" : 0,\n  \"sort\" : {\n    \"empty\" : false,\n    \"sorted\" : true,\n    \"unsorted\" : false\n  },\n  \"first\" : true,\n  \"numberOfElements\" : 1,\n  \"empty\" : false\n}"
                   }
                 }
               }
diff --git a/website/static/billing-api/meshmetering-postman-collection-original.json b/website/static/billing-api/meshmetering-postman-collection-original.json
index 30bdb11c0..ed362dafa 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-10-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-10-30T17:48:30.578961200Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-10-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-10-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-09-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-10-30T17:48:30.580673200Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-09-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-09-01T00:00:00Z\",\n          \"to\" : \"2024-10-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-09-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-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-11-06T13:34:39.519450400Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\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          \"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-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-10-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-11-06T13:34:39.520904700Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-10-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-10-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,19 +329,19 @@
         "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-10-30T17:48:32.593083500Z\",\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-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-11-06T13:34:42.164566300Z\",\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-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-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
     } ]
   }, {
     "id" : "meshChargeback",
-    "name" : "/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject",
+    "name" : "/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject",
+        "path" : "/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject",
         "port" : "8080"
       },
       "method" : "GET",
@@ -359,7 +359,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject",
+          "path" : "/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject",
           "port" : "8080"
         },
         "method" : "GET",
@@ -376,7 +376,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-10-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-10-30T17:48:30.578961200Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-10-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-10-01T00:00:00Z\",\n      \"to\" : \"2024-11-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-10-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-11-06T13:34:39.519450400Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-11-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\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      \"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-11-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-10-30T17:48:32.593083500Z\",\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-10-01T00:00:00Z\",\n      \"to\" : \"2024-11-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-11-06T13:34:42.164566300Z\",\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-11-01T00:00:00Z\",\n      \"to\" : \"2024-12-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
     } ]
   }, {
@@ -524,7 +524,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"content\" : [ {\n    \"metadata\" : {\n      \"customer\" : \"example-customer\",\n      \"project\" : \"example-project\",\n      \"platform\" : \"os.eu-de-central\",\n      \"tenantId\" : \"f7ac731cc11f40efbc03a9f9e1d1d21f\",\n      \"projectOwner\" : \"project-owner@example.com\",\n      \"tags\" : {\n        \"costCenter\" : [ \"1234\" ]\n      }\n    },\n    \"resource\" : {\n      \"resourceId\" : \"a9debfe41a6d4d09a677da737b907d5e\",\n      \"resourceType\" : \"VirtualMachine\",\n      \"createdAt\" : \"2020-03-20T15:00:00Z\",\n      \"displayName\" : \"My virtual machine\",\n      \"lastObservedAt\" : \"2020-04-01T12:00:00Z\",\n      \"terminatedAt\" : \"2020-04-25T09:00:00Z\",\n      \"resourceMeta\" : {\n        \"ipAddress\" : \"12.34.56.78\"\n      },\n      \"status\" : \"Terminated\"\n    }\n  } ],\n  \"pageable\" : {\n    \"pageNumber\" : 0,\n    \"pageSize\" : 20,\n    \"sort\" : {\n      \"empty\" : false,\n      \"sorted\" : true,\n      \"unsorted\" : false\n    },\n    \"offset\" : 0,\n    \"paged\" : true,\n    \"unpaged\" : false\n  },\n  \"totalPages\" : 1,\n  \"totalElements\" : 1,\n  \"last\" : true,\n  \"size\" : 20,\n  \"number\" : 0,\n  \"sort\" : {\n    \"empty\" : false,\n    \"sorted\" : true,\n    \"unsorted\" : false\n  },\n  \"numberOfElements\" : 1,\n  \"first\" : true,\n  \"empty\" : false\n}",
+      "body" : "{\n  \"content\" : [ {\n    \"metadata\" : {\n      \"customer\" : \"example-customer\",\n      \"project\" : \"example-project\",\n      \"platform\" : \"os.eu-de-central\",\n      \"tenantId\" : \"f7ac731cc11f40efbc03a9f9e1d1d21f\",\n      \"projectOwner\" : \"project-owner@example.com\",\n      \"tags\" : {\n        \"costCenter\" : [ \"1234\" ]\n      }\n    },\n    \"resource\" : {\n      \"resourceId\" : \"a9debfe41a6d4d09a677da737b907d5e\",\n      \"resourceType\" : \"VirtualMachine\",\n      \"createdAt\" : \"2020-03-20T15:00:00Z\",\n      \"displayName\" : \"My virtual machine\",\n      \"lastObservedAt\" : \"2020-04-01T12:00:00Z\",\n      \"terminatedAt\" : \"2020-04-25T09:00:00Z\",\n      \"resourceMeta\" : {\n        \"ipAddress\" : \"12.34.56.78\"\n      },\n      \"status\" : \"Terminated\"\n    }\n  } ],\n  \"pageable\" : {\n    \"pageNumber\" : 0,\n    \"pageSize\" : 20,\n    \"sort\" : {\n      \"empty\" : false,\n      \"sorted\" : true,\n      \"unsorted\" : false\n    },\n    \"offset\" : 0,\n    \"paged\" : true,\n    \"unpaged\" : false\n  },\n  \"last\" : true,\n  \"totalPages\" : 1,\n  \"totalElements\" : 1,\n  \"size\" : 20,\n  \"number\" : 0,\n  \"sort\" : {\n    \"empty\" : false,\n    \"sorted\" : true,\n    \"unsorted\" : false\n  },\n  \"first\" : true,\n  \"numberOfElements\" : 1,\n  \"empty\" : false\n}",
       "code" : 200
     } ]
   } ],
diff --git a/website/static/billing-api/meshmetering-postman-collection.json b/website/static/billing-api/meshmetering-postman-collection.json
index 12ac9565c..0d4716226 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-10-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-10-30T17:48:30.578961200Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-10-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-10-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-09-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-10-30T17:48:30.580673200Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-09-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-09-01T00:00:00Z\",\n          \"to\" : \"2024-10-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-09-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-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-11-06T13:34:39.519450400Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\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          \"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-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-10-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-11-06T13:34:39.520904700Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-10-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-10-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,19 +321,19 @@
         "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-10-30T17:48:32.593083500Z\",\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-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-11-06T13:34:42.164566300Z\",\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-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-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
     } ]
   }, {
     "id" : "meshChargeback",
-    "name" : "/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject",
+    "name" : "/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject",
+	"raw": "{{baseUrl}}/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
+"path" : "/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject"
       },
       "method" : "GET",
       "header" : [ {
@@ -348,9 +348,9 @@
       "name" : "meshChargeback",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject",
+	"raw": "{{baseUrl}}/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject"
+"path" : "/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject"
         },
         "method" : "GET",
         "header" : [ {
@@ -366,7 +366,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-10-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-10-30T17:48:30.578961200Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-10-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-10-01T00:00:00Z\",\n      \"to\" : \"2024-11-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-10-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-11-06T13:34:39.519450400Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-11-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\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      \"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-11-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-10-30T17:48:32.593083500Z\",\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-10-01T00:00:00Z\",\n      \"to\" : \"2024-11-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-11-06T13:34:42.164566300Z\",\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-11-01T00:00:00Z\",\n      \"to\" : \"2024-12-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
     } ]
   }, {
@@ -510,7 +510,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"content\" : [ {\n    \"metadata\" : {\n      \"customer\" : \"example-customer\",\n      \"project\" : \"example-project\",\n      \"platform\" : \"os.eu-de-central\",\n      \"tenantId\" : \"f7ac731cc11f40efbc03a9f9e1d1d21f\",\n      \"projectOwner\" : \"project-owner@example.com\",\n      \"tags\" : {\n        \"costCenter\" : [ \"1234\" ]\n      }\n    },\n    \"resource\" : {\n      \"resourceId\" : \"a9debfe41a6d4d09a677da737b907d5e\",\n      \"resourceType\" : \"VirtualMachine\",\n      \"createdAt\" : \"2020-03-20T15:00:00Z\",\n      \"displayName\" : \"My virtual machine\",\n      \"lastObservedAt\" : \"2020-04-01T12:00:00Z\",\n      \"terminatedAt\" : \"2020-04-25T09:00:00Z\",\n      \"resourceMeta\" : {\n        \"ipAddress\" : \"12.34.56.78\"\n      },\n      \"status\" : \"Terminated\"\n    }\n  } ],\n  \"pageable\" : {\n    \"pageNumber\" : 0,\n    \"pageSize\" : 20,\n    \"sort\" : {\n      \"empty\" : false,\n      \"sorted\" : true,\n      \"unsorted\" : false\n    },\n    \"offset\" : 0,\n    \"paged\" : true,\n    \"unpaged\" : false\n  },\n  \"totalPages\" : 1,\n  \"totalElements\" : 1,\n  \"last\" : true,\n  \"size\" : 20,\n  \"number\" : 0,\n  \"sort\" : {\n    \"empty\" : false,\n    \"sorted\" : true,\n    \"unsorted\" : false\n  },\n  \"numberOfElements\" : 1,\n  \"first\" : true,\n  \"empty\" : false\n}",
+      "body" : "{\n  \"content\" : [ {\n    \"metadata\" : {\n      \"customer\" : \"example-customer\",\n      \"project\" : \"example-project\",\n      \"platform\" : \"os.eu-de-central\",\n      \"tenantId\" : \"f7ac731cc11f40efbc03a9f9e1d1d21f\",\n      \"projectOwner\" : \"project-owner@example.com\",\n      \"tags\" : {\n        \"costCenter\" : [ \"1234\" ]\n      }\n    },\n    \"resource\" : {\n      \"resourceId\" : \"a9debfe41a6d4d09a677da737b907d5e\",\n      \"resourceType\" : \"VirtualMachine\",\n      \"createdAt\" : \"2020-03-20T15:00:00Z\",\n      \"displayName\" : \"My virtual machine\",\n      \"lastObservedAt\" : \"2020-04-01T12:00:00Z\",\n      \"terminatedAt\" : \"2020-04-25T09:00:00Z\",\n      \"resourceMeta\" : {\n        \"ipAddress\" : \"12.34.56.78\"\n      },\n      \"status\" : \"Terminated\"\n    }\n  } ],\n  \"pageable\" : {\n    \"pageNumber\" : 0,\n    \"pageSize\" : 20,\n    \"sort\" : {\n      \"empty\" : false,\n      \"sorted\" : true,\n      \"unsorted\" : false\n    },\n    \"offset\" : 0,\n    \"paged\" : true,\n    \"unpaged\" : false\n  },\n  \"last\" : true,\n  \"totalPages\" : 1,\n  \"totalElements\" : 1,\n  \"size\" : 20,\n  \"number\" : 0,\n  \"sort\" : {\n    \"empty\" : false,\n    \"sorted\" : true,\n    \"unsorted\" : false\n  },\n  \"first\" : true,\n  \"numberOfElements\" : 1,\n  \"empty\" : false\n}",
       "code" : 200
     } ]
   } ],
diff --git a/website/static/billing-api/meshmetering-swagger-docs.json b/website/static/billing-api/meshmetering-swagger-docs.json
index 4c24632fe..3bd9678fb 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-10-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-10-30T17:48:30.578961200Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-10-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-10-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-09-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-10-30T17:48:30.580673200Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-09-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-09-01T00:00:00Z\",\n          \"to\" : \"2024-10-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-09-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-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-11-06T13:34:39.519450400Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\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          \"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-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-10-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-11-06T13:34:39.520904700Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-10-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-10-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-10-30T17:48:32.593083500Z\",\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-10-01T00:00:00Z\",\n          \"to\" : \"2024-11-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-11-06T13:34:42.164566300Z\",\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-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-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"
@@ -222,7 +222,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshchargebacks/2024-10-01Z/testPartner%3AtestWorkspace%3AtestProject" : {
+    "/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshChargeback",
@@ -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-10-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-10-30T17:48:30.578961200Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-10-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-10-01T00:00:00Z\",\n      \"to\" : \"2024-11-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-10-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-11-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-11-06T13:34:39.519450400Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-11-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\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      \"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-11-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-10-30T17:48:32.593083500Z\",\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-10-01T00:00:00Z\",\n      \"to\" : \"2024-11-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-11-06T13:34:42.164566300Z\",\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-11-01T00:00:00Z\",\n      \"to\" : \"2024-12-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"
@@ -336,7 +336,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/json" : "{\n  \"content\" : [ {\n    \"metadata\" : {\n      \"customer\" : \"example-customer\",\n      \"project\" : \"example-project\",\n      \"platform\" : \"os.eu-de-central\",\n      \"tenantId\" : \"f7ac731cc11f40efbc03a9f9e1d1d21f\",\n      \"projectOwner\" : \"project-owner@example.com\",\n      \"tags\" : {\n        \"costCenter\" : [ \"1234\" ]\n      }\n    },\n    \"resource\" : {\n      \"resourceId\" : \"a9debfe41a6d4d09a677da737b907d5e\",\n      \"resourceType\" : \"VirtualMachine\",\n      \"createdAt\" : \"2020-03-20T15:00:00Z\",\n      \"displayName\" : \"My virtual machine\",\n      \"lastObservedAt\" : \"2020-04-01T12:00:00Z\",\n      \"terminatedAt\" : \"2020-04-25T09:00:00Z\",\n      \"resourceMeta\" : {\n        \"ipAddress\" : \"12.34.56.78\"\n      },\n      \"status\" : \"Terminated\"\n    }\n  } ],\n  \"pageable\" : {\n    \"pageNumber\" : 0,\n    \"pageSize\" : 20,\n    \"sort\" : {\n      \"empty\" : false,\n      \"sorted\" : true,\n      \"unsorted\" : false\n    },\n    \"offset\" : 0,\n    \"paged\" : true,\n    \"unpaged\" : false\n  },\n  \"totalPages\" : 1,\n  \"totalElements\" : 1,\n  \"last\" : true,\n  \"size\" : 20,\n  \"number\" : 0,\n  \"sort\" : {\n    \"empty\" : false,\n    \"sorted\" : true,\n    \"unsorted\" : false\n  },\n  \"numberOfElements\" : 1,\n  \"first\" : true,\n  \"empty\" : false\n}"
+              "application/json" : "{\n  \"content\" : [ {\n    \"metadata\" : {\n      \"customer\" : \"example-customer\",\n      \"project\" : \"example-project\",\n      \"platform\" : \"os.eu-de-central\",\n      \"tenantId\" : \"f7ac731cc11f40efbc03a9f9e1d1d21f\",\n      \"projectOwner\" : \"project-owner@example.com\",\n      \"tags\" : {\n        \"costCenter\" : [ \"1234\" ]\n      }\n    },\n    \"resource\" : {\n      \"resourceId\" : \"a9debfe41a6d4d09a677da737b907d5e\",\n      \"resourceType\" : \"VirtualMachine\",\n      \"createdAt\" : \"2020-03-20T15:00:00Z\",\n      \"displayName\" : \"My virtual machine\",\n      \"lastObservedAt\" : \"2020-04-01T12:00:00Z\",\n      \"terminatedAt\" : \"2020-04-25T09:00:00Z\",\n      \"resourceMeta\" : {\n        \"ipAddress\" : \"12.34.56.78\"\n      },\n      \"status\" : \"Terminated\"\n    }\n  } ],\n  \"pageable\" : {\n    \"pageNumber\" : 0,\n    \"pageSize\" : 20,\n    \"sort\" : {\n      \"empty\" : false,\n      \"sorted\" : true,\n      \"unsorted\" : false\n    },\n    \"offset\" : 0,\n    \"paged\" : true,\n    \"unpaged\" : false\n  },\n  \"last\" : true,\n  \"totalPages\" : 1,\n  \"totalElements\" : 1,\n  \"size\" : 20,\n  \"number\" : 0,\n  \"sort\" : {\n    \"empty\" : false,\n    \"sorted\" : true,\n    \"unsorted\" : false\n  },\n  \"first\" : true,\n  \"numberOfElements\" : 1,\n  \"empty\" : false\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/getExternalCloudResources"
diff --git a/website/static/billing-api/overview.html b/website/static/billing-api/overview.html
index 904177314..670cf27dd 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-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/technical_specification.html b/website/static/billing-api/technical_specification.html
index f791a334e..6d3110ac3 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-10-30 17:46:59 UTC
+Last updated 2024-11-06 13:33:14 UTC
 </div>
 </div>
 </body>

From ea5edfe18e09e0863f6fe1f1c9ef07eaf3c10484 Mon Sep 17 00:00:00 2001
From: "github-merge-queue[bot]"
 <118344674+github-merge-queue[bot]@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:53:08 +0000
Subject: [PATCH 2/3] docs: update meshStack API docs from latest develop build

---
 website/static/api/api_index.html             |    2 +-
 website/static/api/api_key_login.html         |    2 +-
 website/static/api/api_keys.html              |    2 +-
 website/static/api/common_data_formats.html   |    2 +-
 website/static/api/index.html                 |  741 ++++++++---
 website/static/api/mesh_buildingblock.html    |   30 +-
 .../static/api/mesh_buildingblockrunner.html  |    2 +-
 .../static/api/mesh_object_collection.html    |    4 +-
 .../api/mesh_object_declarative_import.html   |    2 +-
 website/static/api/mesh_objects.html          |  744 ++++++++---
 website/static/api/mesh_paymentmethod.html    |   20 +-
 website/static/api/mesh_project.html          |   78 +-
 website/static/api/mesh_project_bindings.html |   30 +-
 website/static/api/mesh_serviceinstance.html  |   64 +-
 website/static/api/mesh_tag_definition.html   |  454 ++++++-
 website/static/api/mesh_tenant.html           |   10 +-
 website/static/api/mesh_user.html             |    6 +-
 website/static/api/mesh_workspace.html        |   10 +-
 .../static/api/mesh_workspace_bindings.html   |    2 +-
 .../static/api/mesh_workspaceusergroup.html   |    2 +-
 .../static/api/meshstack-openapi-docs.json    | 1084 +++++++++-------
 ...meshstack-postman-collection-original.json |  795 +++++++-----
 .../api/meshstack-postman-collection.json     |  801 +++++++-----
 .../static/api/meshstack-swagger-docs.json    | 1134 +++++++++--------
 website/static/api/metadata.html              |    2 +-
 .../static/api/technical_specification.html   |    2 +-
 26 files changed, 4022 insertions(+), 2003 deletions(-)

diff --git a/website/static/api/api_index.html b/website/static/api/api_index.html
index 8573876b4..d0b2a0744 100644
--- a/website/static/api/api_index.html
+++ b/website/static/api/api_index.html
@@ -566,7 +566,7 @@ <h3 id="_index">Index</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/api_key_login.html b/website/static/api/api_key_login.html
index b3af1438e..61591a678 100644
--- a/website/static/api/api_key_login.html
+++ b/website/static/api/api_key_login.html
@@ -591,7 +591,7 @@ <h3 id="api_key_login">API Key Login</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/api_keys.html b/website/static/api/api_keys.html
index 222943683..d04d9bf52 100644
--- a/website/static/api/api_keys.html
+++ b/website/static/api/api_keys.html
@@ -477,7 +477,7 @@ <h3 id="api_keys">API Keys</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/common_data_formats.html b/website/static/api/common_data_formats.html
index 42da31604..5236e18bd 100644
--- a/website/static/api/common_data_formats.html
+++ b/website/static/api/common_data_formats.html
@@ -542,7 +542,7 @@ <h3 id="tags">Tags</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/index.html b/website/static/api/index.html
index 4170796c6..34ebb767d 100644
--- a/website/static/api/index.html
+++ b/website/static/api/index.html
@@ -583,6 +583,9 @@ <h1>meshcloud Public API Docs</h1>
 <ul class="sectlevel4">
 <li><a href="#_list_meshtagdefinitions">List meshTagDefinitions</a></li>
 <li><a href="#_get_meshtagdefinition">Get meshTagDefinition</a></li>
+<li><a href="#_post_meshtagdefinition">Post meshTagDefinition</a></li>
+<li><a href="#_put_meshtagdefinition">Put meshTagDefinition</a></li>
+<li><a href="#_delete_meshtagdefinition">Delete meshTagDefinition</a></li>
 </ul>
 </li>
 <li><a href="#mesh_object_declarative_import">meshObject Declarative Import</a>
@@ -1481,23 +1484,12 @@ <h3 id="mesh_objects"><a class="link" href="#mesh_objects">meshObjects</a></h3>
 
 {
   "_links" : {
-    "meshbuildingblocks" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}",
-      "templated" : true
-    },
-    "meshbuildingblockruns" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&amp;selector}",
-      "templated" : true
-    },
-    "meshworkspaces" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
-    },
-    "meshworkspaceusergroups" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}",
+    "meshusers" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}",
       "templated" : true
     },
-    "meshworkspaceuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}",
+    "meshpaymentmethods" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}",
       "templated" : true
     },
     "meshprojectgroupbindings" : {
@@ -1512,23 +1504,34 @@ <h3 id="mesh_objects"><a class="link" href="#mesh_objects">meshObjects</a></h3>
       "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
       "templated" : true
     },
-    "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}",
+    "meshtenants" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
       "templated" : true
     },
-    "meshtagdefinitions" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions"
+    "meshserviceinstances" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
+      "templated" : true
     },
-    "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
+    "meshworkspaceusergroups" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}",
       "templated" : true
     },
-    "meshpaymentmethods" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}",
+    "meshworkspaceuserbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}",
       "templated" : true
     },
-    "meshserviceinstances" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
+    "meshworkspaces" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
+    },
+    "meshtagdefinitions" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions"
+    },
+    "meshbuildingblocks" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}",
+      "templated" : true
+    },
+    "meshbuildingblockruns" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&amp;selector}",
       "templated" : true
     },
     "self" : {
@@ -1667,7 +1670,7 @@ <h5 id="_list_meshworkspaces"><a class="link" href="#_list_meshworkspaces">List
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "admin-customer",
-        "createdOn" : "2024-10-30T17:48:13Z"
+        "createdOn" : "2024-11-06T13:34:59Z"
       },
       "spec" : {
         "displayName" : "admin-customer",
@@ -1698,7 +1701,7 @@ <h5 id="_list_meshworkspaces"><a class="link" href="#_list_meshworkspaces">List
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-customer",
-        "createdOn" : "2024-10-30T17:48:13Z"
+        "createdOn" : "2024-11-06T13:34:59Z"
       },
       "spec" : {
         "displayName" : "demo-customer",
@@ -1729,7 +1732,7 @@ <h5 id="_list_meshworkspaces"><a class="link" href="#_list_meshworkspaces">List
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-partner",
-        "createdOn" : "2024-10-30T17:48:13Z"
+        "createdOn" : "2024-11-06T13:34:59Z"
       },
       "spec" : {
         "displayName" : "demo-partner",
@@ -1945,7 +1948,7 @@ <h5 id="_get_meshworkspace"><a class="link" href="#_get_meshworkspace">Get meshW
   "apiVersion" : "v1",
   "metadata" : {
     "name" : "admin-customer",
-    "createdOn" : "2024-10-30T17:48:13Z"
+    "createdOn" : "2024-11-06T13:34:59Z"
   },
   "spec" : {
     "displayName" : "admin-customer",
@@ -2039,7 +2042,7 @@ <h5 id="_list_meshprojects"><a class="link" href="#_list_meshprojects">List mesh
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2048,7 +2051,7 @@ <h5 id="_list_meshprojects"><a class="link" href="#_list_meshprojects">List mesh
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -2104,7 +2107,7 @@ <h5 id="_list_meshprojects"><a class="link" href="#_list_meshprojects">List mesh
 Expires: 0
 Strict-Transport-Security: max-age=31536000 ; includeSubDomains
 X-Frame-Options: DENY
-Content-Length: 2283
+Content-Length: 2273
 
 {
   "_embedded" : {
@@ -2113,8 +2116,8 @@ <h5 id="_list_meshprojects"><a class="link" href="#_list_meshprojects">List mesh
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-project-1",
-        "ownedByWorkspace" : "rpbo6mpdsv2",
-        "createdOn" : "2024-10-30T17:49:13.086196622Z"
+        "ownedByWorkspace" : "3s6f2mpdsv2",
+        "createdOn" : "2024-01-01T00:00:00Z"
       },
       "spec" : {
         "displayName" : "Test Project 1",
@@ -2123,38 +2126,38 @@ <h5 id="_list_meshprojects"><a class="link" href="#_list_meshprojects">List mesh
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1"
         },
         "meshtenants" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshusers" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "activePaymentMethod" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment"
         },
         "meshprojectuserbindings" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshprojectgroupbindings" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         }
       }
     } ]
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     }
   },
   "page" : {
@@ -2195,7 +2198,7 @@ <h5 id="_get_meshproject"><a class="link" href="#_get_meshproject">Get meshProje
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2204,7 +2207,7 @@ <h5 id="_get_meshproject"><a class="link" href="#_get_meshproject">Get meshProje
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -2345,16 +2348,16 @@ <h5 id="_get_meshproject"><a class="link" href="#_get_meshproject">Get meshProje
 Expires: 0
 Strict-Transport-Security: max-age=31536000 ; includeSubDomains
 X-Frame-Options: DENY
-Content-Length: 1354
+Content-Length: 1344
 
 {
   "kind" : "meshProject",
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-1",
-    "ownedByWorkspace" : "rpbo6mpdsv2",
-    "createdOn" : "2024-10-30T17:49:13.086196622Z",
-    "deletedOn" : "2024-10-30T17:49:14.767668318Z"
+    "ownedByWorkspace" : "3s6f2mpdsv2",
+    "createdOn" : "2024-01-01T00:00:00Z",
+    "deletedOn" : "2024-11-06T13:36:26.056826397Z"
   },
   "spec" : {
     "displayName" : "Test Project 1",
@@ -2363,22 +2366,22 @@ <h5 id="_get_meshproject"><a class="link" href="#_get_meshproject">Get meshProje
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "activePaymentMethod" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment"
     },
     "meshprojectuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     }
   }
 }</code></pre>
@@ -2429,7 +2432,7 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2"
+    "ownedByWorkspace" : "3s6f2mpdsv2"
   }
 }</code></pre>
 </div>
@@ -2454,7 +2457,7 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2"
+    "ownedByWorkspace" : "3s6f2mpdsv2"
   }
 }</code></pre>
 </div>
@@ -2475,7 +2478,7 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2"
+    "ownedByWorkspace" : "3s6f2mpdsv2"
   }
 }'</code></pre>
 </div>
@@ -2550,7 +2553,7 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
 <div class="listingblock">
 <div class="title">Example Response</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 200 OK
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 201 Created
 Vary: Origin
 Vary: Access-Control-Request-Method
 Vary: Access-Control-Request-Headers
@@ -2569,8 +2572,8 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2",
-    "createdOn" : "2024-10-30T17:49:13.754216329Z"
+    "ownedByWorkspace" : "3s6f2mpdsv2",
+    "createdOn" : "2024-11-06T13:36:25.470629787Z"
   },
   "spec" : {
     "displayName" : "Test Project 3",
@@ -2579,22 +2582,22 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-3"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "activePaymentMethod" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment"
     },
     "meshprojectuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     }
   }
 }</code></pre>
@@ -2651,7 +2654,7 @@ <h5 id="_delete_meshproject"><a class="link" href="#_delete_meshproject">Delete
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2660,7 +2663,7 @@ <h5 id="_delete_meshproject"><a class="link" href="#_delete_meshproject">Delete
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X DELETE \
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X DELETE \
     -H 'Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -2832,7 +2835,7 @@ <h5 id="_list_meshprojectuserbindings"><a class="link" href="#_list_meshprojectu
       "kind" : "meshProjectUserBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "9e090118-a1ff-4a6c-b9be-02d0135beea1"
+        "name" : "ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -2847,7 +2850,7 @@ <h5 id="_list_meshprojectuserbindings"><a class="link" href="#_list_meshprojectu
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
         }
       }
     } ]
@@ -2894,7 +2897,7 @@ <h5 id="_get_meshprojectuserbinding"><a class="link" href="#_get_meshprojectuser
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2903,7 +2906,7 @@ <h5 id="_get_meshprojectuserbinding"><a class="link" href="#_get_meshprojectuser
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -2995,7 +2998,7 @@ <h5 id="_get_meshprojectuserbinding"><a class="link" href="#_get_meshprojectuser
   "kind" : "meshProjectUserBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "9e090118-a1ff-4a6c-b9be-02d0135beea1"
+    "name" : "ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -3010,7 +3013,7 @@ <h5 id="_get_meshprojectuserbinding"><a class="link" href="#_get_meshprojectuser
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
     }
   }
 }</code></pre>
@@ -3421,7 +3424,7 @@ <h5 id="_list_meshprojectgroupbindings"><a class="link" href="#_list_meshproject
       "kind" : "meshProjectGroupBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "e8909b8b-0f10-4a0b-929b-f3d821116392"
+        "name" : "7632f4c6-306b-4de6-9e31-aa0cb97977d2"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -3436,7 +3439,7 @@ <h5 id="_list_meshprojectgroupbindings"><a class="link" href="#_list_meshproject
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
         }
       }
     } ]
@@ -3483,7 +3486,7 @@ <h5 id="_get_meshprojectgroupbinding"><a class="link" href="#_get_meshprojectgro
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -3492,7 +3495,7 @@ <h5 id="_get_meshprojectgroupbinding"><a class="link" href="#_get_meshprojectgro
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -3584,7 +3587,7 @@ <h5 id="_get_meshprojectgroupbinding"><a class="link" href="#_get_meshprojectgro
   "kind" : "meshProjectGroupBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "e8909b8b-0f10-4a0b-929b-f3d821116392"
+    "name" : "7632f4c6-306b-4de6-9e31-aa0cb97977d2"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -3599,7 +3602,7 @@ <h5 id="_get_meshprojectgroupbinding"><a class="link" href="#_get_meshprojectgro
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
     }
   }
 }</code></pre>
@@ -3832,7 +3835,7 @@ <h5 id="_delete_meshprojectgroupbinding"><a class="link" href="#_delete_meshproj
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -3840,7 +3843,7 @@ <h5 id="_delete_meshprojectgroupbinding"><a class="link" href="#_delete_meshproj
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4574,12 +4577,12 @@ <h5 id="_list_meshtenants"><a class="link" href="#_list_meshtenants">List meshTe
         "ownedByProject" : "test-project",
         "ownedByWorkspace" : "test-workspace",
         "platformIdentifier" : "aws.aws-meshstack-dev",
-        "deletedOn" : "2024-10-31T17:49:17.565940915Z",
+        "deletedOn" : "2024-11-07T13:36:29.657329297Z",
         "assignedTags" : { },
         "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
       },
       "spec" : {
-        "localId" : "d53bb92d-8fc5-4920-8139-0d3da1f52b4e",
+        "localId" : "8c2d3c5e-b543-46d0-a4fc-1e966df246b5",
         "landingZoneIdentifier" : "stage-dev",
         "quotas" : [ {
           "key" : "limits.cpu",
@@ -4775,12 +4778,12 @@ <h5 id="_get_meshtenant"><a class="link" href="#_get_meshtenant">Get meshTenant<
     "ownedByProject" : "test-project",
     "ownedByWorkspace" : "test-workspace",
     "platformIdentifier" : "aws.aws-meshstack-dev",
-    "deletedOn" : "2024-10-31T17:49:17.565940915Z",
+    "deletedOn" : "2024-11-07T13:36:29.657329297Z",
     "assignedTags" : { },
     "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
   },
   "spec" : {
-    "localId" : "d53bb92d-8fc5-4920-8139-0d3da1f52b4e",
+    "localId" : "8c2d3c5e-b543-46d0-a4fc-1e966df246b5",
     "landingZoneIdentifier" : "stage-dev",
     "quotas" : [ {
       "key" : "limits.cpu",
@@ -5199,7 +5202,7 @@ <h5 id="_list_meshbuildingblocks"><a class="link" href="#_list_meshbuildingblock
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-10-30T17:49:04.874524994Z"
+        "createdOn" : "2024-11-06T13:36:14.903052143Z"
       },
       "spec" : {
         "displayName" : "parent block",
@@ -5230,7 +5233,7 @@ <h5 id="_list_meshbuildingblocks"><a class="link" href="#_list_meshbuildingblock
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-10-30T17:49:04.947339684Z"
+        "createdOn" : "2024-11-06T13:36:14.984878412Z"
       },
       "spec" : {
         "displayName" : "child block",
@@ -5521,7 +5524,7 @@ <h5 id="_get_meshbuildingblock"><a class="link" href="#_get_meshbuildingblock">G
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-10-30T17:49:04.947339684Z"
+    "createdOn" : "2024-11-06T13:36:14.984878412Z"
   },
   "spec" : {
     "displayName" : "child block",
@@ -5613,7 +5616,7 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "29e993e4-e121-4917-8a1c-7878354742a4"
+      "buildingBlockUuid": "8d71f49c-1792-4604-825f-7805dd41f8d4"
     }]
   }
 }</code></pre>
@@ -5642,7 +5645,7 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "29e993e4-e121-4917-8a1c-7878354742a4"
+      "buildingBlockUuid": "8d71f49c-1792-4604-825f-7805dd41f8d4"
     }]
   }
 } '</code></pre>
@@ -5784,12 +5787,12 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
   "kind" : "meshBuildingBlock",
   "apiVersion" : "v1",
   "metadata" : {
-    "uuid" : "9283fb1b-1f7b-4ce6-b104-88996e45939f",
+    "uuid" : "1c10ffc2-f17a-4712-a434-dc619bdb0b0b",
     "definitionUuid" : "ef6aaf87-3f8c-477c-94f4-f3cf509728ca",
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-10-30T17:49:06.293296297Z"
+    "createdOn" : "2024-11-06T13:36:16.807033732Z"
   },
   "spec" : {
     "displayName" : "New BuildingBlock",
@@ -5799,7 +5802,7 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
       "valueType" : "STRING"
     } ],
     "parentBuildingBlocks" : [ {
-      "buildingBlockUuid" : "29e993e4-e121-4917-8a1c-7878354742a4",
+      "buildingBlockUuid" : "8d71f49c-1792-4604-825f-7805dd41f8d4",
       "definitionUuid" : "b23cfb9a-6974-444f-9d33-62134a632373"
     } ]
   },
@@ -5809,13 +5812,13 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b"
     },
     "meshtenant" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
     },
     "forcePurge" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge"
     }
   }
 }</code></pre>
@@ -5832,7 +5835,7 @@ <h5 id="_delete_meshbuildingblock"><a class="link" href="#_delete_meshbuildingbl
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -5840,7 +5843,7 @@ <h5 id="_delete_meshbuildingblock"><a class="link" href="#_delete_meshbuildingbl
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -5870,7 +5873,7 @@ <h5 id="_purge_meshbuildingblock"><a class="link" href="#_purge_meshbuildingbloc
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -5878,7 +5881,7 @@ <h5 id="_purge_meshbuildingblock"><a class="link" href="#_purge_meshbuildingbloc
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -6326,7 +6329,7 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -6335,7 +6338,7 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -6400,7 +6403,7 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-1",
-        "ownedByWorkspace" : "rpbo6mpmdsv2"
+        "ownedByWorkspace" : "3s6f2mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 1",
@@ -6420,7 +6423,7 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-2",
-        "ownedByWorkspace" : "rpbo6mpmdsv2"
+        "ownedByWorkspace" : "3s6f2mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 2",
@@ -6439,16 +6442,16 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=1&amp;size=2"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=1&amp;size=2"
     }
   },
   "page" : {
@@ -6614,7 +6617,7 @@ <h5 id="_get_meshpaymentmethod"><a class="link" href="#_get_meshpaymentmethod">G
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-payment-method-1",
-    "ownedByWorkspace" : "rpbo6mpmdsv2"
+    "ownedByWorkspace" : "3s6f2mpmdsv2"
   },
   "spec" : {
     "displayName" : "Test Payment Method 1",
@@ -6822,7 +6825,7 @@ <h5 id="_list_meshusers"><a class="link" href="#_list_meshusers">List meshUsers<
         "email" : "john-doe@example.com",
         "firstName" : "John",
         "lastName" : "Doe",
-        "euid" : "c12973b1-fd64-4d65-a374-c63c51d4de58",
+        "euid" : "a126bf9c-e697-4384-a82f-b18aac1fff17",
         "tags" : {
           "environment" : [ "dev", "test", "qa" ]
         }
@@ -7019,7 +7022,7 @@ <h5 id="_get_meshuser"><a class="link" href="#_get_meshuser">Get meshUser</a></h
     "email" : "john-doe@example.com",
     "firstName" : "John",
     "lastName" : "Doe",
-    "euid" : "c12973b1-fd64-4d65-a374-c63c51d4de58",
+    "euid" : "a126bf9c-e697-4384-a82f-b18aac1fff17",
     "tags" : {
       "environment" : [ "dev", "test", "qa" ]
     }
@@ -7541,20 +7544,20 @@ <h5 id="_list_meshserviceinstances"><a class="link" href="#_list_meshserviceinst
       "kind" : "meshServiceInstance",
       "apiVersion" : "v2",
       "metadata" : {
-        "ownedByProject" : "rpbo6mtdg10",
+        "ownedByProject" : "3s6f2mtdg10",
         "ownedByWorkspace" : "my-mobile-app-team",
-        "marketplaceIdentifier" : "rpbo6mtdg1",
-        "instanceId" : "rpbo6mtdg11"
+        "marketplaceIdentifier" : "3s6f2mtdg1",
+        "instanceId" : "3s6f2mtdg11"
       },
       "spec" : {
-        "displayName" : "rpbo6mtdg12",
-        "serviceId" : "rpbo6mtdg5",
-        "planId" : "rpbo6mtdg7",
+        "displayName" : "3s6f2mtdg12",
+        "serviceId" : "3s6f2mtdg5",
+        "planId" : "3s6f2mtdg7",
         "creator" : "Unknown"
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/rpbo6mtdg11"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/3s6f2mtdg11"
         }
       }
     } ]
@@ -7721,15 +7724,15 @@ <h5 id="_get_meshserviceinstance"><a class="link" href="#_get_meshserviceinstanc
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -7783,15 +7786,15 @@ <h5 id="_post_meshserviceinstance"><a class="link" href="#_post_meshserviceinsta
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -7807,15 +7810,15 @@ <h5 id="_post_meshserviceinstance"><a class="link" href="#_post_meshserviceinsta
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -7919,15 +7922,15 @@ <h5 id="_post_meshserviceinstance"><a class="link" href="#_post_meshserviceinsta
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -7981,15 +7984,15 @@ <h5 id="_put_meshserviceinstance"><a class="link" href="#_put_meshserviceinstanc
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -8005,15 +8008,15 @@ <h5 id="_put_meshserviceinstance"><a class="link" href="#_put_meshserviceinstanc
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -8105,7 +8108,7 @@ <h5 id="_list_meshtagdefinitions"><a class="link" href="#_list_meshtagdefinition
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">meshApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
 </tr>
 </tbody>
 </table>
@@ -8136,7 +8139,7 @@ <h5 id="_list_meshtagdefinitions"><a class="link" href="#_list_meshtagdefinition
 <div class="title">Example Request</div>
 <div class="content">
 <pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshtagdefinitions?page=0&amp;size=2 HTTP/1.1
-Authorization: Basic bm9fcmlnaHRzOm5vX3JpZ2h0cw==
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
 Host: mesh-backend-url</code></pre>
 </div>
@@ -8144,7 +8147,7 @@ <h5 id="_list_meshtagdefinitions"><a class="link" href="#_list_meshtagdefinition
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&amp;size=2' -i -u 'no_rights:no_rights' -X GET \
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&amp;size=2' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json'</code></pre>
 </div>
 </div>
@@ -8304,7 +8307,26 @@ <h5 id="_get_meshtagdefinition"><a class="link" href="#_get_meshtagdefinition">G
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">meshApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+</tbody>
+</table>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">/api/meshobjects/meshtagdefinitions/{name}</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>metadata.name</code> of the meshTagDefinition.</p></td>
 </tr>
 </tbody>
 </table>
@@ -8312,7 +8334,7 @@ <h5 id="_get_meshtagdefinition"><a class="link" href="#_get_meshtagdefinition">G
 <div class="title">Example Request</div>
 <div class="content">
 <pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter HTTP/1.1
-Authorization: Basic bm9fcmlnaHRzOm5vX3JpZ2h0cw==
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
 Host: mesh-backend-url</code></pre>
 </div>
@@ -8320,12 +8342,12 @@ <h5 id="_get_meshtagdefinition"><a class="link" href="#_get_meshtagdefinition">G
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'no_rights:no_rights' -X GET \
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json'</code></pre>
 </div>
 </div>
 <table id="mesh_tag_definition_response_fields" class="tableblock frame-all grid-all stretch">
-<caption class="title">Response Fields</caption>
+<caption class="title">meshTagDefinition Object Response Fields</caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -8423,7 +8445,8 @@ <h5 id="_get_meshtagdefinition"><a class="link" href="#_get_meshtagdefinition">G
 </table>
 <div id="mesh_tag_definition_response_fields_tag_value_type" class="paragraph">
 <div class="title">Response Fields - TagValueType Schema</div>
-<p>This object describes the value type for a tag.</p>
+<p>This object describes the value type for a tag. Exactly one of the supported type options must be set. If the desired
+option has only optional fields, set this to an empty object or explicitly set the optional fields to <code>null</code>.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
@@ -8570,6 +8593,422 @@ <h5 id="_get_meshtagdefinition"><a class="link" href="#_get_meshtagdefinition">G
 </div>
 </div>
 </div>
+<div class="sect4">
+<h5 id="_post_meshtagdefinition"><a class="link" href="#_post_meshtagdefinition">Post meshTagDefinition</a></h5>
+<div class="paragraph">
+<p>Create a new meshTagDefinition.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Request Headers</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Content-Type</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as a <code>Content-Type</code> header.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="listingblock">
+<div class="title">Example Request</div>
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">POST /api/meshobjects/meshtagdefinitions HTTP/1.1
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
+Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+Content-Length: 523
+Host: mesh-backend-url
+
+{
+  "apiVersion": "v1",
+  "kind": "meshTagDefinition",
+  "metadata": {
+    "name": "meshProject.environment"
+  },
+  "spec": {
+    "targetKind": "meshProject",
+    "key": "environment",
+    "valueType": {
+      "singleSelect": {
+        "options": [ "dev", "test", "qa", "production" ],
+        "defaultValue": "dev"
+      }
+    },
+    "description": "The environment the project runs in.",
+    "displayName": "Environment",
+    "sortOrder": 9999,
+    "mandatory": true,
+    "immutable": false,
+    "restricted": false
+  }
+}</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="title">Example Curl Request</div>
+<div class="content">
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions' -i -u 'valid_username:valid_password' -X POST \
+    -H 'Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8' \
+    -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json' \
+    -d '{
+  "apiVersion": "v1",
+  "kind": "meshTagDefinition",
+  "metadata": {
+    "name": "meshProject.environment"
+  },
+  "spec": {
+    "targetKind": "meshProject",
+    "key": "environment",
+    "valueType": {
+      "singleSelect": {
+        "options": [ "dev", "test", "qa", "production" ],
+        "defaultValue": "dev"
+      }
+    },
+    "description": "The environment the project runs in.",
+    "displayName": "Environment",
+    "sortOrder": 9999,
+    "mandatory": true,
+    "immutable": false,
+    "restricted": false
+  }
+}'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Request Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.</p>
+</div>
+<div class="listingblock">
+<div class="title">Example Response</div>
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 201 Created
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+Location: https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+X-Content-Type-Options: nosniff
+X-XSS-Protection: 0
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Pragma: no-cache
+Expires: 0
+Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+X-Frame-Options: DENY
+Content-Length: 682
+
+{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshProject.environment"
+  },
+  "spec" : {
+    "targetKind" : "meshProject",
+    "key" : "environment",
+    "valueType" : {
+      "singleSelect" : {
+        "options" : [ "dev", "test", "qa", "production" ],
+        "defaultValue" : "dev"
+      }
+    },
+    "description" : "The environment the project runs in.",
+    "displayName" : "Environment",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false
+  },
+  "_links" : {
+    "self" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment"
+    }
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Response Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_put_meshtagdefinition"><a class="link" href="#_put_meshtagdefinition">Put meshTagDefinition</a></h5>
+<div class="paragraph">
+<p>Create or update an existing meshTagDefinition.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Request Headers</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Content-Type</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as a <code>Content-Type</code> header.</p></td>
+</tr>
+</tbody>
+</table>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">/api/meshobjects/meshtagdefinitions/{name}</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>metadata.name</code> of the meshTagDefinition.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="listingblock">
+<div class="title">Example Request</div>
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">PUT /api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter HTTP/1.1
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
+Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+Content-Length: 684
+Host: mesh-backend-url
+
+{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshWorkspace.costCenter"
+  },
+  "spec" : {
+    "targetKind" : "meshWorkspace",
+    "key" : "costCenter",
+    "valueType" : {
+      "string" : {
+        "defaultValue" : "1001",
+        "validationRegex" : "^\\d{4}$"
+      },
+      "email" : null,
+      "integer" : null,
+      "number" : null,
+      "singleSelect" : null,
+      "multiSelect" : null
+    },
+    "description" : "Updated description",
+    "displayName" : "Updated display name",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false,
+    "replicationKey" : "updatedReplicationKey"
+  }
+}</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="title">Example Curl Request</div>
+<div class="content">
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'valid_username:valid_password' -X PUT \
+    -H 'Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8' \
+    -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json' \
+    -d '{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshWorkspace.costCenter"
+  },
+  "spec" : {
+    "targetKind" : "meshWorkspace",
+    "key" : "costCenter",
+    "valueType" : {
+      "string" : {
+        "defaultValue" : "1001",
+        "validationRegex" : "^\\d{4}$"
+      },
+      "email" : null,
+      "integer" : null,
+      "number" : null,
+      "singleSelect" : null,
+      "multiSelect" : null
+    },
+    "description" : "Updated description",
+    "displayName" : "Updated display name",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false,
+    "replicationKey" : "updatedReplicationKey"
+  }
+}'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Request Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.
+Note that the API does not allow changing the <code>key</code> or <code>valueType</code> of an existing meshTagDefinition.</p>
+</div>
+<div class="listingblock">
+<div class="title">Example Response</div>
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 200 OK
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+Content-Disposition: inline;filename=f.txt
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+X-Content-Type-Options: nosniff
+X-XSS-Protection: 0
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Pragma: no-cache
+Expires: 0
+Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+X-Frame-Options: DENY
+Content-Length: 701
+
+{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshWorkspace.costCenter"
+  },
+  "spec" : {
+    "targetKind" : "meshWorkspace",
+    "key" : "costCenter",
+    "valueType" : {
+      "string" : {
+        "defaultValue" : "1001",
+        "validationRegex" : "^\\d{4}$"
+      }
+    },
+    "description" : "Updated description",
+    "displayName" : "Updated display name",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false,
+    "replicationKey" : "updatedReplicationKey"
+  },
+  "_links" : {
+    "self" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter"
+    }
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Response Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_delete_meshtagdefinition"><a class="link" href="#_delete_meshtagdefinition">Delete meshTagDefinition</a></h5>
+<div class="paragraph">
+<p>Delete an existing meshTagDefinition. Please note that deleting a meshTagDefinition will also remove all tag values
+for the <code>key</code> from all meshObjects specified by its <code>targetKind</code>.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Request Headers</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+</tbody>
+</table>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">/api/meshobjects/meshtagdefinitions/{name}</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>metadata.name</code> of the meshTagDefinition.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="listingblock">
+<div class="title">Example Request</div>
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter HTTP/1.1
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
+Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+Host: mesh-backend-url</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="title">Example Curl Request</div>
+<div class="content">
+<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'valid_username:valid_password' -X DELETE \
+    -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Response Fields</div>
+<p>If successful, this request returns an empty response.</p>
+</div>
+<div class="listingblock">
+<div class="title">Example Response</div>
+<div class="content">
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">HTTP/1.1 204 No Content
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+X-Content-Type-Options: nosniff
+X-XSS-Protection: 0
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Pragma: no-cache
+Expires: 0
+Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+X-Frame-Options: DENY</code></pre>
+</div>
+</div>
+</div>
 </div>
 <div class="sect3">
 <h4 id="mesh_object_declarative_import"><a class="link" href="#mesh_object_declarative_import">meshObject Declarative Import</a></h4>
@@ -9890,7 +10329,7 @@ <h4 id="_deletemeshobjectcollection"><a class="link" href="#_deletemeshobjectcol
 {
   "message" : "MeshObjectCollection not-empty-collection cannot be deleted, because it is not empty",
   "errorCode" : "BadRequest",
-  "errorId" : "NpueU4Bpm3"
+  "errorId" : "wqhnsdj7Mr"
 }</code></pre>
 </div>
 </div>
@@ -10152,7 +10591,7 @@ <h4 id="openstack_project_metadata"><a class="link" href="#openstack_project_met
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 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/api/mesh_buildingblock.html b/website/static/api/mesh_buildingblock.html
index 1ff16c20e..0739c2a07 100644
--- a/website/static/api/mesh_buildingblock.html
+++ b/website/static/api/mesh_buildingblock.html
@@ -601,7 +601,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-10-30T17:49:04.874524994Z"
+        "createdOn" : "2024-11-06T13:36:14.903052143Z"
       },
       "spec" : {
         "displayName" : "parent block",
@@ -632,7 +632,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-10-30T17:49:04.947339684Z"
+        "createdOn" : "2024-11-06T13:36:14.984878412Z"
       },
       "spec" : {
         "displayName" : "child block",
@@ -923,7 +923,7 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-10-30T17:49:04.947339684Z"
+    "createdOn" : "2024-11-06T13:36:14.984878412Z"
   },
   "spec" : {
     "displayName" : "child block",
@@ -1015,7 +1015,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "29e993e4-e121-4917-8a1c-7878354742a4"
+      "buildingBlockUuid": "8d71f49c-1792-4604-825f-7805dd41f8d4"
     }]
   }
 }</code></pre>
@@ -1044,7 +1044,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "29e993e4-e121-4917-8a1c-7878354742a4"
+      "buildingBlockUuid": "8d71f49c-1792-4604-825f-7805dd41f8d4"
     }]
   }
 } '</code></pre>
@@ -1186,12 +1186,12 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
   "kind" : "meshBuildingBlock",
   "apiVersion" : "v1",
   "metadata" : {
-    "uuid" : "9283fb1b-1f7b-4ce6-b104-88996e45939f",
+    "uuid" : "1c10ffc2-f17a-4712-a434-dc619bdb0b0b",
     "definitionUuid" : "ef6aaf87-3f8c-477c-94f4-f3cf509728ca",
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-10-30T17:49:06.293296297Z"
+    "createdOn" : "2024-11-06T13:36:16.807033732Z"
   },
   "spec" : {
     "displayName" : "New BuildingBlock",
@@ -1201,7 +1201,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
       "valueType" : "STRING"
     } ],
     "parentBuildingBlocks" : [ {
-      "buildingBlockUuid" : "29e993e4-e121-4917-8a1c-7878354742a4",
+      "buildingBlockUuid" : "8d71f49c-1792-4604-825f-7805dd41f8d4",
       "definitionUuid" : "b23cfb9a-6974-444f-9d33-62134a632373"
     } ]
   },
@@ -1211,13 +1211,13 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b"
     },
     "meshtenant" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
     },
     "forcePurge" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge"
     }
   }
 }</code></pre>
@@ -1234,7 +1234,7 @@ <h5 id="_delete_meshbuildingblock">Delete meshBuildingBlock</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -1242,7 +1242,7 @@ <h5 id="_delete_meshbuildingblock">Delete meshBuildingBlock</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -1272,7 +1272,7 @@ <h5 id="_purge_meshbuildingblock">Purge meshBuildingBlock</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -1280,7 +1280,7 @@ <h5 id="_purge_meshbuildingblock">Purge meshBuildingBlock</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -1672,7 +1672,7 @@ <h5 id="_update_sources_and_steps">Update Sources and Steps</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_buildingblockrunner.html b/website/static/api/mesh_buildingblockrunner.html
index 0194f5457..48338d80d 100644
--- a/website/static/api/mesh_buildingblockrunner.html
+++ b/website/static/api/mesh_buildingblockrunner.html
@@ -453,7 +453,7 @@ <h3 id="mesh_buildingblockrunner">Building Block Runner API</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_object_collection.html b/website/static/api/mesh_object_collection.html
index fc385d036..3a54c1b5f 100644
--- a/website/static/api/mesh_object_collection.html
+++ b/website/static/api/mesh_object_collection.html
@@ -677,7 +677,7 @@ <h4 id="_deletemeshobjectcollection">deleteMeshObjectCollection</h4>
 {
   "message" : "MeshObjectCollection not-empty-collection cannot be deleted, because it is not empty",
   "errorCode" : "BadRequest",
-  "errorId" : "NpueU4Bpm3"
+  "errorId" : "wqhnsdj7Mr"
 }</code></pre>
 </div>
 </div>
@@ -686,7 +686,7 @@ <h4 id="_deletemeshobjectcollection">deleteMeshObjectCollection</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_object_declarative_import.html b/website/static/api/mesh_object_declarative_import.html
index 1d2256002..3314315ba 100644
--- a/website/static/api/mesh_object_declarative_import.html
+++ b/website/static/api/mesh_object_declarative_import.html
@@ -1524,7 +1524,7 @@ <h5 id="_meshexchangerate">meshExchangeRate</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_objects.html b/website/static/api/mesh_objects.html
index 534539538..110dc2d0c 100644
--- a/website/static/api/mesh_objects.html
+++ b/website/static/api/mesh_objects.html
@@ -593,23 +593,12 @@ <h3 id="mesh_objects">meshObjects</h3>
 
 {
   "_links" : {
-    "meshbuildingblocks" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}",
-      "templated" : true
-    },
-    "meshbuildingblockruns" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&amp;selector}",
-      "templated" : true
-    },
-    "meshworkspaces" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
-    },
-    "meshworkspaceusergroups" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}",
+    "meshusers" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}",
       "templated" : true
     },
-    "meshworkspaceuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}",
+    "meshpaymentmethods" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}",
       "templated" : true
     },
     "meshprojectgroupbindings" : {
@@ -624,23 +613,34 @@ <h3 id="mesh_objects">meshObjects</h3>
       "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
       "templated" : true
     },
-    "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}",
+    "meshtenants" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
       "templated" : true
     },
-    "meshtagdefinitions" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions"
+    "meshserviceinstances" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
+      "templated" : true
     },
-    "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
+    "meshworkspaceusergroups" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}",
       "templated" : true
     },
-    "meshpaymentmethods" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}",
+    "meshworkspaceuserbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}",
       "templated" : true
     },
-    "meshserviceinstances" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
+    "meshworkspaces" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
+    },
+    "meshtagdefinitions" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions"
+    },
+    "meshbuildingblocks" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}",
+      "templated" : true
+    },
+    "meshbuildingblockruns" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&amp;selector}",
       "templated" : true
     },
     "self" : {
@@ -779,7 +779,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "admin-customer",
-        "createdOn" : "2024-10-30T17:48:13Z"
+        "createdOn" : "2024-11-06T13:34:59Z"
       },
       "spec" : {
         "displayName" : "admin-customer",
@@ -810,7 +810,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-customer",
-        "createdOn" : "2024-10-30T17:48:13Z"
+        "createdOn" : "2024-11-06T13:34:59Z"
       },
       "spec" : {
         "displayName" : "demo-customer",
@@ -841,7 +841,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-partner",
-        "createdOn" : "2024-10-30T17:48:13Z"
+        "createdOn" : "2024-11-06T13:34:59Z"
       },
       "spec" : {
         "displayName" : "demo-partner",
@@ -1057,7 +1057,7 @@ <h5 id="_get_meshworkspace">Get meshWorkspace</h5>
   "apiVersion" : "v1",
   "metadata" : {
     "name" : "admin-customer",
-    "createdOn" : "2024-10-30T17:48:13Z"
+    "createdOn" : "2024-11-06T13:34:59Z"
   },
   "spec" : {
     "displayName" : "admin-customer",
@@ -1151,7 +1151,7 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1160,7 +1160,7 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -1216,7 +1216,7 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
 Expires: 0
 Strict-Transport-Security: max-age=31536000 ; includeSubDomains
 X-Frame-Options: DENY
-Content-Length: 2283
+Content-Length: 2273
 
 {
   "_embedded" : {
@@ -1225,8 +1225,8 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-project-1",
-        "ownedByWorkspace" : "rpbo6mpdsv2",
-        "createdOn" : "2024-10-30T17:49:13.086196622Z"
+        "ownedByWorkspace" : "3s6f2mpdsv2",
+        "createdOn" : "2024-01-01T00:00:00Z"
       },
       "spec" : {
         "displayName" : "Test Project 1",
@@ -1235,38 +1235,38 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1"
         },
         "meshtenants" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshusers" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "activePaymentMethod" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment"
         },
         "meshprojectuserbindings" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshprojectgroupbindings" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         }
       }
     } ]
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     }
   },
   "page" : {
@@ -1307,7 +1307,7 @@ <h5 id="_get_meshproject">Get meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1316,7 +1316,7 @@ <h5 id="_get_meshproject">Get meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -1457,16 +1457,16 @@ <h5 id="_get_meshproject">Get meshProject</h5>
 Expires: 0
 Strict-Transport-Security: max-age=31536000 ; includeSubDomains
 X-Frame-Options: DENY
-Content-Length: 1354
+Content-Length: 1344
 
 {
   "kind" : "meshProject",
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-1",
-    "ownedByWorkspace" : "rpbo6mpdsv2",
-    "createdOn" : "2024-10-30T17:49:13.086196622Z",
-    "deletedOn" : "2024-10-30T17:49:14.767668318Z"
+    "ownedByWorkspace" : "3s6f2mpdsv2",
+    "createdOn" : "2024-01-01T00:00:00Z",
+    "deletedOn" : "2024-11-06T13:36:26.056826397Z"
   },
   "spec" : {
     "displayName" : "Test Project 1",
@@ -1475,22 +1475,22 @@ <h5 id="_get_meshproject">Get meshProject</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "activePaymentMethod" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment"
     },
     "meshprojectuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     }
   }
 }</code></pre>
@@ -1541,7 +1541,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2"
+    "ownedByWorkspace" : "3s6f2mpdsv2"
   }
 }</code></pre>
 </div>
@@ -1566,7 +1566,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2"
+    "ownedByWorkspace" : "3s6f2mpdsv2"
   }
 }</code></pre>
 </div>
@@ -1587,7 +1587,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2"
+    "ownedByWorkspace" : "3s6f2mpdsv2"
   }
 }'</code></pre>
 </div>
@@ -1662,7 +1662,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Response</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
 Vary: Origin
 Vary: Access-Control-Request-Method
 Vary: Access-Control-Request-Headers
@@ -1681,8 +1681,8 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2",
-    "createdOn" : "2024-10-30T17:49:13.754216329Z"
+    "ownedByWorkspace" : "3s6f2mpdsv2",
+    "createdOn" : "2024-11-06T13:36:25.470629787Z"
   },
   "spec" : {
     "displayName" : "Test Project 3",
@@ -1691,22 +1691,22 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-3"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "activePaymentMethod" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment"
     },
     "meshprojectuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     }
   }
 }</code></pre>
@@ -1763,7 +1763,7 @@ <h5 id="_delete_meshproject">Delete meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1772,7 +1772,7 @@ <h5 id="_delete_meshproject">Delete meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X DELETE \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X DELETE \
     -H 'Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -1944,7 +1944,7 @@ <h5 id="_list_meshprojectuserbindings">List meshProjectUserBindings</h5>
       "kind" : "meshProjectUserBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "9e090118-a1ff-4a6c-b9be-02d0135beea1"
+        "name" : "ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -1959,7 +1959,7 @@ <h5 id="_list_meshprojectuserbindings">List meshProjectUserBindings</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
         }
       }
     } ]
@@ -2006,7 +2006,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2015,7 +2015,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -2107,7 +2107,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
   "kind" : "meshProjectUserBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "9e090118-a1ff-4a6c-b9be-02d0135beea1"
+    "name" : "ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -2122,7 +2122,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
     }
   }
 }</code></pre>
@@ -2533,7 +2533,7 @@ <h5 id="_list_meshprojectgroupbindings">List meshProjectGroupBindings</h5>
       "kind" : "meshProjectGroupBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "e8909b8b-0f10-4a0b-929b-f3d821116392"
+        "name" : "7632f4c6-306b-4de6-9e31-aa0cb97977d2"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -2548,7 +2548,7 @@ <h5 id="_list_meshprojectgroupbindings">List meshProjectGroupBindings</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
         }
       }
     } ]
@@ -2595,7 +2595,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2604,7 +2604,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -2696,7 +2696,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
   "kind" : "meshProjectGroupBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "e8909b8b-0f10-4a0b-929b-f3d821116392"
+    "name" : "7632f4c6-306b-4de6-9e31-aa0cb97977d2"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -2711,7 +2711,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
     }
   }
 }</code></pre>
@@ -2944,7 +2944,7 @@ <h5 id="_delete_meshprojectgroupbinding">Delete meshProjectGroupBinding</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -2952,7 +2952,7 @@ <h5 id="_delete_meshprojectgroupbinding">Delete meshProjectGroupBinding</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3686,12 +3686,12 @@ <h5 id="_list_meshtenants">List meshTenants</h5>
         "ownedByProject" : "test-project",
         "ownedByWorkspace" : "test-workspace",
         "platformIdentifier" : "aws.aws-meshstack-dev",
-        "deletedOn" : "2024-10-31T17:49:17.565940915Z",
+        "deletedOn" : "2024-11-07T13:36:29.657329297Z",
         "assignedTags" : { },
         "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
       },
       "spec" : {
-        "localId" : "d53bb92d-8fc5-4920-8139-0d3da1f52b4e",
+        "localId" : "8c2d3c5e-b543-46d0-a4fc-1e966df246b5",
         "landingZoneIdentifier" : "stage-dev",
         "quotas" : [ {
           "key" : "limits.cpu",
@@ -3887,12 +3887,12 @@ <h5 id="_get_meshtenant">Get meshTenant</h5>
     "ownedByProject" : "test-project",
     "ownedByWorkspace" : "test-workspace",
     "platformIdentifier" : "aws.aws-meshstack-dev",
-    "deletedOn" : "2024-10-31T17:49:17.565940915Z",
+    "deletedOn" : "2024-11-07T13:36:29.657329297Z",
     "assignedTags" : { },
     "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
   },
   "spec" : {
-    "localId" : "d53bb92d-8fc5-4920-8139-0d3da1f52b4e",
+    "localId" : "8c2d3c5e-b543-46d0-a4fc-1e966df246b5",
     "landingZoneIdentifier" : "stage-dev",
     "quotas" : [ {
       "key" : "limits.cpu",
@@ -4311,7 +4311,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-10-30T17:49:04.874524994Z"
+        "createdOn" : "2024-11-06T13:36:14.903052143Z"
       },
       "spec" : {
         "displayName" : "parent block",
@@ -4342,7 +4342,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-10-30T17:49:04.947339684Z"
+        "createdOn" : "2024-11-06T13:36:14.984878412Z"
       },
       "spec" : {
         "displayName" : "child block",
@@ -4633,7 +4633,7 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-10-30T17:49:04.947339684Z"
+    "createdOn" : "2024-11-06T13:36:14.984878412Z"
   },
   "spec" : {
     "displayName" : "child block",
@@ -4725,7 +4725,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "29e993e4-e121-4917-8a1c-7878354742a4"
+      "buildingBlockUuid": "8d71f49c-1792-4604-825f-7805dd41f8d4"
     }]
   }
 }</code></pre>
@@ -4754,7 +4754,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "29e993e4-e121-4917-8a1c-7878354742a4"
+      "buildingBlockUuid": "8d71f49c-1792-4604-825f-7805dd41f8d4"
     }]
   }
 } '</code></pre>
@@ -4896,12 +4896,12 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
   "kind" : "meshBuildingBlock",
   "apiVersion" : "v1",
   "metadata" : {
-    "uuid" : "9283fb1b-1f7b-4ce6-b104-88996e45939f",
+    "uuid" : "1c10ffc2-f17a-4712-a434-dc619bdb0b0b",
     "definitionUuid" : "ef6aaf87-3f8c-477c-94f4-f3cf509728ca",
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-10-30T17:49:06.293296297Z"
+    "createdOn" : "2024-11-06T13:36:16.807033732Z"
   },
   "spec" : {
     "displayName" : "New BuildingBlock",
@@ -4911,7 +4911,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
       "valueType" : "STRING"
     } ],
     "parentBuildingBlocks" : [ {
-      "buildingBlockUuid" : "29e993e4-e121-4917-8a1c-7878354742a4",
+      "buildingBlockUuid" : "8d71f49c-1792-4604-825f-7805dd41f8d4",
       "definitionUuid" : "b23cfb9a-6974-444f-9d33-62134a632373"
     } ]
   },
@@ -4921,13 +4921,13 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b"
     },
     "meshtenant" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
     },
     "forcePurge" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge"
     }
   }
 }</code></pre>
@@ -4944,7 +4944,7 @@ <h5 id="_delete_meshbuildingblock">Delete meshBuildingBlock</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -4952,7 +4952,7 @@ <h5 id="_delete_meshbuildingblock">Delete meshBuildingBlock</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -4982,7 +4982,7 @@ <h5 id="_purge_meshbuildingblock">Purge meshBuildingBlock</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -4990,7 +4990,7 @@ <h5 id="_purge_meshbuildingblock">Purge meshBuildingBlock</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -5438,7 +5438,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -5447,7 +5447,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -5512,7 +5512,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-1",
-        "ownedByWorkspace" : "rpbo6mpmdsv2"
+        "ownedByWorkspace" : "3s6f2mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 1",
@@ -5532,7 +5532,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-2",
-        "ownedByWorkspace" : "rpbo6mpmdsv2"
+        "ownedByWorkspace" : "3s6f2mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 2",
@@ -5551,16 +5551,16 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=1&amp;size=2"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=1&amp;size=2"
     }
   },
   "page" : {
@@ -5726,7 +5726,7 @@ <h5 id="_get_meshpaymentmethod">Get meshPaymentMethod</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-payment-method-1",
-    "ownedByWorkspace" : "rpbo6mpmdsv2"
+    "ownedByWorkspace" : "3s6f2mpmdsv2"
   },
   "spec" : {
     "displayName" : "Test Payment Method 1",
@@ -5934,7 +5934,7 @@ <h5 id="_list_meshusers">List meshUsers</h5>
         "email" : "john-doe@example.com",
         "firstName" : "John",
         "lastName" : "Doe",
-        "euid" : "c12973b1-fd64-4d65-a374-c63c51d4de58",
+        "euid" : "a126bf9c-e697-4384-a82f-b18aac1fff17",
         "tags" : {
           "environment" : [ "dev", "test", "qa" ]
         }
@@ -6131,7 +6131,7 @@ <h5 id="_get_meshuser">Get meshUser</h5>
     "email" : "john-doe@example.com",
     "firstName" : "John",
     "lastName" : "Doe",
-    "euid" : "c12973b1-fd64-4d65-a374-c63c51d4de58",
+    "euid" : "a126bf9c-e697-4384-a82f-b18aac1fff17",
     "tags" : {
       "environment" : [ "dev", "test", "qa" ]
     }
@@ -6653,20 +6653,20 @@ <h5 id="_list_meshserviceinstances">List meshServiceInstances</h5>
       "kind" : "meshServiceInstance",
       "apiVersion" : "v2",
       "metadata" : {
-        "ownedByProject" : "rpbo6mtdg10",
+        "ownedByProject" : "3s6f2mtdg10",
         "ownedByWorkspace" : "my-mobile-app-team",
-        "marketplaceIdentifier" : "rpbo6mtdg1",
-        "instanceId" : "rpbo6mtdg11"
+        "marketplaceIdentifier" : "3s6f2mtdg1",
+        "instanceId" : "3s6f2mtdg11"
       },
       "spec" : {
-        "displayName" : "rpbo6mtdg12",
-        "serviceId" : "rpbo6mtdg5",
-        "planId" : "rpbo6mtdg7",
+        "displayName" : "3s6f2mtdg12",
+        "serviceId" : "3s6f2mtdg5",
+        "planId" : "3s6f2mtdg7",
         "creator" : "Unknown"
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/rpbo6mtdg11"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/3s6f2mtdg11"
         }
       }
     } ]
@@ -6833,15 +6833,15 @@ <h5 id="_get_meshserviceinstance">Get meshServiceInstance</h5>
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -6895,15 +6895,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -6919,15 +6919,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -7031,15 +7031,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -7093,15 +7093,15 @@ <h5 id="_put_meshserviceinstance">Put meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -7117,15 +7117,15 @@ <h5 id="_put_meshserviceinstance">Put meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -7217,7 +7217,7 @@ <h5 id="_list_meshtagdefinitions">List meshTagDefinitions</h5>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">meshApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
 </tr>
 </tbody>
 </table>
@@ -7248,7 +7248,7 @@ <h5 id="_list_meshtagdefinitions">List meshTagDefinitions</h5>
 <div class="title">Example Request</div>
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshtagdefinitions?page=0&amp;size=2 HTTP/1.1
-Authorization: Basic bm9fcmlnaHRzOm5vX3JpZ2h0cw==
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
 Host: mesh-backend-url</code></pre>
 </div>
@@ -7256,7 +7256,7 @@ <h5 id="_list_meshtagdefinitions">List meshTagDefinitions</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&amp;size=2' -i -u 'no_rights:no_rights' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&amp;size=2' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json'</code></pre>
 </div>
 </div>
@@ -7416,7 +7416,26 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">meshApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+</tbody>
+</table>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 91. /api/meshobjects/meshtagdefinitions/{name}</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>metadata.name</code> of the meshTagDefinition.</p></td>
 </tr>
 </tbody>
 </table>
@@ -7424,7 +7443,7 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 <div class="title">Example Request</div>
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter HTTP/1.1
-Authorization: Basic bm9fcmlnaHRzOm5vX3JpZ2h0cw==
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
 Host: mesh-backend-url</code></pre>
 </div>
@@ -7432,12 +7451,12 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'no_rights:no_rights' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json'</code></pre>
 </div>
 </div>
 <table id="mesh_tag_definition_response_fields" class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 91. Response Fields</caption>
+<caption class="title">Table 92. meshTagDefinition Object Response Fields</caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -7535,7 +7554,8 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 </table>
 <div id="mesh_tag_definition_response_fields_tag_value_type" class="paragraph">
 <div class="title">Response Fields - TagValueType Schema</div>
-<p>This object describes the value type for a tag.</p>
+<p>This object describes the value type for a tag. Exactly one of the supported type options must be set. If the desired
+option has only optional fields, set this to an empty object or explicitly set the optional fields to <code>null</code>.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
@@ -7682,6 +7702,422 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 </div>
 </div>
 </div>
+<div class="sect4">
+<h5 id="_post_meshtagdefinition">Post meshTagDefinition</h5>
+<div class="paragraph">
+<p>Create a new meshTagDefinition.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 93. Request Headers</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Content-Type</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as a <code>Content-Type</code> header.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="listingblock">
+<div class="title">Example Request</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /api/meshobjects/meshtagdefinitions HTTP/1.1
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
+Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+Content-Length: 523
+Host: mesh-backend-url
+
+{
+  "apiVersion": "v1",
+  "kind": "meshTagDefinition",
+  "metadata": {
+    "name": "meshProject.environment"
+  },
+  "spec": {
+    "targetKind": "meshProject",
+    "key": "environment",
+    "valueType": {
+      "singleSelect": {
+        "options": [ "dev", "test", "qa", "production" ],
+        "defaultValue": "dev"
+      }
+    },
+    "description": "The environment the project runs in.",
+    "displayName": "Environment",
+    "sortOrder": 9999,
+    "mandatory": true,
+    "immutable": false,
+    "restricted": false
+  }
+}</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="title">Example Curl Request</div>
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions' -i -u 'valid_username:valid_password' -X POST \
+    -H 'Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8' \
+    -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json' \
+    -d '{
+  "apiVersion": "v1",
+  "kind": "meshTagDefinition",
+  "metadata": {
+    "name": "meshProject.environment"
+  },
+  "spec": {
+    "targetKind": "meshProject",
+    "key": "environment",
+    "valueType": {
+      "singleSelect": {
+        "options": [ "dev", "test", "qa", "production" ],
+        "defaultValue": "dev"
+      }
+    },
+    "description": "The environment the project runs in.",
+    "displayName": "Environment",
+    "sortOrder": 9999,
+    "mandatory": true,
+    "immutable": false,
+    "restricted": false
+  }
+}'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Request Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.</p>
+</div>
+<div class="listingblock">
+<div class="title">Example Response</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+Location: https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+X-Content-Type-Options: nosniff
+X-XSS-Protection: 0
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Pragma: no-cache
+Expires: 0
+Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+X-Frame-Options: DENY
+Content-Length: 682
+
+{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshProject.environment"
+  },
+  "spec" : {
+    "targetKind" : "meshProject",
+    "key" : "environment",
+    "valueType" : {
+      "singleSelect" : {
+        "options" : [ "dev", "test", "qa", "production" ],
+        "defaultValue" : "dev"
+      }
+    },
+    "description" : "The environment the project runs in.",
+    "displayName" : "Environment",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false
+  },
+  "_links" : {
+    "self" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment"
+    }
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Response Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_put_meshtagdefinition">Put meshTagDefinition</h5>
+<div class="paragraph">
+<p>Create or update an existing meshTagDefinition.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 94. Request Headers</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Content-Type</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as a <code>Content-Type</code> header.</p></td>
+</tr>
+</tbody>
+</table>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 95. /api/meshobjects/meshtagdefinitions/{name}</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>metadata.name</code> of the meshTagDefinition.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="listingblock">
+<div class="title">Example Request</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter HTTP/1.1
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
+Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+Content-Length: 684
+Host: mesh-backend-url
+
+{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshWorkspace.costCenter"
+  },
+  "spec" : {
+    "targetKind" : "meshWorkspace",
+    "key" : "costCenter",
+    "valueType" : {
+      "string" : {
+        "defaultValue" : "1001",
+        "validationRegex" : "^\\d{4}$"
+      },
+      "email" : null,
+      "integer" : null,
+      "number" : null,
+      "singleSelect" : null,
+      "multiSelect" : null
+    },
+    "description" : "Updated description",
+    "displayName" : "Updated display name",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false,
+    "replicationKey" : "updatedReplicationKey"
+  }
+}</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="title">Example Curl Request</div>
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'valid_username:valid_password' -X PUT \
+    -H 'Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8' \
+    -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json' \
+    -d '{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshWorkspace.costCenter"
+  },
+  "spec" : {
+    "targetKind" : "meshWorkspace",
+    "key" : "costCenter",
+    "valueType" : {
+      "string" : {
+        "defaultValue" : "1001",
+        "validationRegex" : "^\\d{4}$"
+      },
+      "email" : null,
+      "integer" : null,
+      "number" : null,
+      "singleSelect" : null,
+      "multiSelect" : null
+    },
+    "description" : "Updated description",
+    "displayName" : "Updated display name",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false,
+    "replicationKey" : "updatedReplicationKey"
+  }
+}'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Request Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.
+Note that the API does not allow changing the <code>key</code> or <code>valueType</code> of an existing meshTagDefinition.</p>
+</div>
+<div class="listingblock">
+<div class="title">Example Response</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+Content-Disposition: inline;filename=f.txt
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+X-Content-Type-Options: nosniff
+X-XSS-Protection: 0
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Pragma: no-cache
+Expires: 0
+Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+X-Frame-Options: DENY
+Content-Length: 701
+
+{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshWorkspace.costCenter"
+  },
+  "spec" : {
+    "targetKind" : "meshWorkspace",
+    "key" : "costCenter",
+    "valueType" : {
+      "string" : {
+        "defaultValue" : "1001",
+        "validationRegex" : "^\\d{4}$"
+      }
+    },
+    "description" : "Updated description",
+    "displayName" : "Updated display name",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false,
+    "replicationKey" : "updatedReplicationKey"
+  },
+  "_links" : {
+    "self" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter"
+    }
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Response Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_delete_meshtagdefinition">Delete meshTagDefinition</h5>
+<div class="paragraph">
+<p>Delete an existing meshTagDefinition. Please note that deleting a meshTagDefinition will also remove all tag values
+for the <code>key</code> from all meshObjects specified by its <code>targetKind</code>.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 96. Request Headers</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+</tbody>
+</table>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 97. /api/meshobjects/meshtagdefinitions/{name}</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>metadata.name</code> of the meshTagDefinition.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="listingblock">
+<div class="title">Example Request</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter HTTP/1.1
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
+Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+Host: mesh-backend-url</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="title">Example Curl Request</div>
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'valid_username:valid_password' -X DELETE \
+    -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Response Fields</div>
+<p>If successful, this request returns an empty response.</p>
+</div>
+<div class="listingblock">
+<div class="title">Example Response</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 204 No Content
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+X-Content-Type-Options: nosniff
+X-XSS-Protection: 0
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Pragma: no-cache
+Expires: 0
+Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+X-Frame-Options: DENY</code></pre>
+</div>
+</div>
+</div>
 </div>
 <div class="sect3">
 <h4 id="mesh_object_declarative_import">meshObject Declarative Import</h4>
@@ -7696,7 +8132,7 @@ <h4 id="mesh_object_declarative_import">meshObject Declarative Import</h4>
 <p>meshObjects can be imported into a <a href="#mesh_object_collection">meshObjectCollection</a> (<code><strong>Beta</strong></code>) using the following optional request parameters.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 92. Request Headers</caption>
+<caption class="title">Table 98. Request Headers</caption>
 <colgroup>
 <col style="width: 50%;">
 <col style="width: 50%;">
@@ -7719,7 +8155,7 @@ <h4 id="mesh_object_declarative_import">meshObject Declarative Import</h4>
 </tbody>
 </table>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 93. Request Parameters</caption>
+<caption class="title">Table 99. Request Parameters</caption>
 <colgroup>
 <col style="width: 50%;">
 <col style="width: 50%;">
@@ -7843,7 +8279,7 @@ <h4 id="mesh_object_declarative_import">meshObject Declarative Import</h4>
 </div>
 </div>
 <table class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 94. Response Fields</caption>
+<caption class="title">Table 100. Response Fields</caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -8024,7 +8460,7 @@ <h4 id="mesh_object_declarative_import">meshObject Declarative Import</h4>
 Declarative deletion only works, if the respective resource is part of a <a href="#mesh_object_collection">meshObjectCollection</a> (<code><strong>Beta</strong></code>).</p>
 </div>
 <table id="supported_meshobjects" class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 95. Supported meshObjects</caption>
+<caption class="title">Table 101. Supported meshObjects</caption>
 <colgroup>
 <col style="width: 25%;">
 <col style="width: 25%;">
@@ -8768,7 +9204,7 @@ <h5 id="_meshexchangerate">meshExchangeRate</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_paymentmethod.html b/website/static/api/mesh_paymentmethod.html
index d8e4be107..858b59d51 100644
--- a/website/static/api/mesh_paymentmethod.html
+++ b/website/static/api/mesh_paymentmethod.html
@@ -499,7 +499,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -508,7 +508,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -573,7 +573,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-1",
-        "ownedByWorkspace" : "rpbo6mpmdsv2"
+        "ownedByWorkspace" : "3s6f2mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 1",
@@ -593,7 +593,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-2",
-        "ownedByWorkspace" : "rpbo6mpmdsv2"
+        "ownedByWorkspace" : "3s6f2mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 2",
@@ -612,16 +612,16 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=0&amp;size=2"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=1&amp;size=2"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&amp;page=1&amp;size=2"
     }
   },
   "page" : {
@@ -787,7 +787,7 @@ <h5 id="_get_meshpaymentmethod">Get meshPaymentMethod</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-payment-method-1",
-    "ownedByWorkspace" : "rpbo6mpmdsv2"
+    "ownedByWorkspace" : "3s6f2mpmdsv2"
   },
   "spec" : {
     "displayName" : "Test Payment Method 1",
@@ -810,7 +810,7 @@ <h5 id="_get_meshpaymentmethod">Get meshPaymentMethod</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_project.html b/website/static/api/mesh_project.html
index 17d0bf2b9..6446e612d 100644
--- a/website/static/api/mesh_project.html
+++ b/website/static/api/mesh_project.html
@@ -503,7 +503,7 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -512,7 +512,7 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -568,7 +568,7 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
 Expires: 0
 Strict-Transport-Security: max-age=31536000 ; includeSubDomains
 X-Frame-Options: DENY
-Content-Length: 2283
+Content-Length: 2273
 
 {
   "_embedded" : {
@@ -577,8 +577,8 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-project-1",
-        "ownedByWorkspace" : "rpbo6mpdsv2",
-        "createdOn" : "2024-10-30T17:49:13.086196622Z"
+        "ownedByWorkspace" : "3s6f2mpdsv2",
+        "createdOn" : "2024-01-01T00:00:00Z"
       },
       "spec" : {
         "displayName" : "Test Project 1",
@@ -587,38 +587,38 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1"
         },
         "meshtenants" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshusers" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "activePaymentMethod" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment"
         },
         "meshprojectuserbindings" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshprojectgroupbindings" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
         }
       }
     } ]
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     }
   },
   "page" : {
@@ -659,7 +659,7 @@ <h5 id="_get_meshproject">Get meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -668,7 +668,7 @@ <h5 id="_get_meshproject">Get meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -809,16 +809,16 @@ <h5 id="_get_meshproject">Get meshProject</h5>
 Expires: 0
 Strict-Transport-Security: max-age=31536000 ; includeSubDomains
 X-Frame-Options: DENY
-Content-Length: 1354
+Content-Length: 1344
 
 {
   "kind" : "meshProject",
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-1",
-    "ownedByWorkspace" : "rpbo6mpdsv2",
-    "createdOn" : "2024-10-30T17:49:13.086196622Z",
-    "deletedOn" : "2024-10-30T17:49:14.767668318Z"
+    "ownedByWorkspace" : "3s6f2mpdsv2",
+    "createdOn" : "2024-01-01T00:00:00Z",
+    "deletedOn" : "2024-11-06T13:36:26.056826397Z"
   },
   "spec" : {
     "displayName" : "Test Project 1",
@@ -827,22 +827,22 @@ <h5 id="_get_meshproject">Get meshProject</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "activePaymentMethod" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment"
     },
     "meshprojectuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-1"
     }
   }
 }</code></pre>
@@ -893,7 +893,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2"
+    "ownedByWorkspace" : "3s6f2mpdsv2"
   }
 }</code></pre>
 </div>
@@ -918,7 +918,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2"
+    "ownedByWorkspace" : "3s6f2mpdsv2"
   }
 }</code></pre>
 </div>
@@ -939,7 +939,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2"
+    "ownedByWorkspace" : "3s6f2mpdsv2"
   }
 }'</code></pre>
 </div>
@@ -1014,7 +1014,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Response</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
 Vary: Origin
 Vary: Access-Control-Request-Method
 Vary: Access-Control-Request-Headers
@@ -1033,8 +1033,8 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "rpbo6mpdsv2",
-    "createdOn" : "2024-10-30T17:49:13.754216329Z"
+    "ownedByWorkspace" : "3s6f2mpdsv2",
+    "createdOn" : "2024-11-06T13:36:25.470629787Z"
   },
   "spec" : {
     "displayName" : "Test Project 3",
@@ -1043,22 +1043,22 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-3"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "activePaymentMethod" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment"
     },
     "meshprojectuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&amp;projectIdentifier=test-project-3"
     }
   }
 }</code></pre>
@@ -1115,7 +1115,7 @@ <h5 id="_delete_meshproject">Delete meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1124,7 +1124,7 @@ <h5 id="_delete_meshproject">Delete meshProject</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X DELETE \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1' -i -u 'valid_username:valid_password' -X DELETE \
     -H 'Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -1149,7 +1149,7 @@ <h5 id="_delete_meshproject">Delete meshProject</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_project_bindings.html b/website/static/api/mesh_project_bindings.html
index 00df3687b..12a9cd2d5 100644
--- a/website/static/api/mesh_project_bindings.html
+++ b/website/static/api/mesh_project_bindings.html
@@ -590,7 +590,7 @@ <h5 id="_list_meshprojectuserbindings">List meshProjectUserBindings</h5>
       "kind" : "meshProjectUserBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "9e090118-a1ff-4a6c-b9be-02d0135beea1"
+        "name" : "ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -605,7 +605,7 @@ <h5 id="_list_meshprojectuserbindings">List meshProjectUserBindings</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
         }
       }
     } ]
@@ -652,7 +652,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -661,7 +661,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -753,7 +753,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
   "kind" : "meshProjectUserBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "9e090118-a1ff-4a6c-b9be-02d0135beea1"
+    "name" : "ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -768,7 +768,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
     }
   }
 }</code></pre>
@@ -1179,7 +1179,7 @@ <h5 id="_list_meshprojectgroupbindings">List meshProjectGroupBindings</h5>
       "kind" : "meshProjectGroupBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "e8909b8b-0f10-4a0b-929b-f3d821116392"
+        "name" : "7632f4c6-306b-4de6-9e31-aa0cb97977d2"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -1194,7 +1194,7 @@ <h5 id="_list_meshprojectgroupbindings">List meshProjectGroupBindings</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
         }
       }
     } ]
@@ -1241,7 +1241,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1250,7 +1250,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392' -i -u 'valid_username:valid_password' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -1342,7 +1342,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
   "kind" : "meshProjectGroupBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "e8909b8b-0f10-4a0b-929b-f3d821116392"
+    "name" : "7632f4c6-306b-4de6-9e31-aa0cb97977d2"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -1357,7 +1357,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
     }
   }
 }</code></pre>
@@ -1590,7 +1590,7 @@ <h5 id="_delete_meshprojectgroupbinding">Delete meshProjectGroupBinding</h5>
 <div class="listingblock">
 <div class="title">Example Request</div>
 <div class="content">
-<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -1598,7 +1598,7 @@ <h5 id="_delete_meshprojectgroupbinding">Delete meshProjectGroupBinding</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -1625,7 +1625,7 @@ <h5 id="_delete_meshprojectgroupbinding">Delete meshProjectGroupBinding</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_serviceinstance.html b/website/static/api/mesh_serviceinstance.html
index c3b50f349..531af4331 100644
--- a/website/static/api/mesh_serviceinstance.html
+++ b/website/static/api/mesh_serviceinstance.html
@@ -588,20 +588,20 @@ <h5 id="_list_meshserviceinstances">List meshServiceInstances</h5>
       "kind" : "meshServiceInstance",
       "apiVersion" : "v2",
       "metadata" : {
-        "ownedByProject" : "rpbo6mtdg10",
+        "ownedByProject" : "3s6f2mtdg10",
         "ownedByWorkspace" : "my-mobile-app-team",
-        "marketplaceIdentifier" : "rpbo6mtdg1",
-        "instanceId" : "rpbo6mtdg11"
+        "marketplaceIdentifier" : "3s6f2mtdg1",
+        "instanceId" : "3s6f2mtdg11"
       },
       "spec" : {
-        "displayName" : "rpbo6mtdg12",
-        "serviceId" : "rpbo6mtdg5",
-        "planId" : "rpbo6mtdg7",
+        "displayName" : "3s6f2mtdg12",
+        "serviceId" : "3s6f2mtdg5",
+        "planId" : "3s6f2mtdg7",
         "creator" : "Unknown"
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/rpbo6mtdg11"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/3s6f2mtdg11"
         }
       }
     } ]
@@ -768,15 +768,15 @@ <h5 id="_get_meshserviceinstance">Get meshServiceInstance</h5>
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -830,15 +830,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -854,15 +854,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -966,15 +966,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -1028,15 +1028,15 @@ <h5 id="_put_meshserviceinstance">Put meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -1052,15 +1052,15 @@ <h5 id="_put_meshserviceinstance">Put meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "rpbo6smsids-1",
+    "ownedByProject" : "3s6f2smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "rpbo6mtdg21",
+    "marketplaceIdentifier" : "3s6f2mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "rpbo6mtdg25",
-    "planId" : "rpbo6mtdg27",
+    "serviceId" : "3s6f2mtdg25",
+    "planId" : "3s6f2mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -1125,7 +1125,7 @@ <h5 id="_delete_meshserviceinstance">Delete meshServiceInstance</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_tag_definition.html b/website/static/api/mesh_tag_definition.html
index 169675d58..104255c21 100644
--- a/website/static/api/mesh_tag_definition.html
+++ b/website/static/api/mesh_tag_definition.html
@@ -470,7 +470,7 @@ <h5 id="_list_meshtagdefinitions">List meshTagDefinitions</h5>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">meshApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
 </tr>
 </tbody>
 </table>
@@ -501,7 +501,7 @@ <h5 id="_list_meshtagdefinitions">List meshTagDefinitions</h5>
 <div class="title">Example Request</div>
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshtagdefinitions?page=0&amp;size=2 HTTP/1.1
-Authorization: Basic bm9fcmlnaHRzOm5vX3JpZ2h0cw==
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
 Host: mesh-backend-url</code></pre>
 </div>
@@ -509,7 +509,7 @@ <h5 id="_list_meshtagdefinitions">List meshTagDefinitions</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&amp;size=2' -i -u 'no_rights:no_rights' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&amp;size=2' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json'</code></pre>
 </div>
 </div>
@@ -669,7 +669,26 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 <tbody>
 <tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">meshApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+</tbody>
+</table>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 5. /api/meshobjects/meshtagdefinitions/{name}</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>metadata.name</code> of the meshTagDefinition.</p></td>
 </tr>
 </tbody>
 </table>
@@ -677,7 +696,7 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 <div class="title">Example Request</div>
 <div class="content">
 <pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter HTTP/1.1
-Authorization: Basic bm9fcmlnaHRzOm5vX3JpZ2h0cw==
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
 Host: mesh-backend-url</code></pre>
 </div>
@@ -685,12 +704,12 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'no_rights:no_rights' -X GET \
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json'</code></pre>
 </div>
 </div>
 <table id="mesh_tag_definition_response_fields" class="tableblock frame-all grid-all stretch">
-<caption class="title">Table 5. Response Fields</caption>
+<caption class="title">Table 6. meshTagDefinition Object Response Fields</caption>
 <colgroup>
 <col style="width: 33.3333%;">
 <col style="width: 33.3333%;">
@@ -788,7 +807,8 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 </table>
 <div id="mesh_tag_definition_response_fields_tag_value_type" class="paragraph">
 <div class="title">Response Fields - TagValueType Schema</div>
-<p>This object describes the value type for a tag.</p>
+<p>This object describes the value type for a tag. Exactly one of the supported type options must be set. If the desired
+option has only optional fields, set this to an empty object or explicitly set the optional fields to <code>null</code>.</p>
 </div>
 <table class="tableblock frame-all grid-all stretch">
 <colgroup>
@@ -935,11 +955,427 @@ <h5 id="_get_meshtagdefinition">Get meshTagDefinition</h5>
 </div>
 </div>
 </div>
+<div class="sect4">
+<h5 id="_post_meshtagdefinition">Post meshTagDefinition</h5>
+<div class="paragraph">
+<p>Create a new meshTagDefinition.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 7. Request Headers</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Content-Type</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as a <code>Content-Type</code> header.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="listingblock">
+<div class="title">Example Request</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">POST /api/meshobjects/meshtagdefinitions HTTP/1.1
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
+Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+Content-Length: 523
+Host: mesh-backend-url
+
+{
+  "apiVersion": "v1",
+  "kind": "meshTagDefinition",
+  "metadata": {
+    "name": "meshProject.environment"
+  },
+  "spec": {
+    "targetKind": "meshProject",
+    "key": "environment",
+    "valueType": {
+      "singleSelect": {
+        "options": [ "dev", "test", "qa", "production" ],
+        "defaultValue": "dev"
+      }
+    },
+    "description": "The environment the project runs in.",
+    "displayName": "Environment",
+    "sortOrder": 9999,
+    "mandatory": true,
+    "immutable": false,
+    "restricted": false
+  }
+}</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="title">Example Curl Request</div>
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions' -i -u 'valid_username:valid_password' -X POST \
+    -H 'Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8' \
+    -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json' \
+    -d '{
+  "apiVersion": "v1",
+  "kind": "meshTagDefinition",
+  "metadata": {
+    "name": "meshProject.environment"
+  },
+  "spec": {
+    "targetKind": "meshProject",
+    "key": "environment",
+    "valueType": {
+      "singleSelect": {
+        "options": [ "dev", "test", "qa", "production" ],
+        "defaultValue": "dev"
+      }
+    },
+    "description": "The environment the project runs in.",
+    "displayName": "Environment",
+    "sortOrder": 9999,
+    "mandatory": true,
+    "immutable": false,
+    "restricted": false
+  }
+}'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Request Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.</p>
+</div>
+<div class="listingblock">
+<div class="title">Example Response</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 201 Created
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+Location: https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+X-Content-Type-Options: nosniff
+X-XSS-Protection: 0
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Pragma: no-cache
+Expires: 0
+Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+X-Frame-Options: DENY
+Content-Length: 682
+
+{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshProject.environment"
+  },
+  "spec" : {
+    "targetKind" : "meshProject",
+    "key" : "environment",
+    "valueType" : {
+      "singleSelect" : {
+        "options" : [ "dev", "test", "qa", "production" ],
+        "defaultValue" : "dev"
+      }
+    },
+    "description" : "The environment the project runs in.",
+    "displayName" : "Environment",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false
+  },
+  "_links" : {
+    "self" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment"
+    }
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Response Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_put_meshtagdefinition">Put meshTagDefinition</h5>
+<div class="paragraph">
+<p>Create or update an existing meshTagDefinition.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 8. Request Headers</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Content-Type</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as a <code>Content-Type</code> header.</p></td>
+</tr>
+</tbody>
+</table>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 9. /api/meshobjects/meshtagdefinitions/{name}</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>metadata.name</code> of the meshTagDefinition.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="listingblock">
+<div class="title">Example Request</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">PUT /api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter HTTP/1.1
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
+Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+Content-Length: 684
+Host: mesh-backend-url
+
+{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshWorkspace.costCenter"
+  },
+  "spec" : {
+    "targetKind" : "meshWorkspace",
+    "key" : "costCenter",
+    "valueType" : {
+      "string" : {
+        "defaultValue" : "1001",
+        "validationRegex" : "^\\d{4}$"
+      },
+      "email" : null,
+      "integer" : null,
+      "number" : null,
+      "singleSelect" : null,
+      "multiSelect" : null
+    },
+    "description" : "Updated description",
+    "displayName" : "Updated display name",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false,
+    "replicationKey" : "updatedReplicationKey"
+  }
+}</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="title">Example Curl Request</div>
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'valid_username:valid_password' -X PUT \
+    -H 'Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8' \
+    -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json' \
+    -d '{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshWorkspace.costCenter"
+  },
+  "spec" : {
+    "targetKind" : "meshWorkspace",
+    "key" : "costCenter",
+    "valueType" : {
+      "string" : {
+        "defaultValue" : "1001",
+        "validationRegex" : "^\\d{4}$"
+      },
+      "email" : null,
+      "integer" : null,
+      "number" : null,
+      "singleSelect" : null,
+      "multiSelect" : null
+    },
+    "description" : "Updated description",
+    "displayName" : "Updated display name",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false,
+    "replicationKey" : "updatedReplicationKey"
+  }
+}'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Request Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.
+Note that the API does not allow changing the <code>key</code> or <code>valueType</code> of an existing meshTagDefinition.</p>
+</div>
+<div class="listingblock">
+<div class="title">Example Response</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 200 OK
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+Content-Disposition: inline;filename=f.txt
+Content-Type: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+X-Content-Type-Options: nosniff
+X-XSS-Protection: 0
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Pragma: no-cache
+Expires: 0
+Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+X-Frame-Options: DENY
+Content-Length: 701
+
+{
+  "kind" : "meshTagDefinition",
+  "apiVersion" : "v1",
+  "metadata" : {
+    "name" : "meshWorkspace.costCenter"
+  },
+  "spec" : {
+    "targetKind" : "meshWorkspace",
+    "key" : "costCenter",
+    "valueType" : {
+      "string" : {
+        "defaultValue" : "1001",
+        "validationRegex" : "^\\d{4}$"
+      }
+    },
+    "description" : "Updated description",
+    "displayName" : "Updated display name",
+    "sortOrder" : 9999,
+    "mandatory" : true,
+    "immutable" : false,
+    "restricted" : false,
+    "replicationKey" : "updatedReplicationKey"
+  },
+  "_links" : {
+    "self" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter"
+    }
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Response Fields</div>
+<p>A meshTagDefinition object. See <a href="#mesh_tag_definition_response_fields">meshTagDefinition Object Response Fields</a>.</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_delete_meshtagdefinition">Delete meshTagDefinition</h5>
+<div class="paragraph">
+<p>Delete an existing meshTagDefinition. Please note that deleting a meshTagDefinition will also remove all tag values
+for the <code>key</code> from all meshObjects specified by its <code>targetKind</code>.</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 10. Request Headers</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Name</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>Accept</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">meshObjectApi is <a href="#versioning">versioned</a> and you should use  <code>application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json</code> as an <code>Accept</code> header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.</p></td>
+</tr>
+</tbody>
+</table>
+<table class="tableblock frame-all grid-all stretch">
+<caption class="title">Table 11. /api/meshobjects/meshtagdefinitions/{name}</caption>
+<colgroup>
+<col style="width: 50%;">
+<col style="width: 50%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">Parameter</th>
+<th class="tableblock halign-left valign-top">Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><code>name</code></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">The <code>metadata.name</code> of the meshTagDefinition.</p></td>
+</tr>
+</tbody>
+</table>
+<div class="listingblock">
+<div class="title">Example Request</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter HTTP/1.1
+Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
+Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json
+Host: mesh-backend-url</code></pre>
+</div>
+</div>
+<div class="listingblock">
+<div class="title">Example Curl Request</div>
+<div class="content">
+<pre class="highlight"><code class="language-bash" data-lang="bash">$ curl 'https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter' -i -u 'valid_username:valid_password' -X DELETE \
+    -H 'Accept: application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json'</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<div class="title">Response Fields</div>
+<p>If successful, this request returns an empty response.</p>
+</div>
+<div class="listingblock">
+<div class="title">Example Response</div>
+<div class="content">
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">HTTP/1.1 204 No Content
+Vary: Origin
+Vary: Access-Control-Request-Method
+Vary: Access-Control-Request-Headers
+X-Content-Type-Options: nosniff
+X-XSS-Protection: 0
+Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+Pragma: no-cache
+Expires: 0
+Strict-Transport-Security: max-age=31536000 ; includeSubDomains
+X-Frame-Options: DENY</code></pre>
+</div>
+</div>
+</div>
 </div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_tenant.html b/website/static/api/mesh_tenant.html
index b4e63a879..f747ec4f9 100644
--- a/website/static/api/mesh_tenant.html
+++ b/website/static/api/mesh_tenant.html
@@ -590,12 +590,12 @@ <h5 id="_list_meshtenants">List meshTenants</h5>
         "ownedByProject" : "test-project",
         "ownedByWorkspace" : "test-workspace",
         "platformIdentifier" : "aws.aws-meshstack-dev",
-        "deletedOn" : "2024-10-31T17:49:17.565940915Z",
+        "deletedOn" : "2024-11-07T13:36:29.657329297Z",
         "assignedTags" : { },
         "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
       },
       "spec" : {
-        "localId" : "d53bb92d-8fc5-4920-8139-0d3da1f52b4e",
+        "localId" : "8c2d3c5e-b543-46d0-a4fc-1e966df246b5",
         "landingZoneIdentifier" : "stage-dev",
         "quotas" : [ {
           "key" : "limits.cpu",
@@ -791,12 +791,12 @@ <h5 id="_get_meshtenant">Get meshTenant</h5>
     "ownedByProject" : "test-project",
     "ownedByWorkspace" : "test-workspace",
     "platformIdentifier" : "aws.aws-meshstack-dev",
-    "deletedOn" : "2024-10-31T17:49:17.565940915Z",
+    "deletedOn" : "2024-11-07T13:36:29.657329297Z",
     "assignedTags" : { },
     "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
   },
   "spec" : {
-    "localId" : "d53bb92d-8fc5-4920-8139-0d3da1f52b4e",
+    "localId" : "8c2d3c5e-b543-46d0-a4fc-1e966df246b5",
     "landingZoneIdentifier" : "stage-dev",
     "quotas" : [ {
       "key" : "limits.cpu",
@@ -1057,7 +1057,7 @@ <h5 id="_delete_meshtenant">Delete meshTenant</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_user.html b/website/static/api/mesh_user.html
index b96f095ce..dd78a1a0a 100644
--- a/website/static/api/mesh_user.html
+++ b/website/static/api/mesh_user.html
@@ -628,7 +628,7 @@ <h5 id="_list_meshusers">List meshUsers</h5>
         "email" : "john-doe@example.com",
         "firstName" : "John",
         "lastName" : "Doe",
-        "euid" : "c12973b1-fd64-4d65-a374-c63c51d4de58",
+        "euid" : "a126bf9c-e697-4384-a82f-b18aac1fff17",
         "tags" : {
           "environment" : [ "dev", "test", "qa" ]
         }
@@ -825,7 +825,7 @@ <h5 id="_get_meshuser">Get meshUser</h5>
     "email" : "john-doe@example.com",
     "firstName" : "John",
     "lastName" : "Doe",
-    "euid" : "c12973b1-fd64-4d65-a374-c63c51d4de58",
+    "euid" : "a126bf9c-e697-4384-a82f-b18aac1fff17",
     "tags" : {
       "environment" : [ "dev", "test", "qa" ]
     }
@@ -846,7 +846,7 @@ <h5 id="_get_meshuser">Get meshUser</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_workspace.html b/website/static/api/mesh_workspace.html
index f5f7d201c..668d40e0a 100644
--- a/website/static/api/mesh_workspace.html
+++ b/website/static/api/mesh_workspace.html
@@ -569,7 +569,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "admin-customer",
-        "createdOn" : "2024-10-30T17:48:13Z"
+        "createdOn" : "2024-11-06T13:34:59Z"
       },
       "spec" : {
         "displayName" : "admin-customer",
@@ -600,7 +600,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-customer",
-        "createdOn" : "2024-10-30T17:48:13Z"
+        "createdOn" : "2024-11-06T13:34:59Z"
       },
       "spec" : {
         "displayName" : "demo-customer",
@@ -631,7 +631,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-partner",
-        "createdOn" : "2024-10-30T17:48:13Z"
+        "createdOn" : "2024-11-06T13:34:59Z"
       },
       "spec" : {
         "displayName" : "demo-partner",
@@ -847,7 +847,7 @@ <h5 id="_get_meshworkspace">Get meshWorkspace</h5>
   "apiVersion" : "v1",
   "metadata" : {
     "name" : "admin-customer",
-    "createdOn" : "2024-10-30T17:48:13Z"
+    "createdOn" : "2024-11-06T13:34:59Z"
   },
   "spec" : {
     "displayName" : "admin-customer",
@@ -881,7 +881,7 @@ <h5 id="_get_meshworkspace">Get meshWorkspace</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_workspace_bindings.html b/website/static/api/mesh_workspace_bindings.html
index 3b5315728..251128c68 100644
--- a/website/static/api/mesh_workspace_bindings.html
+++ b/website/static/api/mesh_workspace_bindings.html
@@ -1003,7 +1003,7 @@ <h5 id="_delete_meshworkspaceuserbinding">Delete meshWorkspaceUserBinding</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_workspaceusergroup.html b/website/static/api/mesh_workspaceusergroup.html
index 5f233b632..852426488 100644
--- a/website/static/api/mesh_workspaceusergroup.html
+++ b/website/static/api/mesh_workspaceusergroup.html
@@ -799,7 +799,7 @@ <h5 id="_get_meshworkspaceusergroup">Get meshWorkspaceUserGroup</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/meshstack-openapi-docs.json b/website/static/api/meshstack-openapi-docs.json
index 4d472c3a4..3d2542b79 100644
--- a/website/static/api/meshstack-openapi-docs.json
+++ b/website/static/api/meshstack-openapi-docs.json
@@ -159,34 +159,34 @@
         "parameters" : [ {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "schema" : {
             "type" : "string"
           },
-          "example" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json"
+          "example" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json"
         } ],
         "responses" : {
           "200" : {
             "description" : "200",
             "content" : {
-              "application/vnd.meshcloud.api.meshobjects.v1.hal+json" : {
+              "application/vnd.meshcloud.api.meshobjects.v2.hal+json" : {
                 "schema" : {
-                  "$ref" : "#/components/schemas/meshObjectsRootV1"
+                  "$ref" : "#/components/schemas/meshObjectsRootV2"
                 },
                 "examples" : {
-                  "meshObjectsRootV1" : {
-                    "value" : "{\n  \"_links\" : {\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?customerIdentifier,projectIdentifier,platformIdentifier,customerUserGroupIdentifier,projectRole,customerRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups{?customerIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
+                  "meshObjectsRootV2" : {
+                    "value" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblockruns\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&selector}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
                   }
                 }
               },
-              "application/vnd.meshcloud.api.meshobjects.v2.hal+json" : {
+              "application/vnd.meshcloud.api.meshobjects.v1.hal+json" : {
                 "schema" : {
-                  "$ref" : "#/components/schemas/meshObjectsRootV2"
+                  "$ref" : "#/components/schemas/meshObjectsRootV1"
                 },
                 "examples" : {
-                  "meshObjectsRootV2" : {
-                    "value" : "{\n  \"_links\" : {\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblockruns\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&selector}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
+                  "meshObjectsRootV1" : {
+                    "value" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?customerIdentifier,projectIdentifier,platformIdentifier,customerUserGroupIdentifier,projectRole,customerRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups{?customerIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -455,7 +455,7 @@
                 },
                 "examples" : {
                   "meshBuildingBlockList" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n        \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-10-30T17:49:04.874524994Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"parent block\",\n        \"inputs\" : [ ],\n        \"parentBuildingBlocks\" : [ ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a/purge\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n        \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-10-30T17:49:04.947339684Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"child block\",\n        \"inputs\" : [ {\n          \"key\" : \"resourceName\",\n          \"value\" : \"My Test Resource\",\n          \"valueType\" : \"STRING\"\n        } ],\n        \"parentBuildingBlocks\" : [ {\n          \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n          \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n        } ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ {\n          \"key\" : \"resourceId\",\n          \"value\" : \"id-123\",\n          \"valueType\" : \"STRING\"\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks?projectIdentifier=my-project&page=0&size=10\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n        \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-11-06T13:36:14.903052143Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"parent block\",\n        \"inputs\" : [ ],\n        \"parentBuildingBlocks\" : [ ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a/purge\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n        \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-11-06T13:36:14.984878412Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"child block\",\n        \"inputs\" : [ {\n          \"key\" : \"resourceName\",\n          \"value\" : \"My Test Resource\",\n          \"valueType\" : \"STRING\"\n        } ],\n        \"parentBuildingBlocks\" : [ {\n          \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n          \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n        } ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ {\n          \"key\" : \"resourceId\",\n          \"value\" : \"id-123\",\n          \"valueType\" : \"STRING\"\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks?projectIdentifier=my-project&page=0&size=10\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -496,7 +496,7 @@
               },
               "examples" : {
                 "meshBuildingBlockPost" : {
-                  "value" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"29e993e4-e121-4917-8a1c-7878354742a4\"\n    }]\n  }\n} "
+                  "value" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"8d71f49c-1792-4604-825f-7805dd41f8d4\"\n    }]\n  }\n} "
                 }
               }
             }
@@ -512,7 +512,7 @@
                 },
                 "examples" : {
                   "meshBuildingBlockPost" : {
-                    "value" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"9283fb1b-1f7b-4ce6-b104-88996e45939f\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-10-30T17:49:06.293296297Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"buildingBlock-for-docs\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"29e993e4-e121-4917-8a1c-7878354742a4\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"PENDING\",\n    \"outputs\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"1c10ffc2-f17a-4712-a434-dc619bdb0b0b\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-11-06T13:36:16.807033732Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"buildingBlock-for-docs\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"8d71f49c-1792-4604-825f-7805dd41f8d4\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"PENDING\",\n    \"outputs\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -572,7 +572,7 @@
                 },
                 "examples" : {
                   "meshPaymentMethodListV2" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-2\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-2\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -640,7 +640,7 @@
                 },
                 "examples" : {
                   "meshProjectListV2" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n        \"createdOn\" : \"2024-10-30T17:49:13.086196622Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        },\n        \"meshprojectuserbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n        \"createdOn\" : \"2024-01-01T00:00:00Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        },\n        \"meshprojectuserbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -681,15 +681,15 @@
               },
               "examples" : {
                 "meshProjectPost" : {
-                  "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\"\n  }\n}"
+                  "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\"\n  }\n}"
                 }
               }
             }
           }
         },
         "responses" : {
-          "200" : {
-            "description" : "200",
+          "201" : {
+            "description" : "201",
             "content" : {
               "application/vnd.meshcloud.api.meshproject.v2.hal+json" : {
                 "schema" : {
@@ -697,7 +697,7 @@
                 },
                 "examples" : {
                   "meshProjectPost" : {
-                    "value" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n    \"createdOn\" : \"2024-10-30T17:49:13.754216329Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n    \"createdOn\" : \"2024-11-06T13:36:25.470629787Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -789,7 +789,7 @@
                 },
                 "examples" : {
                   "meshServiceInstanceListV2" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"rpbo6mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"rpbo6mtdg1\",\n        \"instanceId\" : \"rpbo6mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"rpbo6mtdg12\",\n        \"serviceId\" : \"rpbo6mtdg5\",\n        \"planId\" : \"rpbo6mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/rpbo6mtdg11\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"3s6f2mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"3s6f2mtdg1\",\n        \"instanceId\" : \"3s6f2mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"3s6f2mtdg12\",\n        \"serviceId\" : \"3s6f2mtdg5\",\n        \"planId\" : \"3s6f2mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/3s6f2mtdg11\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -826,11 +826,11 @@
           "content" : {
             "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8" : {
               "schema" : {
-                "$ref" : "#/components/schemas/api-meshobjects-meshserviceinstances-343819711"
+                "$ref" : "#/components/schemas/api-meshobjects-meshserviceinstances-serviceInstanceId-343819711"
               },
               "examples" : {
                 "meshServiceInstancePost" : {
-                  "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
+                  "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
                 }
               }
             }
@@ -854,7 +854,7 @@
                 },
                 "examples" : {
                   "meshServiceInstancePost" : {
-                    "value" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -889,7 +889,7 @@
         }, {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "schema" : {
             "type" : "string"
@@ -916,6 +916,63 @@
         "security" : [ {
           "basic" : [ ]
         } ]
+      },
+      "post" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshTagDefinitionPost",
+        "parameters" : [ {
+          "name" : "Accept",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          },
+          "example" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json"
+        }, {
+          "name" : "Content-Type",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header.",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          },
+          "example" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8"
+        } ],
+        "requestBody" : {
+          "content" : {
+            "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/api-meshobjects486549215"
+              },
+              "examples" : {
+                "meshTagDefinitionPost" : {
+                  "value" : "{\n  \"apiVersion\": \"v1\",\n  \"kind\": \"meshTagDefinition\",\n  \"metadata\": {\n    \"name\": \"meshProject.environment\"\n  },\n  \"spec\": {\n    \"targetKind\": \"meshProject\",\n    \"key\": \"environment\",\n    \"valueType\": {\n      \"singleSelect\": {\n        \"options\": [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\": \"dev\"\n      }\n    },\n    \"description\": \"The environment the project runs in.\",\n    \"displayName\": \"Environment\",\n    \"sortOrder\": 9999,\n    \"mandatory\": true,\n    \"immutable\": false,\n    \"restricted\": false\n  }\n}"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "201" : {
+            "description" : "201",
+            "content" : {
+              "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/meshTagDefinitionPost"
+                },
+                "examples" : {
+                  "meshTagDefinitionPost" : {
+                    "value" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshProject.environment\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshProject\",\n    \"key\" : \"environment\",\n    \"valueType\" : {\n      \"singleSelect\" : {\n        \"options\" : [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\" : \"dev\"\n      }\n    },\n    \"description\" : \"The environment the project runs in.\",\n    \"displayName\" : \"Environment\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment\"\n    }\n  }\n}"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
       }
     },
     "/api/meshobjects/meshtenants" : {
@@ -990,7 +1047,7 @@
                 },
                 "examples" : {
                   "meshTenantListV3" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"kind\" : \"meshTenant\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n        \"deletedOn\" : \"2024-10-31T17:49:17.565940915Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"d53bb92d-8fc5-4920-8139-0d3da1f52b4e\",\n        \"landingZoneIdentifier\" : \"stage-dev\",\n        \"quotas\" : [ {\n          \"key\" : \"limits.cpu\",\n          \"value\" : 2000\n        }, {\n          \"key\" : \"limits.memory\",\n          \"value\" : 10000\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"kind\" : \"meshTenant\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n        \"deletedOn\" : \"2024-11-07T13:36:29.657329297Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"8c2d3c5e-b543-46d0-a4fc-1e966df246b5\",\n        \"landingZoneIdentifier\" : \"stage-dev\",\n        \"quotas\" : [ {\n          \"key\" : \"limits.cpu\",\n          \"value\" : 2000\n        }, {\n          \"key\" : \"limits.memory\",\n          \"value\" : 10000\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -1064,9 +1121,9 @@
         "tags" : [ "api" ],
         "operationId" : "meshUserListV",
         "parameters" : [ {
-          "name" : "workspaceIdentifier",
+          "name" : "customerIdentifier",
           "in" : "query",
-          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)",
+          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
@@ -1074,7 +1131,7 @@
         }, {
           "name" : "projectIdentifier",
           "in" : "query",
-          "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)",
+          "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
@@ -1088,9 +1145,9 @@
             "type" : "string"
           }
         }, {
-          "name" : "workspaceRole",
+          "name" : "customerRole",
           "in" : "query",
-          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)",
+          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
@@ -1160,17 +1217,17 @@
             "type" : "string"
           }
         }, {
-          "name" : "customerIdentifier",
+          "name" : "workspaceIdentifier",
           "in" : "query",
-          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)",
+          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
           }
         }, {
-          "name" : "customerRole",
+          "name" : "workspaceRole",
           "in" : "query",
-          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)",
+          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
@@ -1178,34 +1235,34 @@
         }, {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "schema" : {
             "type" : "string"
           },
-          "example" : "application/vnd.meshcloud.api.meshuser.v2.hal+json"
+          "example" : "application/vnd.meshcloud.api.meshuser.v1.hal+json"
         } ],
         "responses" : {
           "200" : {
             "description" : "200",
             "content" : {
-              "application/vnd.meshcloud.api.meshuser.v2.hal+json" : {
+              "application/vnd.meshcloud.api.meshuser.v1.hal+json" : {
                 "schema" : {
-                  "$ref" : "#/components/schemas/meshUserListV2"
+                  "$ref" : "#/components/schemas/meshUserListV1"
                 },
                 "examples" : {
-                  "meshUserListV2" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"c12973b1-fd64-4d65-a374-c63c51d4de58\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+                  "meshUserListV1" : {
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"c0a1ef9c-871c-475c-a6a3-b48eaa11d181\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshcustomerusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               },
-              "application/vnd.meshcloud.api.meshuser.v1.hal+json" : {
+              "application/vnd.meshcloud.api.meshuser.v2.hal+json" : {
                 "schema" : {
-                  "$ref" : "#/components/schemas/meshUserListV1"
+                  "$ref" : "#/components/schemas/meshUserListV2"
                 },
                 "examples" : {
-                  "meshUserListV1" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"86b0a066-fa74-4950-a7f6-ff590d5f4ccb\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshcustomerusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+                  "meshUserListV2" : {
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"a126bf9c-e697-4384-a82f-b18aac1fff17\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -1257,7 +1314,7 @@
                 },
                 "examples" : {
                   "meshWorkspaceList" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"admin-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-partner\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-partner\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-partner\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-partner\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-partner\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-partner\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-partner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 3,\n    \"totalElements\" : 6,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"admin-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-partner\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-partner\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-partner\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-partner\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-partner\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-partner\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-partner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 3,\n    \"totalElements\" : 6,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -1377,6 +1434,20 @@
         } ]
       }
     },
+    "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b" : {
+      "delete" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshBuildingBlockDelete",
+        "responses" : {
+          "202" : {
+            "description" : "202"
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
+      }
+    },
     "/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720" : {
       "get" : {
         "tags" : [ "api" ],
@@ -1401,7 +1472,7 @@
                 },
                 "examples" : {
                   "meshBuildingBlock" : {
-                    "value" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-10-30T17:49:04.947339684Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"child block\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"My Test Resource\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"SUCCEEDED\",\n    \"outputs\" : [ {\n      \"key\" : \"resourceId\",\n      \"value\" : \"id-123\",\n      \"valueType\" : \"STRING\"\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-11-06T13:36:14.984878412Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"child block\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"My Test Resource\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"SUCCEEDED\",\n    \"outputs\" : [ {\n      \"key\" : \"resourceId\",\n      \"value\" : \"id-123\",\n      \"valueType\" : \"STRING\"\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -1413,20 +1484,6 @@
         } ]
       }
     },
-    "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f" : {
-      "delete" : {
-        "tags" : [ "api" ],
-        "operationId" : "meshBuildingBlockDelete",
-        "responses" : {
-          "202" : {
-            "description" : "202"
-          }
-        },
-        "security" : [ {
-          "basic" : [ ]
-        } ]
-      }
-    },
     "/api/meshobjects/meshpaymentmethods/test-payment-method-1" : {
       "get" : {
         "tags" : [ "api" ],
@@ -1451,7 +1508,7 @@
                 },
                 "examples" : {
                   "meshPaymentMethodV2" : {
-                    "value" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { },\n    \"amount\" : 1000\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { },\n    \"amount\" : 1000\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -1503,7 +1560,7 @@
                 },
                 "examples" : {
                   "meshProjectGroupBindingListV3" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"e8909b8b-0f10-4a0b-929b-f3d821116392\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -1540,7 +1597,7 @@
           "content" : {
             "application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json;charset=UTF-8" : {
               "schema" : {
-                "$ref" : "#/components/schemas/api-meshobjects-meshprojectbindings-groupbindings-2093913894"
+                "$ref" : "#/components/schemas/api-meshobjects-meshprojectbindings-groupbindings1480218446"
               },
               "examples" : {
                 "meshProjectGroupBindingCreateV3" : {
@@ -1612,7 +1669,7 @@
                 },
                 "examples" : {
                   "meshProjectUserBindingListV3" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -1681,7 +1738,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1" : {
+    "/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectV2",
@@ -1705,7 +1762,7 @@
                 },
                 "examples" : {
                   "meshProjectV2" : {
-                    "value" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n    \"createdOn\" : \"2024-10-30T17:49:13.086196622Z\",\n    \"deletedOn\" : \"2024-10-30T17:49:14.767668318Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-11-06T13:36:26.056826397Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -1749,7 +1806,7 @@
                 },
                 "examples" : {
                   "meshServiceInstanceGet" : {
-                    "value" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -1786,11 +1843,11 @@
           "content" : {
             "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8" : {
               "schema" : {
-                "$ref" : "#/components/schemas/api-meshobjects-meshserviceinstances-343819711"
+                "$ref" : "#/components/schemas/api-meshobjects-meshserviceinstances-serviceInstanceId-343819711"
               },
               "examples" : {
                 "meshServiceInstancePut" : {
-                  "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
+                  "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
                 }
               }
             }
@@ -1818,14 +1875,22 @@
         } ]
       }
     },
-    "/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter" : {
+    "/api/meshobjects/meshtagdefinitions/{name}" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshTagDefinition",
         "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        }, {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "schema" : {
             "type" : "string"
@@ -1852,6 +1917,101 @@
         "security" : [ {
           "basic" : [ ]
         } ]
+      },
+      "put" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshTagDefinitionPut",
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        }, {
+          "name" : "Accept",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          },
+          "example" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json"
+        }, {
+          "name" : "Content-Type",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header.",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          },
+          "example" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8"
+        } ],
+        "requestBody" : {
+          "content" : {
+            "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/api-meshobjects486549215"
+              },
+              "examples" : {
+                "meshTagDefinitionPut" : {
+                  "value" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      },\n      \"email\" : null,\n      \"integer\" : null,\n      \"number\" : null,\n      \"singleSelect\" : null,\n      \"multiSelect\" : null\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  }\n}"
+                }
+              }
+            }
+          }
+        },
+        "responses" : {
+          "200" : {
+            "description" : "200",
+            "content" : {
+              "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/meshTagDefinitionPut"
+                },
+                "examples" : {
+                  "meshTagDefinitionPut" : {
+                    "value" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      }\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter\"\n    }\n  }\n}"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
+      },
+      "delete" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshTagDefinitionDelete",
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          }
+        }, {
+          "name" : "Accept",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "required" : true,
+          "schema" : {
+            "type" : "string"
+          },
+          "example" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json"
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "204"
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
       }
     },
     "/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev" : {
@@ -1878,7 +2038,7 @@
                 },
                 "examples" : {
                   "meshTenantV3" : {
-                    "value" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n    \"deletedOn\" : \"2024-10-31T17:49:17.565940915Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"d53bb92d-8fc5-4920-8139-0d3da1f52b4e\",\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ {\n      \"key\" : \"limits.cpu\",\n      \"value\" : 2000\n    }, {\n      \"key\" : \"limits.memory\",\n      \"value\" : 10000\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n    \"deletedOn\" : \"2024-11-07T13:36:29.657329297Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"8c2d3c5e-b543-46d0-a4fc-1e966df246b5\",\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ {\n      \"key\" : \"limits.cpu\",\n      \"value\" : 2000\n    }, {\n      \"key\" : \"limits.memory\",\n      \"value\" : 10000\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -1911,34 +2071,34 @@
         "parameters" : [ {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "schema" : {
             "type" : "string"
           },
-          "example" : "application/vnd.meshcloud.api.meshuser.v2.hal+json"
+          "example" : "application/vnd.meshcloud.api.meshuser.v1.hal+json"
         } ],
         "responses" : {
           "200" : {
             "description" : "200",
             "content" : {
-              "application/vnd.meshcloud.api.meshuser.v2.hal+json" : {
+              "application/vnd.meshcloud.api.meshuser.v1.hal+json" : {
                 "schema" : {
-                  "$ref" : "#/components/schemas/meshUserV2"
+                  "$ref" : "#/components/schemas/meshUserV1"
                 },
                 "examples" : {
-                  "meshUserV2" : {
-                    "value" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"c12973b1-fd64-4d65-a374-c63c51d4de58\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n    }\n  }\n}"
+                  "meshUserV1" : {
+                    "value" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"c0a1ef9c-871c-475c-a6a3-b48eaa11d181\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n    }\n  }\n}"
                   }
                 }
               },
-              "application/vnd.meshcloud.api.meshuser.v1.hal+json" : {
+              "application/vnd.meshcloud.api.meshuser.v2.hal+json" : {
                 "schema" : {
-                  "$ref" : "#/components/schemas/meshUserV1"
+                  "$ref" : "#/components/schemas/meshUserV2"
                 },
                 "examples" : {
-                  "meshUserV1" : {
-                    "value" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"86b0a066-fa74-4950-a7f6-ff590d5f4ccb\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n    }\n  }\n}"
+                  "meshUserV2" : {
+                    "value" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"a126bf9c-e697-4384-a82f-b18aac1fff17\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -2035,7 +2195,7 @@
           "content" : {
             "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8" : {
               "schema" : {
-                "$ref" : "#/components/schemas/api-meshobjects-meshworkspacebindings-userbindings-749223909"
+                "$ref" : "#/components/schemas/api-meshobjects-meshworkspacebindings-userbindings-1470058865"
               },
               "examples" : {
                 "meshWorkspaceUserBindingCreate" : {
@@ -2091,7 +2251,7 @@
                 },
                 "examples" : {
                   "meshWorkspace" : {
-                    "value" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-10-30T17:48:13Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"admin-customer\",\n    \"tags\" : { }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-11-06T13:34:59Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"admin-customer\",\n    \"tags\" : { }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -2139,7 +2299,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge" : {
+    "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge" : {
       "delete" : {
         "tags" : [ "api" ],
         "operationId" : "meshBuildingBlockForcePurge",
@@ -2153,7 +2313,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392" : {
+    "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectGroupBindingV3",
@@ -2177,7 +2337,7 @@
                 },
                 "examples" : {
                   "meshProjectGroupBindingV3" : {
-                    "value" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"e8909b8b-0f10-4a0b-929b-f3d821116392\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -2201,7 +2361,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1" : {
+    "/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectUserBindingV3",
@@ -2225,7 +2385,7 @@
                 },
                 "examples" : {
                   "meshProjectUserBindingV3" : {
-                    "value" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -3428,6 +3588,10 @@
           }
         }
       },
+      "meshTagDefinitionPut" : {
+        "title" : "meshTagDefinitionPut",
+        "type" : "object"
+      },
       "meshWorkspaceList" : {
         "title" : "meshWorkspaceList",
         "required" : [ "_embedded", "_links", "page" ],
@@ -3581,7 +3745,7 @@
           }
         }
       },
-      "api-meshobjects-meshserviceinstances-343819711" : {
+      "api-meshobjects-meshserviceinstances-serviceInstanceId-343819711" : {
         "required" : [ "apiVersion", "kind", "metadata", "spec" ],
         "type" : "object",
         "properties" : {
@@ -3641,6 +3805,10 @@
           }
         }
       },
+      "meshTagDefinitionPost" : {
+        "title" : "meshTagDefinitionPost",
+        "type" : "object"
+      },
       "meshBuildingBlockRunCreate" : {
         "title" : "meshBuildingBlockRunCreate",
         "required" : [ "_links", "apiVersion", "kind", "spec", "status" ],
@@ -3847,20 +4015,89 @@
           }
         }
       },
-      "meshProjectGroupBindingListV3" : {
-        "title" : "meshProjectGroupBindingListV3",
-        "required" : [ "_links", "page" ],
+      "meshProjectV2" : {
+        "title" : "meshProjectV2",
+        "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
         "type" : "object",
         "properties" : {
-          "_links" : {
+          "metadata" : {
+            "required" : [ "name", "ownedByWorkspace" ],
             "type" : "object",
-            "description" : "Currently only contains the self link and <<paging,pagination>> links."
+            "properties" : {
+              "deletedOn" : {
+                "type" : "string",
+                "description" : "If the meshProject has been submitted for deletion by a Workspace Manager, the <<data_types,date>>, the date is represented here (e.g. `2020-12-22T09:37:43Z)`. Otherwise this field is missing.",
+                "nullable" : true
+              },
+              "name" : {
+                "type" : "string",
+                "description" : "The projectIdentifier as 'name'."
+              },
+              "createdOn" : {
+                "type" : "string",
+                "description" : "The meshProject has been created at this <<data_types,date>> (e.g. `2020-12-22T09:37:43Z`).",
+                "nullable" : true
+              },
+              "ownedByWorkspace" : {
+                "type" : "string",
+                "description" : "The workspaceIdentifier as 'ownedByWorkspace'."
+              }
+            },
+            "description" : "Always contains the 'name' and 'ownedByWorkspace' to uniquely identify the meshProject."
           },
-          "_embedded" : {
-            "required" : [ "meshProjectGroupBindings" ],
+          "apiVersion" : {
+            "type" : "string",
+            "description" : "Version of meshProject datatype. Matches the version part provided within the `Accept` request header."
+          },
+          "_links" : {
             "type" : "object",
-            "properties" : {
-              "meshProjectGroupBindings" : {
+            "description" : "Available <<mesh_project_links,links>> on a meshProject."
+          },
+          "kind" : {
+            "type" : "string",
+            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshProject' for this endpoint."
+          },
+          "spec" : {
+            "required" : [ "displayName", "tags" ],
+            "type" : "object",
+            "properties" : {
+              "substitutePaymentMethodIdentifier" : {
+                "type" : "string",
+                "description" : "The substitutePaymentMethod of the meshProject",
+                "nullable" : true
+              },
+              "paymentMethodIdentifier" : {
+                "type" : "string",
+                "description" : "The meshPaymentMethod of the meshProject.",
+                "nullable" : true
+              },
+              "displayName" : {
+                "type" : "string",
+                "description" : "The display name of the meshProject as it is shown in meshPanel."
+              },
+              "tags" : {
+                "type" : "object",
+                "description" : "Key/Value pairs of tags set on the meshProject. Keep in mind, that values are an array. Also see our general section about <<tags>>"
+              }
+            },
+            "description" : "All fields in this section describe the meshProject."
+          }
+        }
+      },
+      "meshProjectGroupBindingListV3" : {
+        "title" : "meshProjectGroupBindingListV3",
+        "required" : [ "_links", "page" ],
+        "type" : "object",
+        "properties" : {
+          "_links" : {
+            "type" : "object",
+            "description" : "Currently only contains the self link and <<paging,pagination>> links."
+          },
+          "_embedded" : {
+            "required" : [ "meshProjectGroupBindings" ],
+            "type" : "object",
+            "properties" : {
+              "meshProjectGroupBindings" : {
                 "type" : "array",
                 "description" : "List of meshProjectGroupBindings.",
                 "items" : {
@@ -3911,129 +4148,6 @@
           }
         }
       },
-      "meshProjectV2" : {
-        "title" : "meshProjectV2",
-        "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
-        "type" : "object",
-        "properties" : {
-          "metadata" : {
-            "required" : [ "name", "ownedByWorkspace" ],
-            "type" : "object",
-            "properties" : {
-              "deletedOn" : {
-                "type" : "string",
-                "description" : "If the meshProject has been submitted for deletion by a Workspace Manager, the <<data_types,date>>, the date is represented here (e.g. `2020-12-22T09:37:43Z)`. Otherwise this field is missing.",
-                "nullable" : true
-              },
-              "name" : {
-                "type" : "string",
-                "description" : "The projectIdentifier as 'name'."
-              },
-              "createdOn" : {
-                "type" : "string",
-                "description" : "The meshProject has been created at this <<data_types,date>> (e.g. `2020-12-22T09:37:43Z`).",
-                "nullable" : true
-              },
-              "ownedByWorkspace" : {
-                "type" : "string",
-                "description" : "The workspaceIdentifier as 'ownedByWorkspace'."
-              }
-            },
-            "description" : "Always contains the 'name' and 'ownedByWorkspace' to uniquely identify the meshProject."
-          },
-          "apiVersion" : {
-            "type" : "string",
-            "description" : "Version of meshProject datatype. Matches the version part provided within the `Accept` request header."
-          },
-          "_links" : {
-            "type" : "object",
-            "description" : "Available <<mesh_project_links,links>> on a meshProject."
-          },
-          "kind" : {
-            "type" : "string",
-            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshProject' for this endpoint."
-          },
-          "spec" : {
-            "required" : [ "displayName", "tags" ],
-            "type" : "object",
-            "properties" : {
-              "substitutePaymentMethodIdentifier" : {
-                "type" : "string",
-                "description" : "The substitutePaymentMethod of the meshProject",
-                "nullable" : true
-              },
-              "paymentMethodIdentifier" : {
-                "type" : "string",
-                "description" : "The meshPaymentMethod of the meshProject.",
-                "nullable" : true
-              },
-              "displayName" : {
-                "type" : "string",
-                "description" : "The display name of the meshProject as it is shown in meshPanel."
-              },
-              "tags" : {
-                "type" : "object",
-                "description" : "Key/Value pairs of tags set on the meshProject. Keep in mind, that values are an array. Also see our general section about <<tags>>"
-              }
-            },
-            "description" : "All fields in this section describe the meshProject."
-          }
-        }
-      },
-      "api-meshobjects-meshworkspacebindings-userbindings-749223909" : {
-        "required" : [ "apiVersion", "kind" ],
-        "type" : "object",
-        "properties" : {
-          "targetRef" : {
-            "required" : [ "name" ],
-            "type" : "object",
-            "properties" : {
-              "name" : {
-                "type" : "string",
-                "description" : "The identifier of the workspace the user should get assigned to."
-              }
-            }
-          },
-          "metadata" : {
-            "required" : [ "name" ],
-            "type" : "object",
-            "properties" : {
-              "name" : {
-                "type" : "string",
-                "description" : "Name of this binding which later can be used to refer to it"
-              }
-            }
-          },
-          "apiVersion" : {
-            "type" : "string",
-            "description" : "Version of this object"
-          },
-          "kind" : {
-            "type" : "string",
-            "description" : "Type of the returned meshObject"
-          },
-          "subject" : {
-            "required" : [ "name" ],
-            "type" : "object",
-            "properties" : {
-              "name" : {
-                "type" : "string",
-                "description" : "The username of the referenced user."
-              }
-            }
-          },
-          "roleRef" : {
-            "required" : [ "name" ],
-            "type" : "object",
-            "properties" : {
-              "name" : {
-                "type" : "string",
-                "description" : "The name of the referenced role for this user."
-              }
-            }
-          }
-        }
-      },
       "api-metadata-openstackProjectMetadata-1305671199" : {
         "required" : [ "project-id" ],
         "type" : "object",
@@ -4315,6 +4429,67 @@
           }
         }
       },
+      "meshServiceInstanceGet" : {
+        "title" : "meshServiceInstanceGet",
+        "required" : [ "apiVersion", "kind", "metadata", "spec" ],
+        "type" : "object",
+        "properties" : {
+          "metadata" : {
+            "required" : [ "instanceId", "marketplaceIdentifier", "ownedByProject", "ownedByWorkspace" ],
+            "type" : "object",
+            "properties" : {
+              "ownedByProject" : {
+                "type" : "string",
+                "description" : "The project that this Service Instance belongs to."
+              },
+              "marketplaceIdentifier" : {
+                "type" : "string",
+                "description" : "The identifier of the marketplace that this Service Instance belongs to."
+              },
+              "instanceId" : {
+                "type" : "string",
+                "description" : "The instance id this Service Instance should use."
+              },
+              "ownedByWorkspace" : {
+                "type" : "string",
+                "description" : "The workspace that this Service Instance belongs to."
+              }
+            },
+            "description" : "Metadata and more fields to identify the Service Instance."
+          },
+          "apiVersion" : {
+            "type" : "string",
+            "description" : "Version of Service Instance datatype. Matches the version part provided within the `Accept` request header."
+          },
+          "kind" : {
+            "type" : "string",
+            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshBuildingBlock' for this endpoint."
+          },
+          "spec" : {
+            "required" : [ "creator", "displayName", "planId", "serviceId" ],
+            "type" : "object",
+            "properties" : {
+              "creator" : {
+                "type" : "string",
+                "description" : "The creator's username that creates this Service Instance"
+              },
+              "displayName" : {
+                "type" : "string",
+                "description" : "The display name of the Service Instance."
+              },
+              "planId" : {
+                "type" : "string",
+                "description" : "The id of the plan for this Service Instance"
+              },
+              "serviceId" : {
+                "type" : "string",
+                "description" : "The id of the service for the Service Instance"
+              }
+            },
+            "description" : "Specifications for the Service Instance."
+          }
+        }
+      },
       "meshProjectUserBindingV3" : {
         "title" : "meshProjectUserBindingV3",
         "required" : [ "_links", "apiVersion", "kind", "metadata" ],
@@ -4383,86 +4558,25 @@
           }
         }
       },
-      "meshServiceInstanceGet" : {
-        "title" : "meshServiceInstanceGet",
-        "required" : [ "apiVersion", "kind", "metadata", "spec" ],
+      "api-meshobjects-meshbuildingblockruns-b3116611-e08b-4b00-91c5-10365b25a6ef-status-source-1604577785" : {
+        "required" : [ "steps" ],
         "type" : "object",
         "properties" : {
-          "metadata" : {
-            "required" : [ "instanceId", "marketplaceIdentifier", "ownedByProject", "ownedByWorkspace" ],
+          "source" : {
+            "required" : [ "id" ],
             "type" : "object",
             "properties" : {
-              "ownedByProject" : {
-                "type" : "string",
-                "description" : "The project that this Service Instance belongs to."
-              },
-              "marketplaceIdentifier" : {
+              "externalRunId" : {
                 "type" : "string",
-                "description" : "The identifier of the marketplace that this Service Instance belongs to."
+                "description" : "In case the external run is tracked by a different ID you can include it here",
+                "nullable" : true
               },
-              "instanceId" : {
+              "externalRunUrl" : {
                 "type" : "string",
-                "description" : "The instance id this Service Instance should use."
+                "description" : "You can provide a clickable URL to a website with additional information about the external run.",
+                "nullable" : true
               },
-              "ownedByWorkspace" : {
-                "type" : "string",
-                "description" : "The workspace that this Service Instance belongs to."
-              }
-            },
-            "description" : "Metadata and more fields to identify the Service Instance."
-          },
-          "apiVersion" : {
-            "type" : "string",
-            "description" : "Version of Service Instance datatype. Matches the version part provided within the `Accept` request header."
-          },
-          "kind" : {
-            "type" : "string",
-            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshBuildingBlock' for this endpoint."
-          },
-          "spec" : {
-            "required" : [ "creator", "displayName", "planId", "serviceId" ],
-            "type" : "object",
-            "properties" : {
-              "creator" : {
-                "type" : "string",
-                "description" : "The creator's username that creates this Service Instance"
-              },
-              "displayName" : {
-                "type" : "string",
-                "description" : "The display name of the Service Instance."
-              },
-              "planId" : {
-                "type" : "string",
-                "description" : "The id of the plan for this Service Instance"
-              },
-              "serviceId" : {
-                "type" : "string",
-                "description" : "The id of the service for the Service Instance"
-              }
-            },
-            "description" : "Specifications for the Service Instance."
-          }
-        }
-      },
-      "api-meshobjects-meshbuildingblockruns-b3116611-e08b-4b00-91c5-10365b25a6ef-status-source-1604577785" : {
-        "required" : [ "steps" ],
-        "type" : "object",
-        "properties" : {
-          "source" : {
-            "required" : [ "id" ],
-            "type" : "object",
-            "properties" : {
-              "externalRunId" : {
-                "type" : "string",
-                "description" : "In case the external run is tracked by a different ID you can include it here",
-                "nullable" : true
-              },
-              "externalRunUrl" : {
-                "type" : "string",
-                "description" : "You can provide a clickable URL to a website with additional information about the external run.",
-                "nullable" : true
-              },
-              "id" : {
+              "id" : {
                 "type" : "string",
                 "description" : "The ID of this source."
               }
@@ -4493,6 +4607,55 @@
           }
         }
       },
+      "api-meshobjects-meshtenants-541278110" : {
+        "required" : [ "apiVersion", "kind", "metadata", "spec" ],
+        "type" : "object",
+        "properties" : {
+          "metadata" : {
+            "required" : [ "ownedByProject", "ownedByWorkspace", "platformIdentifier" ],
+            "type" : "object",
+            "properties" : {
+              "ownedByProject" : {
+                "type" : "string",
+                "description" : "The identifier of the meshProject the meshTenant belongs to."
+              },
+              "platformIdentifier" : {
+                "type" : "string",
+                "description" : "The identifier of the platform the meshTenant belongs to."
+              },
+              "ownedByWorkspace" : {
+                "type" : "string",
+                "description" : "The identifier of the meshWorkspace the meshTenant belongs to."
+              }
+            },
+            "description" : "Fixed fields that help identify the Tenant."
+          },
+          "apiVersion" : {
+            "type" : "string",
+            "description" : "Version of Tenant datatype. Matches the version part provided within the `Accept` request header."
+          },
+          "kind" : {
+            "type" : "string",
+            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshTenant' for this endpoint."
+          },
+          "spec" : {
+            "required" : [ "landingZoneIdentifier" ],
+            "type" : "object",
+            "properties" : {
+              "landingZoneIdentifier" : {
+                "type" : "string",
+                "description" : "The identifier of the landing zone the meshTenant belongs to."
+              },
+              "localId" : {
+                "type" : "string",
+                "description" : "The localId (platform tenant id) assigned with this meshTenant. If it is set, meshStack will attempt to import an existing tenant instead of creating a new one.",
+                "nullable" : true
+              }
+            },
+            "description" : "All fields in this section describe the Tenant."
+          }
+        }
+      },
       "meshWorkspaceUserBindingCreate" : {
         "title" : "meshWorkspaceUserBindingCreate",
         "required" : [ "_links", "apiVersion", "kind", "metadata" ],
@@ -4557,55 +4720,6 @@
           }
         }
       },
-      "api-meshobjects-meshtenants-541278110" : {
-        "required" : [ "apiVersion", "kind", "metadata", "spec" ],
-        "type" : "object",
-        "properties" : {
-          "metadata" : {
-            "required" : [ "ownedByProject", "ownedByWorkspace", "platformIdentifier" ],
-            "type" : "object",
-            "properties" : {
-              "ownedByProject" : {
-                "type" : "string",
-                "description" : "The identifier of the meshProject the meshTenant belongs to."
-              },
-              "platformIdentifier" : {
-                "type" : "string",
-                "description" : "The identifier of the platform the meshTenant belongs to."
-              },
-              "ownedByWorkspace" : {
-                "type" : "string",
-                "description" : "The identifier of the meshWorkspace the meshTenant belongs to."
-              }
-            },
-            "description" : "Fixed fields that help identify the Tenant."
-          },
-          "apiVersion" : {
-            "type" : "string",
-            "description" : "Version of Tenant datatype. Matches the version part provided within the `Accept` request header."
-          },
-          "kind" : {
-            "type" : "string",
-            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshTenant' for this endpoint."
-          },
-          "spec" : {
-            "required" : [ "landingZoneIdentifier" ],
-            "type" : "object",
-            "properties" : {
-              "landingZoneIdentifier" : {
-                "type" : "string",
-                "description" : "The identifier of the landing zone the meshTenant belongs to."
-              },
-              "localId" : {
-                "type" : "string",
-                "description" : "The localId (platform tenant id) assigned with this meshTenant. If it is set, meshStack will attempt to import an existing tenant instead of creating a new one.",
-                "nullable" : true
-              }
-            },
-            "description" : "All fields in this section describe the Tenant."
-          }
-        }
-      },
       "api-meshobjects486549215" : {
         "type" : "object"
       },
@@ -4738,124 +4852,124 @@
           }
         }
       },
-      "meshServiceInstancePost" : {
-        "title" : "meshServiceInstancePost",
-        "required" : [ "apiVersion", "kind", "metadata", "spec" ],
+      "meshPaymentMethodV2" : {
+        "title" : "meshPaymentMethodV2",
+        "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
         "type" : "object",
         "properties" : {
           "metadata" : {
-            "required" : [ "instanceId", "marketplaceIdentifier", "ownedByProject", "ownedByWorkspace" ],
+            "required" : [ "name" ],
             "type" : "object",
             "properties" : {
-              "ownedByProject" : {
-                "type" : "string",
-                "description" : "The project that this Service Instance belongs to."
-              },
-              "marketplaceIdentifier" : {
-                "type" : "string",
-                "description" : "The identifier of the marketplace that this Service Instance belongs to."
-              },
-              "instanceId" : {
+              "name" : {
                 "type" : "string",
-                "description" : "The instance id this Service Instance should use."
+                "description" : "The paymentMethodIdentifier as 'name'."
               },
               "ownedByWorkspace" : {
                 "type" : "string",
-                "description" : "The workspace that this Service Instance belongs to."
+                "description" : "The workspaceIdentifier as 'ownedByWorkspace'.",
+                "nullable" : true
               }
             },
-            "description" : "Metadata and more fields to identify the Service Instance."
+            "description" : "Always contains the 'name' and (optional) 'ownedByWorkspace' to uniquely identify the meshPaymentMethod."
           },
           "apiVersion" : {
             "type" : "string",
-            "description" : "Version of Service Instance datatype. Matches the version part provided within the `Accept` request header."
+            "description" : "Version of meshPaymentMethod datatype. Matches the version part provided within the `Accept` request header."
+          },
+          "_links" : {
+            "type" : "object",
+            "description" : "Available <<mesh_paymentmethod_links,links>> on a meshPaymentMethod."
           },
           "kind" : {
             "type" : "string",
-            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshBuildingBlock' for this endpoint."
+            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshPaymentMethod' for this endpoint."
           },
           "spec" : {
-            "required" : [ "creator", "displayName", "planId", "serviceId" ],
+            "required" : [ "displayName", "tags" ],
             "type" : "object",
             "properties" : {
-              "creator" : {
-                "type" : "string",
-                "description" : "The creator's username that creates this Service Instance"
+              "amount" : {
+                "type" : "number",
+                "description" : "The amount of the meshPaymentMethod.",
+                "nullable" : true
               },
               "displayName" : {
                 "type" : "string",
-                "description" : "The display name of the Service Instance."
+                "description" : "The display name of the meshPaymentMethod as it is shown in meshPanel."
               },
-              "planId" : {
+              "expirationDate" : {
                 "type" : "string",
-                "description" : "The id of the plan for this Service Instance"
+                "description" : "The expiration date <<data_types,date>> of the meshPaymentMethod.",
+                "nullable" : true
               },
-              "serviceId" : {
-                "type" : "string",
-                "description" : "The id of the service for the Service Instance"
+              "tags" : {
+                "type" : "object",
+                "description" : "Key/Value pairs of tags set on the meshPaymentMethod. Keep in mind, that values are an array. Also see our general section about <<tags>>"
               }
             },
-            "description" : "Specifications for the Service Instance."
+            "description" : "All fields in this section describe the meshPaymentMethod."
           }
         }
       },
-      "meshPaymentMethodV2" : {
-        "title" : "meshPaymentMethodV2",
-        "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
+      "meshServiceInstancePost" : {
+        "title" : "meshServiceInstancePost",
+        "required" : [ "apiVersion", "kind", "metadata", "spec" ],
         "type" : "object",
         "properties" : {
           "metadata" : {
-            "required" : [ "name" ],
+            "required" : [ "instanceId", "marketplaceIdentifier", "ownedByProject", "ownedByWorkspace" ],
             "type" : "object",
             "properties" : {
-              "name" : {
+              "ownedByProject" : {
                 "type" : "string",
-                "description" : "The paymentMethodIdentifier as 'name'."
+                "description" : "The project that this Service Instance belongs to."
+              },
+              "marketplaceIdentifier" : {
+                "type" : "string",
+                "description" : "The identifier of the marketplace that this Service Instance belongs to."
+              },
+              "instanceId" : {
+                "type" : "string",
+                "description" : "The instance id this Service Instance should use."
               },
               "ownedByWorkspace" : {
                 "type" : "string",
-                "description" : "The workspaceIdentifier as 'ownedByWorkspace'.",
-                "nullable" : true
+                "description" : "The workspace that this Service Instance belongs to."
               }
             },
-            "description" : "Always contains the 'name' and (optional) 'ownedByWorkspace' to uniquely identify the meshPaymentMethod."
+            "description" : "Metadata and more fields to identify the Service Instance."
           },
           "apiVersion" : {
             "type" : "string",
-            "description" : "Version of meshPaymentMethod datatype. Matches the version part provided within the `Accept` request header."
-          },
-          "_links" : {
-            "type" : "object",
-            "description" : "Available <<mesh_paymentmethod_links,links>> on a meshPaymentMethod."
+            "description" : "Version of Service Instance datatype. Matches the version part provided within the `Accept` request header."
           },
           "kind" : {
             "type" : "string",
-            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshPaymentMethod' for this endpoint."
+            "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshBuildingBlock' for this endpoint."
           },
           "spec" : {
-            "required" : [ "displayName", "tags" ],
+            "required" : [ "creator", "displayName", "planId", "serviceId" ],
             "type" : "object",
             "properties" : {
-              "amount" : {
-                "type" : "number",
-                "description" : "The amount of the meshPaymentMethod.",
-                "nullable" : true
+              "creator" : {
+                "type" : "string",
+                "description" : "The creator's username that creates this Service Instance"
               },
               "displayName" : {
                 "type" : "string",
-                "description" : "The display name of the meshPaymentMethod as it is shown in meshPanel."
+                "description" : "The display name of the Service Instance."
               },
-              "expirationDate" : {
+              "planId" : {
                 "type" : "string",
-                "description" : "The expiration date <<data_types,date>> of the meshPaymentMethod.",
-                "nullable" : true
+                "description" : "The id of the plan for this Service Instance"
               },
-              "tags" : {
-                "type" : "object",
-                "description" : "Key/Value pairs of tags set on the meshPaymentMethod. Keep in mind, that values are an array. Also see our general section about <<tags>>"
+              "serviceId" : {
+                "type" : "string",
+                "description" : "The id of the service for the Service Instance"
               }
             },
-            "description" : "All fields in this section describe the meshPaymentMethod."
+            "description" : "Specifications for the Service Instance."
           }
         }
       },
@@ -5062,64 +5176,6 @@
           }
         }
       },
-      "api-meshobjects-meshprojectbindings-groupbindings-2093913894" : {
-        "required" : [ "apiVersion", "kind" ],
-        "type" : "object",
-        "properties" : {
-          "targetRef" : {
-            "required" : [ "name", "ownedByWorkspace" ],
-            "type" : "object",
-            "properties" : {
-              "name" : {
-                "type" : "string",
-                "description" : "The identifier of the project the group should get assigned to."
-              },
-              "ownedByWorkspace" : {
-                "type" : "string",
-                "description" : "The identifier of the workspace which contains the project."
-              }
-            }
-          },
-          "metadata" : {
-            "required" : [ "name" ],
-            "type" : "object",
-            "properties" : {
-              "name" : {
-                "type" : "string",
-                "description" : "Name of this binding which later can be used to refer to it"
-              }
-            }
-          },
-          "apiVersion" : {
-            "type" : "string",
-            "description" : "Version of this object"
-          },
-          "kind" : {
-            "type" : "string",
-            "description" : "Type of the returned meshObject"
-          },
-          "subject" : {
-            "required" : [ "name" ],
-            "type" : "object",
-            "properties" : {
-              "name" : {
-                "type" : "string",
-                "description" : "The identifier of the referenced group."
-              }
-            }
-          },
-          "roleRef" : {
-            "required" : [ "name" ],
-            "type" : "object",
-            "properties" : {
-              "name" : {
-                "type" : "string",
-                "description" : "The name of the referenced role for this group."
-              }
-            }
-          }
-        }
-      },
       "api-meshobjects-meshbuildingblocks-1926132516" : {
         "required" : [ "apiVersion", "kind", "metadata", "spec" ],
         "type" : "object",
@@ -5241,6 +5297,118 @@
           }
         }
       },
+      "api-meshobjects-meshworkspacebindings-userbindings-1470058865" : {
+        "required" : [ "apiVersion", "kind" ],
+        "type" : "object",
+        "properties" : {
+          "targetRef" : {
+            "required" : [ "name" ],
+            "type" : "object",
+            "properties" : {
+              "name" : {
+                "type" : "string",
+                "description" : "The identifier of the workspace the user should get assigned to."
+              }
+            }
+          },
+          "metadata" : {
+            "required" : [ "name" ],
+            "type" : "object",
+            "properties" : {
+              "name" : {
+                "type" : "string",
+                "description" : "Name of this binding which later can be used to refer to it. It must be globally unique."
+              }
+            }
+          },
+          "apiVersion" : {
+            "type" : "string",
+            "description" : "Version of this object"
+          },
+          "kind" : {
+            "type" : "string",
+            "description" : "Type of the returned meshObject"
+          },
+          "subject" : {
+            "required" : [ "name" ],
+            "type" : "object",
+            "properties" : {
+              "name" : {
+                "type" : "string",
+                "description" : "The username of the referenced user."
+              }
+            }
+          },
+          "roleRef" : {
+            "required" : [ "name" ],
+            "type" : "object",
+            "properties" : {
+              "name" : {
+                "type" : "string",
+                "description" : "The name of the referenced role for this user."
+              }
+            }
+          }
+        }
+      },
+      "api-meshobjects-meshprojectbindings-groupbindings1480218446" : {
+        "required" : [ "apiVersion", "kind" ],
+        "type" : "object",
+        "properties" : {
+          "targetRef" : {
+            "required" : [ "name", "ownedByWorkspace" ],
+            "type" : "object",
+            "properties" : {
+              "name" : {
+                "type" : "string",
+                "description" : "The identifier of the project the group should get assigned to."
+              },
+              "ownedByWorkspace" : {
+                "type" : "string",
+                "description" : "The identifier of the workspace which contains the project."
+              }
+            }
+          },
+          "metadata" : {
+            "required" : [ "name" ],
+            "type" : "object",
+            "properties" : {
+              "name" : {
+                "type" : "string",
+                "description" : "Name of this binding which later can be used to refer to it. It must be globally unique."
+              }
+            }
+          },
+          "apiVersion" : {
+            "type" : "string",
+            "description" : "Version of this object"
+          },
+          "kind" : {
+            "type" : "string",
+            "description" : "Type of the returned meshObject"
+          },
+          "subject" : {
+            "required" : [ "name" ],
+            "type" : "object",
+            "properties" : {
+              "name" : {
+                "type" : "string",
+                "description" : "The identifier of the referenced group."
+              }
+            }
+          },
+          "roleRef" : {
+            "required" : [ "name" ],
+            "type" : "object",
+            "properties" : {
+              "name" : {
+                "type" : "string",
+                "description" : "The name of the referenced role for this group."
+              }
+            }
+          }
+        }
+      },
       "meshTagDefinitionList" : {
         "title" : "meshTagDefinitionList",
         "required" : [ "_embedded", "_links", "page" ],
diff --git a/website/static/api/meshstack-postman-collection-original.json b/website/static/api/meshstack-postman-collection-original.json
index 0be0069f7..4e8c87f45 100644
--- a/website/static/api/meshstack-postman-collection-original.json
+++ b/website/static/api/meshstack-postman-collection-original.json
@@ -103,7 +103,7 @@
       "code" : 308
     } ]
   }, {
-    "id" : "deleteMeshObjectCollection",
+    "id" : "createMeshObjectCollection",
     "name" : "/api/meshobjectcollections",
     "variable" : [ ],
     "event" : [ ],
@@ -114,7 +114,7 @@
         "path" : "/api/meshobjectcollections",
         "port" : "8080"
       },
-      "method" : "DELETE",
+      "method" : "POST",
       "header" : [ {
         "key" : "Content-Type",
         "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -123,13 +123,13 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
+        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "deleteMeshObjectCollection",
-      "name" : "deleteMeshObjectCollection",
+      "id" : "createMeshObjectCollection",
+      "name" : "createMeshObjectCollection",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -137,7 +137,7 @@
           "path" : "/api/meshobjectcollections",
           "port" : "8080"
         },
-        "method" : "DELETE",
+        "method" : "POST",
         "header" : [ {
           "key" : "Content-Type",
           "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -146,15 +146,15 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
+          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
           "urlencoded" : [ ]
         }
       },
       "cookie" : [ ],
-      "code" : 200
+      "code" : 201
     } ]
   }, {
-    "id" : "createMeshObjectCollection",
+    "id" : "deleteMeshObjectCollection",
     "name" : "/api/meshobjectcollections",
     "variable" : [ ],
     "event" : [ ],
@@ -165,7 +165,7 @@
         "path" : "/api/meshobjectcollections",
         "port" : "8080"
       },
-      "method" : "POST",
+      "method" : "DELETE",
       "header" : [ {
         "key" : "Content-Type",
         "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -174,13 +174,13 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
+        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "createMeshObjectCollection",
-      "name" : "createMeshObjectCollection",
+      "id" : "deleteMeshObjectCollection",
+      "name" : "deleteMeshObjectCollection",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -188,7 +188,7 @@
           "path" : "/api/meshobjectcollections",
           "port" : "8080"
         },
-        "method" : "POST",
+        "method" : "DELETE",
         "header" : [ {
           "key" : "Content-Type",
           "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -197,12 +197,12 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
+          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
           "urlencoded" : [ ]
         }
       },
       "cookie" : [ ],
-      "code" : 201
+      "code" : 200
     } ]
   }, {
     "id" : "importInJson",
@@ -290,7 +290,7 @@
       "code" : 200
     } ]
   }, {
-    "id" : "meshObjectsRootV1",
+    "id" : "meshObjectsRootV2",
     "name" : "/api/meshobjects",
     "variable" : [ ],
     "event" : [ ],
@@ -304,14 +304,14 @@
       "method" : "GET",
       "header" : [ {
         "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
-      "id" : "meshObjectsRootV1",
-      "name" : "meshObjectsRootV1",
+      "id" : "meshObjectsRootV2",
+      "name" : "meshObjectsRootV2",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -322,22 +322,22 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?customerIdentifier,projectIdentifier,platformIdentifier,customerUserGroupIdentifier,projectRole,customerRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups{?customerIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblockruns\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&selector}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     }, {
-      "id" : "meshObjectsRootV2",
-      "name" : "meshObjectsRootV2",
+      "id" : "meshObjectsRootV1",
+      "name" : "meshObjectsRootV1",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -348,18 +348,18 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblockruns\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&selector}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?customerIdentifier,projectIdentifier,platformIdentifier,customerUserGroupIdentifier,projectRole,customerRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups{?customerIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -592,7 +592,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n        \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-10-30T17:49:04.874524994Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"parent block\",\n        \"inputs\" : [ ],\n        \"parentBuildingBlocks\" : [ ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a/purge\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n        \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-10-30T17:49:04.947339684Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"child block\",\n        \"inputs\" : [ {\n          \"key\" : \"resourceName\",\n          \"value\" : \"My Test Resource\",\n          \"valueType\" : \"STRING\"\n        } ],\n        \"parentBuildingBlocks\" : [ {\n          \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n          \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n        } ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ {\n          \"key\" : \"resourceId\",\n          \"value\" : \"id-123\",\n          \"valueType\" : \"STRING\"\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks?projectIdentifier=my-project&page=0&size=10\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n        \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-11-06T13:36:14.903052143Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"parent block\",\n        \"inputs\" : [ ],\n        \"parentBuildingBlocks\" : [ ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a/purge\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n        \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-11-06T13:36:14.984878412Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"child block\",\n        \"inputs\" : [ {\n          \"key\" : \"resourceName\",\n          \"value\" : \"My Test Resource\",\n          \"valueType\" : \"STRING\"\n        } ],\n        \"parentBuildingBlocks\" : [ {\n          \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n          \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n        } ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ {\n          \"key\" : \"resourceId\",\n          \"value\" : \"id-123\",\n          \"valueType\" : \"STRING\"\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks?projectIdentifier=my-project&page=0&size=10\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -621,7 +621,7 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"29e993e4-e121-4917-8a1c-7878354742a4\"\n    }]\n  }\n} ",
+        "raw" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"8d71f49c-1792-4604-825f-7805dd41f8d4\"\n    }]\n  }\n} ",
         "urlencoded" : [ ]
       }
     },
@@ -649,7 +649,7 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"29e993e4-e121-4917-8a1c-7878354742a4\"\n    }]\n  }\n} ",
+          "raw" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"8d71f49c-1792-4604-825f-7805dd41f8d4\"\n    }]\n  }\n} ",
           "urlencoded" : [ ]
         }
       },
@@ -659,7 +659,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"9283fb1b-1f7b-4ce6-b104-88996e45939f\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-10-30T17:49:06.293296297Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"buildingBlock-for-docs\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"29e993e4-e121-4917-8a1c-7878354742a4\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"PENDING\",\n    \"outputs\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"1c10ffc2-f17a-4712-a434-dc619bdb0b0b\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-11-06T13:36:16.807033732Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"buildingBlock-for-docs\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"8d71f49c-1792-4604-825f-7805dd41f8d4\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"PENDING\",\n    \"outputs\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -732,7 +732,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-2\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-2\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -761,7 +761,7 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\"\n  }\n}",
+        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\"\n  }\n}",
         "urlencoded" : [ ]
       }
     },
@@ -789,7 +789,7 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\"\n  }\n}",
+          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\"\n  }\n}",
           "urlencoded" : [ ]
         }
       },
@@ -799,8 +799,8 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n    \"createdOn\" : \"2024-10-30T17:49:13.754216329Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}",
-      "code" : 200
+      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n    \"createdOn\" : \"2024-11-06T13:36:25.470629787Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}",
+      "code" : 201
     } ]
   }, {
     "id" : "meshProjectListV2",
@@ -880,75 +880,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n        \"createdOn\" : \"2024-10-30T17:49:13.086196622Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        },\n        \"meshprojectuserbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
-      "code" : 200
-    } ]
-  }, {
-    "id" : "meshServiceInstancePost",
-    "name" : "/api/meshobjects/meshserviceinstances",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-        "protocol" : "https",
-        "host" : "localhost",
-        "path" : "/api/meshobjects/meshserviceinstances",
-        "port" : "8080"
-      },
-      "method" : "POST",
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
-      }, {
-        "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as an `Accept` header."
-      } ],
-      "body" : {
-        "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
-        "urlencoded" : [ ]
-      }
-    },
-    "response" : [ {
-      "id" : "meshServiceInstancePost",
-      "name" : "meshServiceInstancePost",
-      "originalRequest" : {
-        "url" : {
-          "protocol" : "https",
-          "host" : "localhost",
-          "path" : "/api/meshobjects/meshserviceinstances",
-          "port" : "8080"
-        },
-        "method" : "POST",
-        "header" : [ {
-          "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
-        }, {
-          "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as an `Accept` header."
-        } ],
-        "body" : {
-          "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
-          "urlencoded" : [ ]
-        }
-      },
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and answers with `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
-      } ],
-      "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n        \"createdOn\" : \"2024-01-01T00:00:00Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        },\n        \"meshprojectuserbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1053,7 +985,75 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"rpbo6mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"rpbo6mtdg1\",\n        \"instanceId\" : \"rpbo6mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"rpbo6mtdg12\",\n        \"serviceId\" : \"rpbo6mtdg5\",\n        \"planId\" : \"rpbo6mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/rpbo6mtdg11\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"3s6f2mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"3s6f2mtdg1\",\n        \"instanceId\" : \"3s6f2mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"3s6f2mtdg12\",\n        \"serviceId\" : \"3s6f2mtdg5\",\n        \"planId\" : \"3s6f2mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/3s6f2mtdg11\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}",
+      "code" : 200
+    } ]
+  }, {
+    "id" : "meshServiceInstancePost",
+    "name" : "/api/meshobjects/meshserviceinstances",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshserviceinstances",
+        "port" : "8080"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
+      }, {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as an `Accept` header."
+      } ],
+      "body" : {
+        "mode" : "raw",
+        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshServiceInstancePost",
+      "name" : "meshServiceInstancePost",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshserviceinstances",
+          "port" : "8080"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
+        }, {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as an `Accept` header."
+        } ],
+        "body" : {
+          "mode" : "raw",
+          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and answers with `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1082,7 +1082,7 @@
         "key" : "Accept",
         "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
@@ -1109,7 +1109,7 @@
           "key" : "Accept",
           "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
@@ -1121,6 +1121,73 @@
       "body" : "{\n  \"_embedded\" : {\n    \"meshTagDefinitions\" : [ {\n      \"kind\" : \"meshTagDefinition\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"meshWorkspace.costCenter\"\n      },\n      \"spec\" : {\n        \"targetKind\" : \"meshWorkspace\",\n        \"key\" : \"costCenter\",\n        \"valueType\" : {\n          \"string\" : {\n            \"defaultValue\" : \"1001\",\n            \"validationRegex\" : \"^\\\\d{4}$\"\n          }\n        },\n        \"description\" : \"Must be exactly 4 digits.\",\n        \"displayName\" : \"Cost Center\",\n        \"sortOrder\" : 9999,\n        \"mandatory\" : true,\n        \"immutable\" : false,\n        \"restricted\" : false\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshTagDefinition\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"meshWorkspace.workspaceOwner\"\n      },\n      \"spec\" : {\n        \"targetKind\" : \"meshWorkspace\",\n        \"key\" : \"workspaceOwner\",\n        \"valueType\" : {\n          \"string\" : {\n            \"defaultValue\" : \"Anna Admin\"\n          }\n        },\n        \"description\" : \"Person responsible for this workspace.\",\n        \"displayName\" : \"Workspace Owner\",\n        \"sortOrder\" : 9999,\n        \"mandatory\" : false,\n        \"immutable\" : false,\n        \"restricted\" : false,\n        \"replicationKey\" : \"owner\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.workspaceOwner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshTagDefinitionPost",
+    "name" : "/api/meshobjects/meshtagdefinitions",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshtagdefinitions",
+        "port" : "8080"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+      }, {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header."
+      } ],
+      "body" : {
+        "mode" : "raw",
+        "raw" : "{\n  \"apiVersion\": \"v1\",\n  \"kind\": \"meshTagDefinition\",\n  \"metadata\": {\n    \"name\": \"meshProject.environment\"\n  },\n  \"spec\": {\n    \"targetKind\": \"meshProject\",\n    \"key\": \"environment\",\n    \"valueType\": {\n      \"singleSelect\": {\n        \"options\": [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\": \"dev\"\n      }\n    },\n    \"description\": \"The environment the project runs in.\",\n    \"displayName\": \"Environment\",\n    \"sortOrder\": 9999,\n    \"mandatory\": true,\n    \"immutable\": false,\n    \"restricted\": false\n  }\n}",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshTagDefinitionPost",
+      "name" : "meshTagDefinitionPost",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshtagdefinitions",
+          "port" : "8080"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        }, {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header."
+        } ],
+        "body" : {
+          "mode" : "raw",
+          "raw" : "{\n  \"apiVersion\": \"v1\",\n  \"kind\": \"meshTagDefinition\",\n  \"metadata\": {\n    \"name\": \"meshProject.environment\"\n  },\n  \"spec\": {\n    \"targetKind\": \"meshProject\",\n    \"key\": \"environment\",\n    \"valueType\": {\n      \"singleSelect\": {\n        \"options\": [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\": \"dev\"\n      }\n    },\n    \"description\": \"The environment the project runs in.\",\n    \"displayName\": \"Environment\",\n    \"sortOrder\": 9999,\n    \"mandatory\": true,\n    \"immutable\": false,\n    \"restricted\": false\n  }\n}",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshProject.environment\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshProject\",\n    \"key\" : \"environment\",\n    \"valueType\" : {\n      \"singleSelect\" : {\n        \"options\" : [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\" : \"dev\"\n      }\n    },\n    \"description\" : \"The environment the project runs in.\",\n    \"displayName\" : \"Environment\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment\"\n    }\n  }\n}",
+      "code" : 201
+    } ]
   }, {
     "id" : "meshTenantListV3",
     "name" : "/api/meshobjects/meshtenants",
@@ -1215,7 +1282,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"kind\" : \"meshTenant\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n        \"deletedOn\" : \"2024-10-31T17:49:17.565940915Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"d53bb92d-8fc5-4920-8139-0d3da1f52b4e\",\n        \"landingZoneIdentifier\" : \"stage-dev\",\n        \"quotas\" : [ {\n          \"key\" : \"limits.cpu\",\n          \"value\" : 2000\n        }, {\n          \"key\" : \"limits.memory\",\n          \"value\" : 10000\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"kind\" : \"meshTenant\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n        \"deletedOn\" : \"2024-11-07T13:36:29.657329297Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"8c2d3c5e-b543-46d0-a4fc-1e966df246b5\",\n        \"landingZoneIdentifier\" : \"stage-dev\",\n        \"quotas\" : [ {\n          \"key\" : \"limits.cpu\",\n          \"value\" : 2000\n        }, {\n          \"key\" : \"limits.memory\",\n          \"value\" : 10000\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1286,7 +1353,7 @@
       "code" : 200
     } ]
   }, {
-    "id" : "meshUserListV2",
+    "id" : "meshUserListV1",
     "name" : "/api/meshobjects/meshusers",
     "variable" : [ ],
     "event" : [ ],
@@ -1297,21 +1364,21 @@
         "path" : "/api/meshobjects/meshusers",
         "port" : "8080",
         "query" : [ {
-          "key" : "workspaceIdentifier",
+          "key" : "customerIdentifier",
           "disabled" : false,
-          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
+          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
         }, {
           "key" : "projectIdentifier",
           "disabled" : false,
-          "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
+          "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
         }, {
           "key" : "platformIdentifier",
           "disabled" : false,
           "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
         }, {
-          "key" : "workspaceRole",
+          "key" : "customerRole",
           "disabled" : false,
-          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
+          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
         }, {
           "key" : "projectRole",
           "disabled" : false,
@@ -1345,26 +1412,26 @@
           "disabled" : false,
           "description" : "The amount of elements in a single page (default={default-page-size}). See <<paging,Paging information>>."
         }, {
-          "key" : "customerIdentifier",
+          "key" : "workspaceIdentifier",
           "disabled" : false,
-          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
+          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
         }, {
-          "key" : "customerRole",
+          "key" : "workspaceRole",
           "disabled" : false,
-          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
+          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
         } ]
       },
       "method" : "GET",
       "header" : [ {
         "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
-      "id" : "meshUserListV2",
-      "name" : "meshUserListV2",
+      "id" : "meshUserListV1",
+      "name" : "meshUserListV1",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -1372,21 +1439,21 @@
           "path" : "/api/meshobjects/meshusers",
           "port" : "8080",
           "query" : [ {
-            "key" : "workspaceIdentifier",
+            "key" : "customerIdentifier",
             "disabled" : false,
-            "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
+            "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
           }, {
             "key" : "projectIdentifier",
             "disabled" : false,
-            "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
+            "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
           }, {
             "key" : "platformIdentifier",
             "disabled" : false,
             "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
           }, {
-            "key" : "workspaceRole",
+            "key" : "customerRole",
             "disabled" : false,
-            "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
+            "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
           }, {
             "key" : "projectRole",
             "disabled" : false,
@@ -1424,22 +1491,22 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"c12973b1-fd64-4d65-a374-c63c51d4de58\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"c0a1ef9c-871c-475c-a6a3-b48eaa11d181\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshcustomerusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     }, {
-      "id" : "meshUserListV1",
-      "name" : "meshUserListV1",
+      "id" : "meshUserListV2",
+      "name" : "meshUserListV2",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -1447,21 +1514,21 @@
           "path" : "/api/meshobjects/meshusers",
           "port" : "8080",
           "query" : [ {
-            "key" : "customerIdentifier",
+            "key" : "workspaceIdentifier",
             "disabled" : false,
-            "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
+            "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
           }, {
             "key" : "projectIdentifier",
             "disabled" : false,
-            "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
+            "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
           }, {
             "key" : "platformIdentifier",
             "disabled" : false,
             "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
           }, {
-            "key" : "customerRole",
+            "key" : "workspaceRole",
             "disabled" : false,
-            "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
+            "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
           }, {
             "key" : "projectRole",
             "disabled" : false,
@@ -1499,18 +1566,18 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"86b0a066-fa74-4950-a7f6-ff590d5f4ccb\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshcustomerusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"a126bf9c-e697-4384-a82f-b18aac1fff17\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1575,7 +1642,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"admin-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-partner\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-partner\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-partner\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-partner\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-partner\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-partner\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-partner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 3,\n    \"totalElements\" : 6,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"admin-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-partner\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-partner\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-partner\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-partner\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-partner\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-partner\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-partner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 3,\n    \"totalElements\" : 6,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1714,6 +1781,35 @@
       "body" : "{\n  \"project-identifier\" : \"test-project-identifier\",\n  \"project-display-name\" : \"test-project\",\n  \"customer-identifier\" : \"test-customer-identifier\",\n  \"customer-display-name\" : \"test-customer\",\n  \"tags\" : {\n    \"costCenter\" : [ \"1235\" ],\n    \"customNumber\" : [ \"1645789\" ]\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshBuildingBlockDelete",
+    "name" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b",
+        "port" : "8080"
+      },
+      "method" : "DELETE"
+    },
+    "response" : [ {
+      "id" : "meshBuildingBlockDelete",
+      "name" : "meshBuildingBlockDelete",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b",
+          "port" : "8080"
+        },
+        "method" : "DELETE"
+      },
+      "cookie" : [ ],
+      "code" : 202
+    } ]
   }, {
     "id" : "meshBuildingBlock",
     "name" : "/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720",
@@ -1758,38 +1854,9 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-10-30T17:49:04.947339684Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"child block\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"My Test Resource\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"SUCCEEDED\",\n    \"outputs\" : [ {\n      \"key\" : \"resourceId\",\n      \"value\" : \"id-123\",\n      \"valueType\" : \"STRING\"\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-11-06T13:36:14.984878412Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"child block\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"My Test Resource\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"SUCCEEDED\",\n    \"outputs\" : [ {\n      \"key\" : \"resourceId\",\n      \"value\" : \"id-123\",\n      \"valueType\" : \"STRING\"\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n    }\n  }\n}",
       "code" : 200
     } ]
-  }, {
-    "id" : "meshBuildingBlockDelete",
-    "name" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-        "protocol" : "https",
-        "host" : "localhost",
-        "path" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f",
-        "port" : "8080"
-      },
-      "method" : "DELETE"
-    },
-    "response" : [ {
-      "id" : "meshBuildingBlockDelete",
-      "name" : "meshBuildingBlockDelete",
-      "originalRequest" : {
-        "url" : {
-          "protocol" : "https",
-          "host" : "localhost",
-          "path" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f",
-          "port" : "8080"
-        },
-        "method" : "DELETE"
-      },
-      "cookie" : [ ],
-      "code" : 202
-    } ]
   }, {
     "id" : "meshPaymentMethodV2",
     "name" : "/api/meshobjects/meshpaymentmethods/test-payment-method-1",
@@ -1834,7 +1901,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { },\n    \"amount\" : 1000\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { },\n    \"amount\" : 1000\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1899,7 +1966,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"e8909b8b-0f10-4a0b-929b-f3d821116392\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2031,7 +2098,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2103,14 +2170,14 @@
     } ]
   }, {
     "id" : "meshProjectV2",
-    "name" : "/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1",
+    "name" : "/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1",
+        "path" : "/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1",
         "port" : "8080"
       },
       "method" : "GET",
@@ -2128,7 +2195,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1",
+          "path" : "/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1",
           "port" : "8080"
         },
         "method" : "GET",
@@ -2145,7 +2212,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n    \"createdOn\" : \"2024-10-30T17:49:13.086196622Z\",\n    \"deletedOn\" : \"2024-10-30T17:49:14.767668318Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-11-06T13:36:26.056826397Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2193,7 +2260,7 @@
         "description" : "meshApi is <<versioning,versioned>> and answers with `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2251,7 +2318,7 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
         "urlencoded" : [ ]
       }
     },
@@ -2279,7 +2346,7 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
           "urlencoded" : [ ]
         }
       },
@@ -2288,22 +2355,28 @@
     } ]
   }, {
     "id" : "meshTagDefinition",
-    "name" : "/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter",
+    "name" : "/api/meshobjects/meshtagdefinitions/{name}",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter",
-        "port" : "8080"
+        "path" : "/api/meshobjects/meshtagdefinitions/:name",
+        "port" : "8080",
+        "variable" : [ {
+          "key" : "name",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "system" : false,
+          "disabled" : false
+        } ]
       },
       "method" : "GET",
       "header" : [ {
         "key" : "Accept",
         "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
@@ -2313,15 +2386,21 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter",
-          "port" : "8080"
+          "path" : "/api/meshobjects/meshtagdefinitions/:name",
+          "port" : "8080",
+          "variable" : [ {
+            "key" : "name",
+            "description" : "The `metadata.name` of the meshTagDefinition.",
+            "system" : false,
+            "disabled" : false
+          } ]
         },
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
           "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
@@ -2333,6 +2412,138 @@
       "body" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      }\n    },\n    \"description\" : \"Must be exactly 4 digits.\",\n    \"displayName\" : \"Cost Center\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter\"\n    }\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshTagDefinitionPut",
+    "name" : "/api/meshobjects/meshtagdefinitions/{name}",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshtagdefinitions/:name",
+        "port" : "8080",
+        "variable" : [ {
+          "key" : "name",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "system" : false,
+          "disabled" : false
+        } ]
+      },
+      "method" : "PUT",
+      "header" : [ {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+      }, {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header."
+      } ],
+      "body" : {
+        "mode" : "raw",
+        "raw" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      },\n      \"email\" : null,\n      \"integer\" : null,\n      \"number\" : null,\n      \"singleSelect\" : null,\n      \"multiSelect\" : null\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  }\n}",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshTagDefinitionPut",
+      "name" : "meshTagDefinitionPut",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshtagdefinitions/:name",
+          "port" : "8080",
+          "variable" : [ {
+            "key" : "name",
+            "description" : "The `metadata.name` of the meshTagDefinition.",
+            "system" : false,
+            "disabled" : false
+          } ]
+        },
+        "method" : "PUT",
+        "header" : [ {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        }, {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header."
+        } ],
+        "body" : {
+          "mode" : "raw",
+          "raw" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      },\n      \"email\" : null,\n      \"integer\" : null,\n      \"number\" : null,\n      \"singleSelect\" : null,\n      \"multiSelect\" : null\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  }\n}",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      }\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter\"\n    }\n  }\n}",
+      "code" : 200
+    } ]
+  }, {
+    "id" : "meshTagDefinitionDelete",
+    "name" : "/api/meshobjects/meshtagdefinitions/{name}",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshtagdefinitions/:name",
+        "port" : "8080",
+        "variable" : [ {
+          "key" : "name",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "system" : false,
+          "disabled" : false
+        } ]
+      },
+      "method" : "DELETE",
+      "header" : [ {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+      } ]
+    },
+    "response" : [ {
+      "id" : "meshTagDefinitionDelete",
+      "name" : "meshTagDefinitionDelete",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshtagdefinitions/:name",
+          "port" : "8080",
+          "variable" : [ {
+            "key" : "name",
+            "description" : "The `metadata.name` of the meshTagDefinition.",
+            "system" : false,
+            "disabled" : false
+          } ]
+        },
+        "method" : "DELETE",
+        "header" : [ {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        } ]
+      },
+      "cookie" : [ ],
+      "code" : 204
+    } ]
   }, {
     "id" : "meshTenantV3",
     "name" : "/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev",
@@ -2377,7 +2588,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n    \"deletedOn\" : \"2024-10-31T17:49:17.565940915Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"d53bb92d-8fc5-4920-8139-0d3da1f52b4e\",\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ {\n      \"key\" : \"limits.cpu\",\n      \"value\" : 2000\n    }, {\n      \"key\" : \"limits.memory\",\n      \"value\" : 10000\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n    \"deletedOn\" : \"2024-11-07T13:36:29.657329297Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"8c2d3c5e-b543-46d0-a4fc-1e966df246b5\",\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ {\n      \"key\" : \"limits.cpu\",\n      \"value\" : 2000\n    }, {\n      \"key\" : \"limits.memory\",\n      \"value\" : 10000\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2410,7 +2621,7 @@
       "code" : 202
     } ]
   }, {
-    "id" : "meshUserV2",
+    "id" : "meshUserV1",
     "name" : "/api/meshobjects/meshusers/john-doe",
     "variable" : [ ],
     "event" : [ ],
@@ -2424,38 +2635,12 @@
       "method" : "GET",
       "header" : [ {
         "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
-      "id" : "meshUserV2",
-      "name" : "meshUserV2",
-      "originalRequest" : {
-        "url" : {
-          "protocol" : "https",
-          "host" : "localhost",
-          "path" : "/api/meshobjects/meshusers/john-doe",
-          "port" : "8080"
-        },
-        "method" : "GET",
-        "header" : [ {
-          "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
-        } ]
-      },
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
-        "disabled" : false
-      } ],
-      "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"c12973b1-fd64-4d65-a374-c63c51d4de58\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n    }\n  }\n}",
-      "code" : 200
-    }, {
       "id" : "meshUserV1",
       "name" : "meshUserV1",
       "originalRequest" : {
@@ -2479,74 +2664,33 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"86b0a066-fa74-4950-a7f6-ff590d5f4ccb\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"c0a1ef9c-871c-475c-a6a3-b48eaa11d181\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n    }\n  }\n}",
       "code" : 200
-    } ]
-  }, {
-    "id" : "meshWorkspaceUserBindingCreate",
-    "name" : "/api/meshobjects/meshworkspacebindings/userbindings",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-        "protocol" : "https",
-        "host" : "localhost",
-        "path" : "/api/meshobjects/meshworkspacebindings/userbindings",
-        "port" : "8080"
-      },
-      "method" : "POST",
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as a `Content-Type` header."
-      }, {
-        "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
-      } ],
-      "body" : {
-        "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  ",
-        "urlencoded" : [ ]
-      }
-    },
-    "response" : [ {
-      "id" : "meshWorkspaceUserBindingCreate",
-      "name" : "meshWorkspaceUserBindingCreate",
+    }, {
+      "id" : "meshUserV2",
+      "name" : "meshUserV2",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshworkspacebindings/userbindings",
+          "path" : "/api/meshobjects/meshusers/john-doe",
           "port" : "8080"
         },
-        "method" : "POST",
+        "method" : "GET",
         "header" : [ {
-          "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as a `Content-Type` header."
-        }, {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
-        } ],
-        "body" : {
-          "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  ",
-          "urlencoded" : [ ]
-        }
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+        } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshWorkspaceUserBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"another-user-binding-name\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Member\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/another-user-binding-name\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"a126bf9c-e697-4384-a82f-b18aac1fff17\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2622,6 +2766,73 @@
       "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceUserBindings\" : [ {\n      \"kind\" : \"meshWorkspaceUserBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"user-binding-name\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/user-binding-name\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings?username=username1&workspaceRole=Workspace%20Manager&workspaceIdentifier=test-workspace\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshWorkspaceUserBindingCreate",
+    "name" : "/api/meshobjects/meshworkspacebindings/userbindings",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshworkspacebindings/userbindings",
+        "port" : "8080"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as a `Content-Type` header."
+      }, {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
+      } ],
+      "body" : {
+        "mode" : "raw",
+        "raw" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  ",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshWorkspaceUserBindingCreate",
+      "name" : "meshWorkspaceUserBindingCreate",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshworkspacebindings/userbindings",
+          "port" : "8080"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as a `Content-Type` header."
+        }, {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
+        } ],
+        "body" : {
+          "mode" : "raw",
+          "raw" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  ",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshWorkspaceUserBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"another-user-binding-name\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Member\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/another-user-binding-name\"\n    }\n  }\n}",
+      "code" : 200
+    } ]
   }, {
     "id" : "meshWorkspace",
     "name" : "/api/meshobjects/meshworkspaces/admin-customer",
@@ -2666,7 +2877,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-10-30T17:48:13Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"admin-customer\",\n    \"tags\" : { }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-11-06T13:34:59Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"admin-customer\",\n    \"tags\" : { }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2718,14 +2929,14 @@
     } ]
   }, {
     "id" : "meshBuildingBlockForcePurge",
-    "name" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge",
+    "name" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge",
+        "path" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge",
         "port" : "8080"
       },
       "method" : "DELETE"
@@ -2737,7 +2948,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge",
+          "path" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge",
           "port" : "8080"
         },
         "method" : "DELETE"
@@ -2747,14 +2958,14 @@
     } ]
   }, {
     "id" : "meshProjectGroupBindingDeleteV3",
-    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+        "path" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
         "port" : "8080"
       },
       "method" : "DELETE"
@@ -2766,7 +2977,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+          "path" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
           "port" : "8080"
         },
         "method" : "DELETE"
@@ -2776,14 +2987,14 @@
     } ]
   }, {
     "id" : "meshProjectGroupBindingV3",
-    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+        "path" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
         "port" : "8080"
       },
       "method" : "GET",
@@ -2801,7 +3012,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+          "path" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
           "port" : "8080"
         },
         "method" : "GET",
@@ -2818,19 +3029,19 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"e8909b8b-0f10-4a0b-929b-f3d821116392\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
     "id" : "meshProjectUserBindingV3",
-    "name" : "/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1",
+    "name" : "/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1",
+        "path" : "/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05",
         "port" : "8080"
       },
       "method" : "GET",
@@ -2848,7 +3059,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1",
+          "path" : "/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05",
           "port" : "8080"
         },
         "method" : "GET",
@@ -2865,7 +3076,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
diff --git a/website/static/api/meshstack-postman-collection.json b/website/static/api/meshstack-postman-collection.json
index b91623199..a8c5ad3da 100644
--- a/website/static/api/meshstack-postman-collection.json
+++ b/website/static/api/meshstack-postman-collection.json
@@ -99,7 +99,7 @@
       "code" : 308
     } ]
   }, {
-    "id" : "deleteMeshObjectCollection",
+    "id" : "createMeshObjectCollection",
     "name" : "/api/meshobjectcollections",
     "variable" : [ ],
     "event" : [ ],
@@ -109,7 +109,7 @@
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjectcollections"
       },
-      "method" : "DELETE",
+      "method" : "POST",
       "header" : [ {
         "key" : "Content-Type",
         "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -118,20 +118,20 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
+        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "deleteMeshObjectCollection",
-      "name" : "deleteMeshObjectCollection",
+      "id" : "createMeshObjectCollection",
+      "name" : "createMeshObjectCollection",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjectcollections",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjectcollections"
         },
-        "method" : "DELETE",
+        "method" : "POST",
         "header" : [ {
           "key" : "Content-Type",
           "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -140,15 +140,15 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
+          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
           "urlencoded" : [ ]
         }
       },
       "cookie" : [ ],
-      "code" : 200
+      "code" : 201
     } ]
   }, {
-    "id" : "createMeshObjectCollection",
+    "id" : "deleteMeshObjectCollection",
     "name" : "/api/meshobjectcollections",
     "variable" : [ ],
     "event" : [ ],
@@ -158,7 +158,7 @@
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjectcollections"
       },
-      "method" : "POST",
+      "method" : "DELETE",
       "header" : [ {
         "key" : "Content-Type",
         "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -167,20 +167,20 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
+        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "createMeshObjectCollection",
-      "name" : "createMeshObjectCollection",
+      "id" : "deleteMeshObjectCollection",
+      "name" : "deleteMeshObjectCollection",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjectcollections",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjectcollections"
         },
-        "method" : "POST",
+        "method" : "DELETE",
         "header" : [ {
           "key" : "Content-Type",
           "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -189,12 +189,12 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
+          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
           "urlencoded" : [ ]
         }
       },
       "cookie" : [ ],
-      "code" : 201
+      "code" : 200
     } ]
   }, {
     "id" : "importInJson",
@@ -280,7 +280,7 @@
       "code" : 200
     } ]
   }, {
-    "id" : "meshObjectsRootV1",
+    "id" : "meshObjectsRootV2",
     "name" : "/api/meshobjects",
     "variable" : [ ],
     "event" : [ ],
@@ -293,14 +293,14 @@
       "method" : "GET",
       "header" : [ {
         "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
-      "id" : "meshObjectsRootV1",
-      "name" : "meshObjectsRootV1",
+      "id" : "meshObjectsRootV2",
+      "name" : "meshObjectsRootV2",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects",
@@ -310,22 +310,22 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?customerIdentifier,projectIdentifier,platformIdentifier,customerUserGroupIdentifier,projectRole,customerRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups{?customerIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblockruns\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&selector}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     }, {
-      "id" : "meshObjectsRootV2",
-      "name" : "meshObjectsRootV2",
+      "id" : "meshObjectsRootV1",
+      "name" : "meshObjectsRootV1",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects",
@@ -335,18 +335,18 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblockruns\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&selector}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?customerIdentifier,projectIdentifier,platformIdentifier,customerUserGroupIdentifier,projectRole,customerRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups{?customerIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -573,7 +573,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n        \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-10-30T17:49:04.874524994Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"parent block\",\n        \"inputs\" : [ ],\n        \"parentBuildingBlocks\" : [ ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a/purge\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n        \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-10-30T17:49:04.947339684Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"child block\",\n        \"inputs\" : [ {\n          \"key\" : \"resourceName\",\n          \"value\" : \"My Test Resource\",\n          \"valueType\" : \"STRING\"\n        } ],\n        \"parentBuildingBlocks\" : [ {\n          \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n          \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n        } ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ {\n          \"key\" : \"resourceId\",\n          \"value\" : \"id-123\",\n          \"valueType\" : \"STRING\"\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks?projectIdentifier=my-project&page=0&size=10\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n        \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-11-06T13:36:14.903052143Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"parent block\",\n        \"inputs\" : [ ],\n        \"parentBuildingBlocks\" : [ ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a/purge\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n        \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-11-06T13:36:14.984878412Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"child block\",\n        \"inputs\" : [ {\n          \"key\" : \"resourceName\",\n          \"value\" : \"My Test Resource\",\n          \"valueType\" : \"STRING\"\n        } ],\n        \"parentBuildingBlocks\" : [ {\n          \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n          \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n        } ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ {\n          \"key\" : \"resourceId\",\n          \"value\" : \"id-123\",\n          \"valueType\" : \"STRING\"\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks?projectIdentifier=my-project&page=0&size=10\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -601,7 +601,7 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"29e993e4-e121-4917-8a1c-7878354742a4\"\n    }]\n  }\n} ",
+        "raw" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"8d71f49c-1792-4604-825f-7805dd41f8d4\"\n    }]\n  }\n} ",
         "urlencoded" : [ ]
       }
     },
@@ -628,7 +628,7 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"29e993e4-e121-4917-8a1c-7878354742a4\"\n    }]\n  }\n} ",
+          "raw" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"8d71f49c-1792-4604-825f-7805dd41f8d4\"\n    }]\n  }\n} ",
           "urlencoded" : [ ]
         }
       },
@@ -638,7 +638,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"9283fb1b-1f7b-4ce6-b104-88996e45939f\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-10-30T17:49:06.293296297Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"buildingBlock-for-docs\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"29e993e4-e121-4917-8a1c-7878354742a4\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"PENDING\",\n    \"outputs\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"1c10ffc2-f17a-4712-a434-dc619bdb0b0b\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-11-06T13:36:16.807033732Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"buildingBlock-for-docs\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"8d71f49c-1792-4604-825f-7805dd41f8d4\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"PENDING\",\n    \"outputs\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -709,7 +709,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-2\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-2\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -737,7 +737,7 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\"\n  }\n}",
+        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\"\n  }\n}",
         "urlencoded" : [ ]
       }
     },
@@ -764,7 +764,7 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\"\n  }\n}",
+          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\"\n  }\n}",
           "urlencoded" : [ ]
         }
       },
@@ -774,8 +774,8 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n    \"createdOn\" : \"2024-10-30T17:49:13.754216329Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}",
-      "code" : 200
+      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n    \"createdOn\" : \"2024-11-06T13:36:25.470629787Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}",
+      "code" : 201
     } ]
   }, {
     "id" : "meshProjectListV2",
@@ -853,73 +853,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n        \"createdOn\" : \"2024-10-30T17:49:13.086196622Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        },\n        \"meshprojectuserbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
-      "code" : 200
-    } ]
-  }, {
-    "id" : "meshServiceInstancePost",
-    "name" : "/api/meshobjects/meshserviceinstances",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshserviceinstances"
-      },
-      "method" : "POST",
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
-      }, {
-        "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as an `Accept` header."
-      } ],
-      "body" : {
-        "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
-        "urlencoded" : [ ]
-      }
-    },
-    "response" : [ {
-      "id" : "meshServiceInstancePost",
-      "name" : "meshServiceInstancePost",
-      "originalRequest" : {
-        "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshserviceinstances"
-        },
-        "method" : "POST",
-        "header" : [ {
-          "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
-        }, {
-          "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as an `Accept` header."
-        } ],
-        "body" : {
-          "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
-          "urlencoded" : [ ]
-        }
-      },
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and answers with `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
-      } ],
-      "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n        \"createdOn\" : \"2024-01-01T00:00:00Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        },\n        \"meshprojectuserbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1022,7 +956,73 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"rpbo6mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"rpbo6mtdg1\",\n        \"instanceId\" : \"rpbo6mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"rpbo6mtdg12\",\n        \"serviceId\" : \"rpbo6mtdg5\",\n        \"planId\" : \"rpbo6mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/rpbo6mtdg11\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"3s6f2mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"3s6f2mtdg1\",\n        \"instanceId\" : \"3s6f2mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"3s6f2mtdg12\",\n        \"serviceId\" : \"3s6f2mtdg5\",\n        \"planId\" : \"3s6f2mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/3s6f2mtdg11\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}",
+      "code" : 200
+    } ]
+  }, {
+    "id" : "meshServiceInstancePost",
+    "name" : "/api/meshobjects/meshserviceinstances",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshserviceinstances"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
+      }, {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as an `Accept` header."
+      } ],
+      "body" : {
+        "mode" : "raw",
+        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshServiceInstancePost",
+      "name" : "meshServiceInstancePost",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshserviceinstances"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
+        }, {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as an `Accept` header."
+        } ],
+        "body" : {
+          "mode" : "raw",
+          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and answers with `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1050,7 +1050,7 @@
         "key" : "Accept",
         "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
@@ -1076,7 +1076,7 @@
           "key" : "Accept",
           "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
@@ -1088,6 +1088,71 @@
       "body" : "{\n  \"_embedded\" : {\n    \"meshTagDefinitions\" : [ {\n      \"kind\" : \"meshTagDefinition\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"meshWorkspace.costCenter\"\n      },\n      \"spec\" : {\n        \"targetKind\" : \"meshWorkspace\",\n        \"key\" : \"costCenter\",\n        \"valueType\" : {\n          \"string\" : {\n            \"defaultValue\" : \"1001\",\n            \"validationRegex\" : \"^\\\\d{4}$\"\n          }\n        },\n        \"description\" : \"Must be exactly 4 digits.\",\n        \"displayName\" : \"Cost Center\",\n        \"sortOrder\" : 9999,\n        \"mandatory\" : true,\n        \"immutable\" : false,\n        \"restricted\" : false\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshTagDefinition\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"meshWorkspace.workspaceOwner\"\n      },\n      \"spec\" : {\n        \"targetKind\" : \"meshWorkspace\",\n        \"key\" : \"workspaceOwner\",\n        \"valueType\" : {\n          \"string\" : {\n            \"defaultValue\" : \"Anna Admin\"\n          }\n        },\n        \"description\" : \"Person responsible for this workspace.\",\n        \"displayName\" : \"Workspace Owner\",\n        \"sortOrder\" : 9999,\n        \"mandatory\" : false,\n        \"immutable\" : false,\n        \"restricted\" : false,\n        \"replicationKey\" : \"owner\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.workspaceOwner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions?page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshTagDefinitionPost",
+    "name" : "/api/meshobjects/meshtagdefinitions",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshtagdefinitions"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+      }, {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header."
+      } ],
+      "body" : {
+        "mode" : "raw",
+        "raw" : "{\n  \"apiVersion\": \"v1\",\n  \"kind\": \"meshTagDefinition\",\n  \"metadata\": {\n    \"name\": \"meshProject.environment\"\n  },\n  \"spec\": {\n    \"targetKind\": \"meshProject\",\n    \"key\": \"environment\",\n    \"valueType\": {\n      \"singleSelect\": {\n        \"options\": [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\": \"dev\"\n      }\n    },\n    \"description\": \"The environment the project runs in.\",\n    \"displayName\": \"Environment\",\n    \"sortOrder\": 9999,\n    \"mandatory\": true,\n    \"immutable\": false,\n    \"restricted\": false\n  }\n}",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshTagDefinitionPost",
+      "name" : "meshTagDefinitionPost",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshtagdefinitions"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        }, {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header."
+        } ],
+        "body" : {
+          "mode" : "raw",
+          "raw" : "{\n  \"apiVersion\": \"v1\",\n  \"kind\": \"meshTagDefinition\",\n  \"metadata\": {\n    \"name\": \"meshProject.environment\"\n  },\n  \"spec\": {\n    \"targetKind\": \"meshProject\",\n    \"key\": \"environment\",\n    \"valueType\": {\n      \"singleSelect\": {\n        \"options\": [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\": \"dev\"\n      }\n    },\n    \"description\": \"The environment the project runs in.\",\n    \"displayName\": \"Environment\",\n    \"sortOrder\": 9999,\n    \"mandatory\": true,\n    \"immutable\": false,\n    \"restricted\": false\n  }\n}",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshProject.environment\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshProject\",\n    \"key\" : \"environment\",\n    \"valueType\" : {\n      \"singleSelect\" : {\n        \"options\" : [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\" : \"dev\"\n      }\n    },\n    \"description\" : \"The environment the project runs in.\",\n    \"displayName\" : \"Environment\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment\"\n    }\n  }\n}",
+      "code" : 201
+    } ]
   }, {
     "id" : "meshTenantListV3",
     "name" : "/api/meshobjects/meshtenants",
@@ -1180,7 +1245,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"kind\" : \"meshTenant\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n        \"deletedOn\" : \"2024-10-31T17:49:17.565940915Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"d53bb92d-8fc5-4920-8139-0d3da1f52b4e\",\n        \"landingZoneIdentifier\" : \"stage-dev\",\n        \"quotas\" : [ {\n          \"key\" : \"limits.cpu\",\n          \"value\" : 2000\n        }, {\n          \"key\" : \"limits.memory\",\n          \"value\" : 10000\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"kind\" : \"meshTenant\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n        \"deletedOn\" : \"2024-11-07T13:36:29.657329297Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"8c2d3c5e-b543-46d0-a4fc-1e966df246b5\",\n        \"landingZoneIdentifier\" : \"stage-dev\",\n        \"quotas\" : [ {\n          \"key\" : \"limits.cpu\",\n          \"value\" : 2000\n        }, {\n          \"key\" : \"limits.memory\",\n          \"value\" : 10000\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1249,7 +1314,7 @@
       "code" : 200
     } ]
   }, {
-    "id" : "meshUserListV2",
+    "id" : "meshUserListV1",
     "name" : "/api/meshobjects/meshusers",
     "variable" : [ ],
     "event" : [ ],
@@ -1259,21 +1324,21 @@
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshusers"
 ,         "query" : [ {
-          "key" : "workspaceIdentifier",
+          "key" : "customerIdentifier",
           "disabled" : false,
-          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
+          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
         }, {
           "key" : "projectIdentifier",
           "disabled" : false,
-          "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
+          "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
         }, {
           "key" : "platformIdentifier",
           "disabled" : false,
           "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
         }, {
-          "key" : "workspaceRole",
+          "key" : "customerRole",
           "disabled" : false,
-          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
+          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
         }, {
           "key" : "projectRole",
           "disabled" : false,
@@ -1307,47 +1372,47 @@
           "disabled" : false,
           "description" : "The amount of elements in a single page (default={default-page-size}). See <<paging,Paging information>>."
         }, {
-          "key" : "customerIdentifier",
+          "key" : "workspaceIdentifier",
           "disabled" : false,
-          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
+          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
         }, {
-          "key" : "customerRole",
+          "key" : "workspaceRole",
           "disabled" : false,
-          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
+          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
         } ]
       },
       "method" : "GET",
       "header" : [ {
         "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
-      "id" : "meshUserListV2",
-      "name" : "meshUserListV2",
-      "originalRequest" : {
+      "id" : "meshUserListV1",
+      "name" : "meshUserListV1",
+      "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects/meshusers",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshusers"
 ,           "query" : [ {
-            "key" : "workspaceIdentifier",
+            "key" : "customerIdentifier",
             "disabled" : false,
-            "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
+            "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
           }, {
             "key" : "projectIdentifier",
             "disabled" : false,
-            "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
+            "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
           }, {
             "key" : "platformIdentifier",
             "disabled" : false,
             "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
           }, {
-            "key" : "workspaceRole",
+            "key" : "customerRole",
             "disabled" : false,
-            "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
+            "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
           }, {
             "key" : "projectRole",
             "disabled" : false,
@@ -1385,43 +1450,43 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"c12973b1-fd64-4d65-a374-c63c51d4de58\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"c0a1ef9c-871c-475c-a6a3-b48eaa11d181\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshcustomerusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     }, {
-      "id" : "meshUserListV1",
-      "name" : "meshUserListV1",
+      "id" : "meshUserListV2",
+      "name" : "meshUserListV2",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects/meshusers",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshusers"
 ,           "query" : [ {
-            "key" : "customerIdentifier",
+            "key" : "workspaceIdentifier",
             "disabled" : false,
-            "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
+            "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
           }, {
             "key" : "projectIdentifier",
             "disabled" : false,
-            "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
+            "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
           }, {
             "key" : "platformIdentifier",
             "disabled" : false,
             "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
           }, {
-            "key" : "customerRole",
+            "key" : "workspaceRole",
             "disabled" : false,
-            "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
+            "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
           }, {
             "key" : "projectRole",
             "disabled" : false,
@@ -1459,18 +1524,18 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"86b0a066-fa74-4950-a7f6-ff590d5f4ccb\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshcustomerusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"a126bf9c-e697-4384-a82f-b18aac1fff17\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1533,7 +1598,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"admin-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-partner\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-partner\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-partner\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-partner\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-partner\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-partner\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-partner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 3,\n    \"totalElements\" : 6,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"admin-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-partner\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-partner\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-partner\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-partner\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-partner\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-partner\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-partner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 3,\n    \"totalElements\" : 6,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1668,6 +1733,33 @@
       "body" : "{\n  \"project-identifier\" : \"test-project-identifier\",\n  \"project-display-name\" : \"test-project\",\n  \"customer-identifier\" : \"test-customer-identifier\",\n  \"customer-display-name\" : \"test-customer\",\n  \"tags\" : {\n    \"costCenter\" : [ \"1235\" ],\n    \"customNumber\" : [ \"1645789\" ]\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshBuildingBlockDelete",
+    "name" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b"
+      },
+      "method" : "DELETE"
+    },
+    "response" : [ {
+      "id" : "meshBuildingBlockDelete",
+      "name" : "meshBuildingBlockDelete",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b"
+        },
+        "method" : "DELETE"
+      },
+      "cookie" : [ ],
+      "code" : 202
+    } ]
   }, {
     "id" : "meshBuildingBlock",
     "name" : "/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720",
@@ -1710,36 +1802,9 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-10-30T17:49:04.947339684Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"child block\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"My Test Resource\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"SUCCEEDED\",\n    \"outputs\" : [ {\n      \"key\" : \"resourceId\",\n      \"value\" : \"id-123\",\n      \"valueType\" : \"STRING\"\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-11-06T13:36:14.984878412Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"child block\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"My Test Resource\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"SUCCEEDED\",\n    \"outputs\" : [ {\n      \"key\" : \"resourceId\",\n      \"value\" : \"id-123\",\n      \"valueType\" : \"STRING\"\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n    }\n  }\n}",
       "code" : 200
     } ]
-  }, {
-    "id" : "meshBuildingBlockDelete",
-    "name" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f"
-      },
-      "method" : "DELETE"
-    },
-    "response" : [ {
-      "id" : "meshBuildingBlockDelete",
-      "name" : "meshBuildingBlockDelete",
-      "originalRequest" : {
-        "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f"
-        },
-        "method" : "DELETE"
-      },
-      "cookie" : [ ],
-      "code" : 202
-    } ]
   }, {
     "id" : "meshPaymentMethodV2",
     "name" : "/api/meshobjects/meshpaymentmethods/test-payment-method-1",
@@ -1782,7 +1847,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { },\n    \"amount\" : 1000\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { },\n    \"amount\" : 1000\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1845,7 +1910,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"e8909b8b-0f10-4a0b-929b-f3d821116392\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1973,7 +2038,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2043,14 +2108,14 @@
     } ]
   }, {
     "id" : "meshProjectV2",
-    "name" : "/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1",
+    "name" : "/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1"
+"path" : "/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1"
       },
       "method" : "GET",
       "header" : [ {
@@ -2065,9 +2130,9 @@
       "name" : "meshProjectV2",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1"
+"path" : "/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1"
         },
         "method" : "GET",
         "header" : [ {
@@ -2083,7 +2148,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n    \"createdOn\" : \"2024-10-30T17:49:13.086196622Z\",\n    \"deletedOn\" : \"2024-10-30T17:49:14.767668318Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-11-06T13:36:26.056826397Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2129,7 +2194,7 @@
         "description" : "meshApi is <<versioning,versioned>> and answers with `application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json` as a `Content-Type` header."
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2184,7 +2249,7 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
         "urlencoded" : [ ]
       }
     },
@@ -2211,7 +2276,7 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
           "urlencoded" : [ ]
         }
       },
@@ -2220,21 +2285,27 @@
     } ]
   }, {
     "id" : "meshTagDefinition",
-    "name" : "/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter",
+    "name" : "/api/meshobjects/meshtagdefinitions/{name}",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter",
+	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions/:name",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter"
+"path" : "/api/meshobjects/meshtagdefinitions/:name"
+,         "variable" : [ {
+          "key" : "name",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "system" : false,
+          "disabled" : false
+        } ]
       },
       "method" : "GET",
       "header" : [ {
         "key" : "Accept",
         "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
@@ -2242,16 +2313,22 @@
       "name" : "meshTagDefinition",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter",
+	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions/:name",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter"
+"path" : "/api/meshobjects/meshtagdefinitions/:name"
+,           "variable" : [ {
+            "key" : "name",
+            "description" : "The `metadata.name` of the meshTagDefinition.",
+            "system" : false,
+            "disabled" : false
+          } ]
         },
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
           "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
@@ -2263,6 +2340,134 @@
       "body" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      }\n    },\n    \"description\" : \"Must be exactly 4 digits.\",\n    \"displayName\" : \"Cost Center\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter\"\n    }\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshTagDefinitionPut",
+    "name" : "/api/meshobjects/meshtagdefinitions/{name}",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions/:name",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshtagdefinitions/:name"
+,         "variable" : [ {
+          "key" : "name",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "system" : false,
+          "disabled" : false
+        } ]
+      },
+      "method" : "PUT",
+      "header" : [ {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+      }, {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header."
+      } ],
+      "body" : {
+        "mode" : "raw",
+        "raw" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      },\n      \"email\" : null,\n      \"integer\" : null,\n      \"number\" : null,\n      \"singleSelect\" : null,\n      \"multiSelect\" : null\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  }\n}",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshTagDefinitionPut",
+      "name" : "meshTagDefinitionPut",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions/:name",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshtagdefinitions/:name"
+,           "variable" : [ {
+            "key" : "name",
+            "description" : "The `metadata.name` of the meshTagDefinition.",
+            "system" : false,
+            "disabled" : false
+          } ]
+        },
+        "method" : "PUT",
+        "header" : [ {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        }, {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header."
+        } ],
+        "body" : {
+          "mode" : "raw",
+          "raw" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      },\n      \"email\" : null,\n      \"integer\" : null,\n      \"number\" : null,\n      \"singleSelect\" : null,\n      \"multiSelect\" : null\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  }\n}",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      }\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter\"\n    }\n  }\n}",
+      "code" : 200
+    } ]
+  }, {
+    "id" : "meshTagDefinitionDelete",
+    "name" : "/api/meshobjects/meshtagdefinitions/{name}",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions/:name",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshtagdefinitions/:name"
+,         "variable" : [ {
+          "key" : "name",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "system" : false,
+          "disabled" : false
+        } ]
+      },
+      "method" : "DELETE",
+      "header" : [ {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+        "disabled" : false,
+        "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+      } ]
+    },
+    "response" : [ {
+      "id" : "meshTagDefinitionDelete",
+      "name" : "meshTagDefinitionDelete",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshtagdefinitions/:name",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshtagdefinitions/:name"
+,           "variable" : [ {
+            "key" : "name",
+            "description" : "The `metadata.name` of the meshTagDefinition.",
+            "system" : false,
+            "disabled" : false
+          } ]
+        },
+        "method" : "DELETE",
+        "header" : [ {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json",
+          "disabled" : false,
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        } ]
+      },
+      "cookie" : [ ],
+      "code" : 204
+    } ]
   }, {
     "id" : "meshTenantV3",
     "name" : "/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev",
@@ -2305,7 +2510,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n    \"deletedOn\" : \"2024-10-31T17:49:17.565940915Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"d53bb92d-8fc5-4920-8139-0d3da1f52b4e\",\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ {\n      \"key\" : \"limits.cpu\",\n      \"value\" : 2000\n    }, {\n      \"key\" : \"limits.memory\",\n      \"value\" : 10000\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n    \"deletedOn\" : \"2024-11-07T13:36:29.657329297Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"8c2d3c5e-b543-46d0-a4fc-1e966df246b5\",\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ {\n      \"key\" : \"limits.cpu\",\n      \"value\" : 2000\n    }, {\n      \"key\" : \"limits.memory\",\n      \"value\" : 10000\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2336,7 +2541,7 @@
       "code" : 202
     } ]
   }, {
-    "id" : "meshUserV2",
+    "id" : "meshUserV1",
     "name" : "/api/meshobjects/meshusers/john-doe",
     "variable" : [ ],
     "event" : [ ],
@@ -2349,37 +2554,12 @@
       "method" : "GET",
       "header" : [ {
         "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
-      "id" : "meshUserV2",
-      "name" : "meshUserV2",
-      "originalRequest" : {
-        "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshusers/john-doe",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshusers/john-doe"
-        },
-        "method" : "GET",
-        "header" : [ {
-          "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
-        } ]
-      },
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
-        "disabled" : false
-      } ],
-      "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"c12973b1-fd64-4d65-a374-c63c51d4de58\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n    }\n  }\n}",
-      "code" : 200
-    }, {
       "id" : "meshUserV1",
       "name" : "meshUserV1",
       "originalRequest" : {
@@ -2402,72 +2582,32 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"86b0a066-fa74-4950-a7f6-ff590d5f4ccb\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"c0a1ef9c-871c-475c-a6a3-b48eaa11d181\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n    }\n  }\n}",
       "code" : 200
-    } ]
-  }, {
-    "id" : "meshWorkspaceUserBindingCreate",
-    "name" : "/api/meshobjects/meshworkspacebindings/userbindings",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshworkspacebindings/userbindings",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshworkspacebindings/userbindings"
-      },
-      "method" : "POST",
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as a `Content-Type` header."
-      }, {
-        "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
-      } ],
-      "body" : {
-        "mode" : "raw",
-        "raw" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  ",
-        "urlencoded" : [ ]
-      }
-    },
-    "response" : [ {
-      "id" : "meshWorkspaceUserBindingCreate",
-      "name" : "meshWorkspaceUserBindingCreate",
+    }, {
+      "id" : "meshUserV2",
+      "name" : "meshUserV2",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshworkspacebindings/userbindings",
+	"raw": "{{baseUrl}}/api/meshobjects/meshusers/john-doe",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshworkspacebindings/userbindings"
+"path" : "/api/meshobjects/meshusers/john-doe"
         },
-        "method" : "POST",
+        "method" : "GET",
         "header" : [ {
-          "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as a `Content-Type` header."
-        }, {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
-        } ],
-        "body" : {
-          "mode" : "raw",
-          "raw" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  ",
-          "urlencoded" : [ ]
-        }
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+        } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshWorkspaceUserBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"another-user-binding-name\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Member\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/another-user-binding-name\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"a126bf9c-e697-4384-a82f-b18aac1fff17\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2541,6 +2681,71 @@
       "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceUserBindings\" : [ {\n      \"kind\" : \"meshWorkspaceUserBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"user-binding-name\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/user-binding-name\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings?username=username1&workspaceRole=Workspace%20Manager&workspaceIdentifier=test-workspace\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshWorkspaceUserBindingCreate",
+    "name" : "/api/meshobjects/meshworkspacebindings/userbindings",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshworkspacebindings/userbindings",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshworkspacebindings/userbindings"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as a `Content-Type` header."
+      }, {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
+      } ],
+      "body" : {
+        "mode" : "raw",
+        "raw" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  ",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshWorkspaceUserBindingCreate",
+      "name" : "meshWorkspaceUserBindingCreate",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshworkspacebindings/userbindings",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshworkspacebindings/userbindings"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as a `Content-Type` header."
+        }, {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
+        } ],
+        "body" : {
+          "mode" : "raw",
+          "raw" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  ",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshWorkspaceUserBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"another-user-binding-name\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Member\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/another-user-binding-name\"\n    }\n  }\n}",
+      "code" : 200
+    } ]
   }, {
     "id" : "meshWorkspace",
     "name" : "/api/meshobjects/meshworkspaces/admin-customer",
@@ -2583,7 +2788,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-10-30T17:48:13Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"admin-customer\",\n    \"tags\" : { }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-11-06T13:34:59Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"admin-customer\",\n    \"tags\" : { }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2633,14 +2838,14 @@
     } ]
   }, {
     "id" : "meshBuildingBlockForcePurge",
-    "name" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge",
+    "name" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge",
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge"
+"path" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge"
       },
       "method" : "DELETE"
     },
@@ -2649,9 +2854,9 @@
       "name" : "meshBuildingBlockForcePurge",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge",
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge"
+"path" : "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge"
         },
         "method" : "DELETE"
       },
@@ -2660,14 +2865,14 @@
     } ]
   }, {
     "id" : "meshProjectGroupBindingDeleteV3",
-    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+"path" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
       },
       "method" : "DELETE"
     },
@@ -2676,9 +2881,9 @@
       "name" : "meshProjectGroupBindingDeleteV3",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+"path" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
         },
         "method" : "DELETE"
       },
@@ -2687,14 +2892,14 @@
     } ]
   }, {
     "id" : "meshProjectGroupBindingV3",
-    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+"path" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
       },
       "method" : "GET",
       "header" : [ {
@@ -2709,9 +2914,9 @@
       "name" : "meshProjectGroupBindingV3",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392"
+"path" : "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2"
         },
         "method" : "GET",
         "header" : [ {
@@ -2727,19 +2932,19 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"e8909b8b-0f10-4a0b-929b-f3d821116392\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
     "id" : "meshProjectUserBindingV3",
-    "name" : "/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1",
+    "name" : "/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1"
+"path" : "/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
       },
       "method" : "GET",
       "header" : [ {
@@ -2754,9 +2959,9 @@
       "name" : "meshProjectUserBindingV3",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1"
+"path" : "/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05"
         },
         "method" : "GET",
         "header" : [ {
@@ -2772,7 +2977,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
diff --git a/website/static/api/meshstack-swagger-docs.json b/website/static/api/meshstack-swagger-docs.json
index a7c602491..3c0170948 100644
--- a/website/static/api/meshstack-swagger-docs.json
+++ b/website/static/api/meshstack-swagger-docs.json
@@ -151,12 +151,12 @@
     "/api/meshobjects" : {
       "get" : {
         "tags" : [ "api" ],
-        "operationId" : "meshObjectsRootV1",
-        "produces" : [ "application/vnd.meshcloud.api.meshobjects.v1.hal+json", "application/vnd.meshcloud.api.meshobjects.v2.hal+json" ],
+        "operationId" : "meshObjectsRootV2",
+        "produces" : [ "application/vnd.meshcloud.api.meshobjects.v2.hal+json", "application/vnd.meshcloud.api.meshobjects.v1.hal+json" ],
         "parameters" : [ {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshobjects.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "type" : "string"
         } ],
@@ -164,10 +164,10 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshobjects.v1.hal+json" : "{\n  \"_links\" : {\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?customerIdentifier,projectIdentifier,platformIdentifier,customerUserGroupIdentifier,projectRole,customerRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups{?customerIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshobjects.v2.hal+json" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&projectIdentifier={projectIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblockruns\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&selector}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
             },
             "schema" : {
-              "$ref" : "#/definitions/meshObjectsRootV1"
+              "$ref" : "#/definitions/meshObjectsRootV2"
             }
           }
         },
@@ -366,7 +366,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n        \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-10-30T17:49:04.874524994Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"parent block\",\n        \"inputs\" : [ ],\n        \"parentBuildingBlocks\" : [ ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a/purge\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n        \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-10-30T17:49:04.947339684Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"child block\",\n        \"inputs\" : [ {\n          \"key\" : \"resourceName\",\n          \"value\" : \"My Test Resource\",\n          \"valueType\" : \"STRING\"\n        } ],\n        \"parentBuildingBlocks\" : [ {\n          \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n          \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n        } ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ {\n          \"key\" : \"resourceId\",\n          \"value\" : \"id-123\",\n          \"valueType\" : \"STRING\"\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks?projectIdentifier=my-project&page=0&size=10\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n        \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-11-06T13:36:14.903052143Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"parent block\",\n        \"inputs\" : [ ],\n        \"parentBuildingBlocks\" : [ ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/68ce5455-2a4a-4a4b-a324-6a6c18cab85a/purge\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshBuildingBlock\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n        \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-11-06T13:36:14.984878412Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"child block\",\n        \"inputs\" : [ {\n          \"key\" : \"resourceName\",\n          \"value\" : \"My Test Resource\",\n          \"valueType\" : \"STRING\"\n        } ],\n        \"parentBuildingBlocks\" : [ {\n          \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n          \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n        } ]\n      },\n      \"status\" : {\n        \"status\" : \"SUCCEEDED\",\n        \"outputs\" : [ {\n          \"key\" : \"resourceId\",\n          \"value\" : \"id-123\",\n          \"valueType\" : \"STRING\"\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        },\n        \"forcePurge\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks?projectIdentifier=my-project&page=0&size=10\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshBuildingBlockList"
@@ -399,17 +399,17 @@
           "name" : "",
           "required" : false,
           "schema" : {
-            "$ref" : "#/definitions/api_meshobjects_meshbuildingblocks-1350814146"
+            "$ref" : "#/definitions/api_meshobjects_meshbuildingblocks-740594240"
           },
           "x-examples" : {
-            "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"29e993e4-e121-4917-8a1c-7878354742a4\"\n    }]\n  }\n} "
+            "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"8d71f49c-1792-4604-825f-7805dd41f8d4\"\n    }]\n  }\n} "
           }
         } ],
         "responses" : {
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"9283fb1b-1f7b-4ce6-b104-88996e45939f\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-10-30T17:49:06.293296297Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"buildingBlock-for-docs\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"29e993e4-e121-4917-8a1c-7878354742a4\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"PENDING\",\n    \"outputs\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"1c10ffc2-f17a-4712-a434-dc619bdb0b0b\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-11-06T13:36:16.807033732Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"buildingBlock-for-docs\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"8d71f49c-1792-4604-825f-7805dd41f8d4\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"PENDING\",\n    \"outputs\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshBuildingBlockPost"
@@ -455,7 +455,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-2\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=rpbo6mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { },\n        \"amount\" : 1000\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-2\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=3s6f2mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshPaymentMethodListV2"
@@ -507,7 +507,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshproject.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n        \"createdOn\" : \"2024-10-30T17:49:13.086196622Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        },\n        \"meshprojectuserbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=rpbo6mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshproject.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n        \"createdOn\" : \"2024-01-01T00:00:00Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        },\n        \"meshprojectuserbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=3s6f2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectListV2"
@@ -540,17 +540,17 @@
           "name" : "",
           "required" : false,
           "schema" : {
-            "$ref" : "#/definitions/api_meshobjects_meshprojects1522872298"
+            "$ref" : "#/definitions/api_meshobjects_meshprojects101958771"
           },
           "x-examples" : {
-            "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\"\n  }\n}"
+            "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\"\n  }\n}"
           }
         } ],
         "responses" : {
-          "200" : {
+          "201" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshproject.v2.hal+json" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n    \"createdOn\" : \"2024-10-30T17:49:13.754216329Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshproject.v2.hal+json" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n    \"createdOn\" : \"2024-11-06T13:36:25.470629787Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectPost"
@@ -620,7 +620,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"rpbo6mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"rpbo6mtdg1\",\n        \"instanceId\" : \"rpbo6mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"rpbo6mtdg12\",\n        \"serviceId\" : \"rpbo6mtdg5\",\n        \"planId\" : \"rpbo6mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/rpbo6mtdg11\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"3s6f2mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"3s6f2mtdg1\",\n        \"instanceId\" : \"3s6f2mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"3s6f2mtdg12\",\n        \"serviceId\" : \"3s6f2mtdg5\",\n        \"planId\" : \"3s6f2mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/3s6f2mtdg11\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshServiceInstanceListV2"
@@ -653,17 +653,17 @@
           "name" : "",
           "required" : false,
           "schema" : {
-            "$ref" : "#/definitions/api_meshobjects_meshserviceinstances-1094762204"
+            "$ref" : "#/definitions/api_meshobjects_meshserviceinstances-1853629624"
           },
           "x-examples" : {
-            "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
+            "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
           }
         } ],
         "responses" : {
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
             },
             "headers" : {
               "Content-Type" : {
@@ -701,7 +701,7 @@
         }, {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "type" : "string"
         } ],
@@ -719,6 +719,46 @@
         "security" : [ {
           "basic" : [ ]
         } ]
+      },
+      "post" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshTagDefinitionPost",
+        "consumes" : [ "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8" ],
+        "produces" : [ "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json" ],
+        "parameters" : [ {
+          "name" : "Accept",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "Content-Type",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header.",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/api_meshobjects_meshtagdefinitions-1417749508"
+          },
+          "x-examples" : {
+            "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8" : "{\n  \"apiVersion\": \"v1\",\n  \"kind\": \"meshTagDefinition\",\n  \"metadata\": {\n    \"name\": \"meshProject.environment\"\n  },\n  \"spec\": {\n    \"targetKind\": \"meshProject\",\n    \"key\": \"environment\",\n    \"valueType\": {\n      \"singleSelect\": {\n        \"options\": [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\": \"dev\"\n      }\n    },\n    \"description\": \"The environment the project runs in.\",\n    \"displayName\": \"Environment\",\n    \"sortOrder\": 9999,\n    \"mandatory\": true,\n    \"immutable\": false,\n    \"restricted\": false\n  }\n}"
+          }
+        } ],
+        "responses" : {
+          "201" : {
+            "description" : "",
+            "examples" : {
+              "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshProject.environment\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshProject\",\n    \"key\" : \"environment\",\n    \"valueType\" : {\n      \"singleSelect\" : {\n        \"options\" : [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\" : \"dev\"\n      }\n    },\n    \"description\" : \"The environment the project runs in.\",\n    \"displayName\" : \"Environment\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshProject.environment\"\n    }\n  }\n}"
+            }
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
       }
     },
     "/api/meshobjects/meshtenants" : {
@@ -773,7 +813,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshtenant.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"kind\" : \"meshTenant\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n        \"deletedOn\" : \"2024-10-31T17:49:17.565940915Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"d53bb92d-8fc5-4920-8139-0d3da1f52b4e\",\n        \"landingZoneIdentifier\" : \"stage-dev\",\n        \"quotas\" : [ {\n          \"key\" : \"limits.cpu\",\n          \"value\" : 2000\n        }, {\n          \"key\" : \"limits.memory\",\n          \"value\" : 10000\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshtenant.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"kind\" : \"meshTenant\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n        \"deletedOn\" : \"2024-11-07T13:36:29.657329297Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"8c2d3c5e-b543-46d0-a4fc-1e966df246b5\",\n        \"landingZoneIdentifier\" : \"stage-dev\",\n        \"quotas\" : [ {\n          \"key\" : \"limits.cpu\",\n          \"value\" : 2000\n        }, {\n          \"key\" : \"limits.memory\",\n          \"value\" : 10000\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshTenantListV3"
@@ -831,18 +871,18 @@
     "/api/meshobjects/meshusers" : {
       "get" : {
         "tags" : [ "api" ],
-        "operationId" : "meshUserListV2",
-        "produces" : [ "application/vnd.meshcloud.api.meshuser.v2.hal+json", "application/vnd.meshcloud.api.meshuser.v1.hal+json" ],
+        "operationId" : "meshUserListV1",
+        "produces" : [ "application/vnd.meshcloud.api.meshuser.v1.hal+json", "application/vnd.meshcloud.api.meshuser.v2.hal+json" ],
         "parameters" : [ {
-          "name" : "workspaceIdentifier",
+          "name" : "customerIdentifier",
           "in" : "query",
-          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)",
+          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)",
           "required" : false,
           "type" : "string"
         }, {
           "name" : "projectIdentifier",
           "in" : "query",
-          "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)",
+          "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)",
           "required" : false,
           "type" : "string"
         }, {
@@ -852,9 +892,9 @@
           "required" : false,
           "type" : "string"
         }, {
-          "name" : "workspaceRole",
+          "name" : "customerRole",
           "in" : "query",
-          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)",
+          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)",
           "required" : false,
           "type" : "string"
         }, {
@@ -906,21 +946,21 @@
           "required" : true,
           "type" : "string"
         }, {
-          "name" : "customerIdentifier",
+          "name" : "workspaceIdentifier",
           "in" : "query",
-          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)",
+          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)",
           "required" : false,
           "type" : "string"
         }, {
-          "name" : "customerRole",
+          "name" : "workspaceRole",
           "in" : "query",
-          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)",
+          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)",
           "required" : false,
           "type" : "string"
         }, {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "type" : "string"
         } ],
@@ -928,10 +968,10 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshuser.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"c12973b1-fd64-4d65-a374-c63c51d4de58\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshuser.v1.hal+json" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"kind\" : \"meshUser\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"c0a1ef9c-871c-475c-a6a3-b48eaa11d181\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshcustomerusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
-              "$ref" : "#/definitions/meshUserListV2"
+              "$ref" : "#/definitions/meshUserListV1"
             }
           }
         },
@@ -968,7 +1008,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshworkspace.v1.hal+json" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"admin-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-10-30T17:48:13Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-partner\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-partner\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-partner\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-partner\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-partner\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-partner\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-partner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 3,\n    \"totalElements\" : 6,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshworkspace.v1.hal+json" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"admin-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-customer\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-customer\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-customer\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-customer\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-customer\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-customer\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-customer\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshWorkspace\",\n      \"apiVersion\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-11-06T13:34:59Z\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"demo-partner\",\n        \"tags\" : { }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/demo-partner\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=demo-partner\"\n        },\n        \"meshprojects\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=demo-partner\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=demo-partner\"\n        },\n        \"meshpaymentmethods\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=demo-partner\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=demo-partner\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=0&size=3\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces?page=1&size=3\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 3,\n    \"totalElements\" : 6,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshWorkspaceList"
@@ -1065,6 +1105,21 @@
         } ]
       }
     },
+    "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b" : {
+      "delete" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshBuildingBlockDelete",
+        "responses" : {
+          "202" : {
+            "description" : "",
+            "examples" : { }
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
+      }
+    },
     "/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720" : {
       "get" : {
         "tags" : [ "api" ],
@@ -1081,7 +1136,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-10-30T17:49:04.947339684Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"child block\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"My Test Resource\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"SUCCEEDED\",\n    \"outputs\" : [ {\n      \"key\" : \"resourceId\",\n      \"value\" : \"id-123\",\n      \"valueType\" : \"STRING\"\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"5646eafe-5d56-43e5-84fe-329bb050d720\",\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-11-06T13:36:14.984878412Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"child block\",\n    \"inputs\" : [ {\n      \"key\" : \"resourceName\",\n      \"value\" : \"My Test Resource\",\n      \"valueType\" : \"STRING\"\n    } ],\n    \"parentBuildingBlocks\" : [ {\n      \"buildingBlockUuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"definitionUuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\"\n    } ]\n  },\n  \"status\" : {\n    \"status\" : \"SUCCEEDED\",\n    \"outputs\" : [ {\n      \"key\" : \"resourceId\",\n      \"value\" : \"id-123\",\n      \"valueType\" : \"STRING\"\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    },\n    \"forcePurge\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720/purge\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshBuildingBlock"
@@ -1093,21 +1148,6 @@
         } ]
       }
     },
-    "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f" : {
-      "delete" : {
-        "tags" : [ "api" ],
-        "operationId" : "meshBuildingBlockDelete",
-        "responses" : {
-          "202" : {
-            "description" : "",
-            "examples" : { }
-          }
-        },
-        "security" : [ {
-          "basic" : [ ]
-        } ]
-      }
-    },
     "/api/meshobjects/meshpaymentmethods/test-payment-method-1" : {
       "get" : {
         "tags" : [ "api" ],
@@ -1124,7 +1164,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"rpbo6mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { },\n    \"amount\" : 1000\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshpaymentmethod.v2.hal+json" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"3s6f2mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { },\n    \"amount\" : 1000\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment-method-1\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?paymentIdentifier=test-payment-method-1\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshPaymentMethodV2"
@@ -1164,7 +1204,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"e8909b8b-0f10-4a0b-929b-f3d821116392\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectGroupBindingListV3"
@@ -1197,7 +1237,7 @@
           "name" : "",
           "required" : false,
           "schema" : {
-            "$ref" : "#/definitions/api_meshobjects_meshprojectbindings_groupbindings857573997"
+            "$ref" : "#/definitions/api_meshobjects_meshprojectbindings_groupbindings128211873"
           },
           "x-examples" : {
             "application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json;charset=UTF-8" : "{\n  \"apiVersion\": \"v3\",\n  \"kind\": \"meshProjectGroupBinding\",\n  \"metadata\": {\n    \"name\": \"group-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-project-1\",\n    \"ownedByWorkspace\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Project Reader\" },\n  \"subject\": {\n    \"name\" : \"testgroup\"\n  }\n}  "
@@ -1247,7 +1287,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Project User\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-project-1\",\n        \"displayName\" : \"Test Project 1\",\n        \"ownedByWorkspace\" : \"test-workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"username1\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=test-workspace&projectIdentifier=test-project-1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectUserBindingListV3"
@@ -1302,7 +1342,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1" : {
+    "/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectV2",
@@ -1318,7 +1358,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshproject.v2.hal+json" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\",\n    \"createdOn\" : \"2024-10-30T17:49:13.086196622Z\",\n    \"deletedOn\" : \"2024-10-30T17:49:14.767668318Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/rpbo6mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=rpbo6mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshproject.v2.hal+json" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-11-06T13:36:26.056826397Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/3s6f2mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    },\n    \"meshprojectuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=3s6f2mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectV2"
@@ -1346,7 +1386,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
             },
             "headers" : {
               "Content-Type" : {
@@ -1384,10 +1424,10 @@
           "name" : "",
           "required" : false,
           "schema" : {
-            "$ref" : "#/definitions/api_meshobjects_meshserviceinstances_serviceInstanceId-730024705"
+            "$ref" : "#/definitions/api_meshobjects_meshserviceinstances_serviceInstanceId-1550263005"
           },
           "x-examples" : {
-            "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
+            "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
           }
         } ],
         "responses" : {
@@ -1414,15 +1454,21 @@
         } ]
       }
     },
-    "/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter" : {
+    "/api/meshobjects/meshtagdefinitions/{name}" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshTagDefinition",
         "produces" : [ "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json" ],
         "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "required" : true,
+          "type" : "string"
+        }, {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "type" : "string"
         } ],
@@ -1440,6 +1486,78 @@
         "security" : [ {
           "basic" : [ ]
         } ]
+      },
+      "put" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshTagDefinitionPut",
+        "consumes" : [ "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8" ],
+        "produces" : [ "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json" ],
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "Accept",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "Content-Type",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as a `Content-Type` header.",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/api_meshobjects_meshtagdefinitions_name5593675"
+          },
+          "x-examples" : {
+            "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json;charset=UTF-8" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      },\n      \"email\" : null,\n      \"integer\" : null,\n      \"number\" : null,\n      \"singleSelect\" : null,\n      \"multiSelect\" : null\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  }\n}"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "",
+            "examples" : {
+              "application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      }\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions/meshWorkspace.costCenter\"\n    }\n  }\n}"
+            }
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
+      },
+      "delete" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshTagDefinitionDelete",
+        "parameters" : [ {
+          "name" : "name",
+          "in" : "path",
+          "description" : "The `metadata.name` of the meshTagDefinition.",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "Accept",
+          "in" : "header",
+          "description" : "meshObjectApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtagdefinition.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "",
+            "examples" : { }
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
       }
     },
     "/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev" : {
@@ -1458,7 +1576,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshtenant.v3.hal+json" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n    \"deletedOn\" : \"2024-10-31T17:49:17.565940915Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"d53bb92d-8fc5-4920-8139-0d3da1f52b4e\",\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ {\n      \"key\" : \"limits.cpu\",\n      \"value\" : 2000\n    }, {\n      \"key\" : \"limits.memory\",\n      \"value\" : 10000\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshtenant.v3.hal+json" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"aws.aws-meshstack-dev\",\n    \"deletedOn\" : \"2024-11-07T13:36:29.657329297Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"8c2d3c5e-b543-46d0-a4fc-1e966df246b5\",\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ {\n      \"key\" : \"limits.cpu\",\n      \"value\" : 2000\n    }, {\n      \"key\" : \"limits.memory\",\n      \"value\" : 10000\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.aws.aws-meshstack-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=aws.aws-meshstack-dev\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshTenantV3"
@@ -1488,12 +1606,12 @@
     "/api/meshobjects/meshusers/john-doe" : {
       "get" : {
         "tags" : [ "api" ],
-        "operationId" : "meshUserV2",
-        "produces" : [ "application/vnd.meshcloud.api.meshuser.v2.hal+json", "application/vnd.meshcloud.api.meshuser.v1.hal+json" ],
+        "operationId" : "meshUserV1",
+        "produces" : [ "application/vnd.meshcloud.api.meshuser.v1.hal+json", "application/vnd.meshcloud.api.meshuser.v2.hal+json" ],
         "parameters" : [ {
           "name" : "Accept",
           "in" : "header",
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future.",
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future.",
           "required" : true,
           "type" : "string"
         } ],
@@ -1501,10 +1619,10 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshuser.v2.hal+json" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"c12973b1-fd64-4d65-a374-c63c51d4de58\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshuser.v1.hal+json" : "{\n  \"kind\" : \"meshUser\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"c0a1ef9c-871c-475c-a6a3-b48eaa11d181\",\n    \"tags\" : {\n      \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n    }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n    }\n  }\n}"
             },
             "schema" : {
-              "$ref" : "#/definitions/meshUserV2"
+              "$ref" : "#/definitions/meshUserV1"
             }
           }
         },
@@ -1580,7 +1698,7 @@
           "name" : "",
           "required" : false,
           "schema" : {
-            "$ref" : "#/definitions/api_meshobjects_meshworkspacebindings_userbindings458029101"
+            "$ref" : "#/definitions/api_meshobjects_meshworkspacebindings_userbindings-271333023"
           },
           "x-examples" : {
             "application/vnd.meshcloud.api.meshworkspaceuserbinding.v2.hal+json;charset=UTF-8" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  "
@@ -1618,7 +1736,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshworkspace.v1.hal+json" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-10-30T17:48:13Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"admin-customer\",\n    \"tags\" : { }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshworkspace.v1.hal+json" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-11-06T13:34:59Z\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"admin-customer\",\n    \"tags\" : { }\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces/admin-customer\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=admin-customer\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=admin-customer\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=admin-customer\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=admin-customer\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?workspaceIdentifier=admin-customer\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshWorkspace"
@@ -1658,7 +1776,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshbuildingblocks/9283fb1b-1f7b-4ce6-b104-88996e45939f/purge" : {
+    "/api/meshobjects/meshbuildingblocks/1c10ffc2-f17a-4712-a434-dc619bdb0b0b/purge" : {
       "delete" : {
         "tags" : [ "api" ],
         "operationId" : "meshBuildingBlockForcePurge",
@@ -1673,7 +1791,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392" : {
+    "/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectGroupBindingV3",
@@ -1689,7 +1807,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"e8909b8b-0f10-4a0b-929b-f3d821116392\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/e8909b8b-0f10-4a0b-929b-f3d821116392\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/7632f4c6-306b-4de6-9e31-aa0cb97977d2\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectGroupBindingV3"
@@ -1714,7 +1832,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1" : {
+    "/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectUserBindingV3",
@@ -1730,7 +1848,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/9e090118-a1ff-4a6c-b9be-02d0135beea1\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project User\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username1\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/ead42687-70f3-45a2-ba5e-4fb89f6e8a05\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectUserBindingV3"
@@ -1873,6 +1991,9 @@
     }
   },
   "definitions" : {
+    "api_meshobjects_meshtagdefinitions-1417749508" : {
+      "example" : "{\n  \"apiVersion\": \"v1\",\n  \"kind\": \"meshTagDefinition\",\n  \"metadata\": {\n    \"name\": \"meshProject.environment\"\n  },\n  \"spec\": {\n    \"targetKind\": \"meshProject\",\n    \"key\": \"environment\",\n    \"valueType\": {\n      \"singleSelect\": {\n        \"options\": [ \"dev\", \"test\", \"qa\", \"production\" ],\n        \"defaultValue\": \"dev\"\n      }\n    },\n    \"description\": \"The environment the project runs in.\",\n    \"displayName\": \"Environment\",\n    \"sortOrder\": 9999,\n    \"mandatory\": true,\n    \"immutable\": false,\n    \"restricted\": false\n  }\n}"
+    },
     "meshProjectUserBindingV3" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "metadata" ],
@@ -1941,67 +2062,6 @@
         }
       }
     },
-    "api_meshobjects_meshserviceinstances_serviceInstanceId-730024705" : {
-      "type" : "object",
-      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
-      "properties" : {
-        "metadata" : {
-          "type" : "object",
-          "description" : "Metadata and more fields to identify the Service Instance.",
-          "properties" : {
-            "ownedByProject" : {
-              "type" : "string",
-              "description" : "The project that this Service Instance belongs to."
-            },
-            "marketplaceIdentifier" : {
-              "type" : "string",
-              "description" : "The identifier of the marketplace that this Service Instance belongs to."
-            },
-            "instanceId" : {
-              "type" : "string",
-              "description" : "The instance id this Service Instance should use."
-            },
-            "ownedByWorkspace" : {
-              "type" : "string",
-              "description" : "The workspace that this Service Instance belongs to."
-            }
-          },
-          "required" : [ "instanceId", "marketplaceIdentifier", "ownedByProject", "ownedByWorkspace" ]
-        },
-        "apiVersion" : {
-          "type" : "string",
-          "description" : "Version of Service Instance datatype. Matches the version part provided within the `Accept` request header."
-        },
-        "kind" : {
-          "type" : "string",
-          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshBuildingBlock' for this endpoint."
-        },
-        "spec" : {
-          "type" : "object",
-          "description" : "Specifications for the Service Instance.",
-          "properties" : {
-            "creator" : {
-              "type" : "string",
-              "description" : "The creator's username that creates this Service Instance"
-            },
-            "displayName" : {
-              "type" : "string",
-              "description" : "The display name of the Service Instance."
-            },
-            "planId" : {
-              "type" : "string",
-              "description" : "The id of the plan for this Service Instance"
-            },
-            "serviceId" : {
-              "type" : "string",
-              "description" : "The id of the service for the Service Instance"
-            }
-          },
-          "required" : [ "creator", "displayName", "planId", "serviceId" ]
-        }
-      },
-      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
-    },
     "meshTenantV3" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
@@ -2073,52 +2133,111 @@
         }
       }
     },
-    "meshProjectGroupBindingListV3" : {
+    "api_meshobjects_meshprojectbindings_groupbindings128211873" : {
       "type" : "object",
-      "required" : [ "_links", "page" ],
+      "required" : [ "apiVersion", "kind" ],
       "properties" : {
-        "_links" : {
+        "targetRef" : {
           "type" : "object",
-          "description" : "Currently only contains the self link and <<paging,pagination>> links.",
-          "properties" : { }
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The identifier of the project the group should get assigned to."
+            },
+            "ownedByWorkspace" : {
+              "type" : "string",
+              "description" : "The identifier of the workspace which contains the project."
+            }
+          },
+          "required" : [ "name", "ownedByWorkspace" ]
         },
-        "_embedded" : {
+        "metadata" : {
           "type" : "object",
           "properties" : {
-            "meshProjectGroupBindings" : {
-              "type" : "array",
-              "description" : "List of meshProjectGroupBindings.",
-              "items" : {
-                "type" : "object",
-                "properties" : {
-                  "targetRef" : {
-                    "type" : "object",
-                    "properties" : {
-                      "name" : {
-                        "type" : "string",
-                        "description" : "The identifier of the project the group is assigned to."
-                      },
-                      "ownedByWorkspace" : {
-                        "type" : "string",
-                        "description" : "The identifier of the workspace which contains the project."
-                      }
-                    },
-                    "required" : [ "name", "ownedByWorkspace" ]
-                  },
-                  "subject" : {
-                    "type" : "object",
-                    "properties" : {
-                      "name" : {
-                        "type" : "string",
-                        "description" : "The identifier of this user group."
-                      }
-                    },
-                    "required" : [ "name" ]
-                  },
-                  "roleRef" : {
-                    "type" : "object",
-                    "properties" : {
-                      "name" : {
+            "name" : {
+              "type" : "string",
+              "description" : "Name of this binding which later can be used to refer to it. It must be globally unique."
+            }
+          },
+          "required" : [ "name" ]
+        },
+        "apiVersion" : {
+          "type" : "string",
+          "description" : "Version of this object"
+        },
+        "kind" : {
+          "type" : "string",
+          "description" : "Type of the returned meshObject"
+        },
+        "subject" : {
+          "type" : "object",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The identifier of the referenced group."
+            }
+          },
+          "required" : [ "name" ]
+        },
+        "roleRef" : {
+          "type" : "object",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The name of the referenced role for this group."
+            }
+          },
+          "required" : [ "name" ]
+        }
+      },
+      "example" : "{\n  \"apiVersion\": \"v3\",\n  \"kind\": \"meshProjectGroupBinding\",\n  \"metadata\": {\n    \"name\": \"group-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-project-1\",\n    \"ownedByWorkspace\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Project Reader\" },\n  \"subject\": {\n    \"name\" : \"testgroup\"\n  }\n}  "
+    },
+    "meshProjectGroupBindingListV3" : {
+      "type" : "object",
+      "required" : [ "_links", "page" ],
+      "properties" : {
+        "_links" : {
+          "type" : "object",
+          "description" : "Currently only contains the self link and <<paging,pagination>> links.",
+          "properties" : { }
+        },
+        "_embedded" : {
+          "type" : "object",
+          "properties" : {
+            "meshProjectGroupBindings" : {
+              "type" : "array",
+              "description" : "List of meshProjectGroupBindings.",
+              "items" : {
+                "type" : "object",
+                "properties" : {
+                  "targetRef" : {
+                    "type" : "object",
+                    "properties" : {
+                      "name" : {
+                        "type" : "string",
+                        "description" : "The identifier of the project the group is assigned to."
+                      },
+                      "ownedByWorkspace" : {
+                        "type" : "string",
+                        "description" : "The identifier of the workspace which contains the project."
+                      }
+                    },
+                    "required" : [ "name", "ownedByWorkspace" ]
+                  },
+                  "subject" : {
+                    "type" : "object",
+                    "properties" : {
+                      "name" : {
+                        "type" : "string",
+                        "description" : "The identifier of this user group."
+                      }
+                    },
+                    "required" : [ "name" ]
+                  },
+                  "roleRef" : {
+                    "type" : "object",
+                    "properties" : {
+                      "name" : {
                         "type" : "string",
                         "description" : "The name of the referenced role for this group."
                       }
@@ -2435,34 +2554,6 @@
       },
       "example" : "{\n    \"apiVersion\": \"v3\",\n    \"kind\": \"meshTenant\",\n    \"metadata\": {\n      \"ownedByProject\": \"test-project\",\n      \"ownedByWorkspace\": \"test-workspace\",\n      \"platformIdentifier\": \"azure.meshcloud-azure-dev\"\n    },  \n    \"spec\": {\n      \"landingZoneIdentifier\": \"stage-dev\"\n    }\n  }    \n} "
     },
-    "meshBuildingBlockList" : {
-      "type" : "object",
-      "required" : [ "_embedded", "_links", "page" ],
-      "properties" : {
-        "_links" : {
-          "type" : "object",
-          "description" : "Contains the self link, a link to the related tenant and <<paging,pagination>> links.",
-          "properties" : { }
-        },
-        "_embedded" : {
-          "type" : "object",
-          "description" : "Contains the actual content of the paged response.",
-          "properties" : {
-            "meshBuildingBlocks" : {
-              "type" : "array",
-              "description" : "List of <<mesh_buildingblock_response_fields,meshBuildingBlocks>>.",
-              "items" : { }
-            }
-          },
-          "required" : [ "meshBuildingBlocks" ]
-        },
-        "page" : {
-          "type" : "object",
-          "description" : "See <<paging,Paging information>>.",
-          "properties" : { }
-        }
-      }
-    },
     "meshTagDefinition" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
@@ -2623,6 +2714,34 @@
         }
       }
     },
+    "meshBuildingBlockList" : {
+      "type" : "object",
+      "required" : [ "_embedded", "_links", "page" ],
+      "properties" : {
+        "_links" : {
+          "type" : "object",
+          "description" : "Contains the self link, a link to the related tenant and <<paging,pagination>> links.",
+          "properties" : { }
+        },
+        "_embedded" : {
+          "type" : "object",
+          "description" : "Contains the actual content of the paged response.",
+          "properties" : {
+            "meshBuildingBlocks" : {
+              "type" : "array",
+              "description" : "List of <<mesh_buildingblock_response_fields,meshBuildingBlocks>>.",
+              "items" : { }
+            }
+          },
+          "required" : [ "meshBuildingBlocks" ]
+        },
+        "page" : {
+          "type" : "object",
+          "description" : "See <<paging,Paging information>>.",
+          "properties" : { }
+        }
+      }
+    },
     "meshBuildingBlockRunCreate" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "spec", "status" ],
@@ -2870,36 +2989,32 @@
         }
       }
     },
-    "api_meshobjects_meshserviceinstances-1094762204" : {
+    "api_meshobjects_meshbuildingblocks-740594240" : {
       "type" : "object",
       "required" : [ "apiVersion", "kind", "metadata", "spec" ],
       "properties" : {
         "metadata" : {
           "type" : "object",
-          "description" : "Metadata and more fields to identify the Service Instance.",
+          "description" : "Fixed fields that help identify the Building Block.",
           "properties" : {
-            "ownedByProject" : {
-              "type" : "string",
-              "description" : "The project that this Service Instance belongs to."
-            },
-            "marketplaceIdentifier" : {
-              "type" : "string",
-              "description" : "The identifier of the marketplace that this Service Instance belongs to."
+            "definitionVersion" : {
+              "type" : "number",
+              "description" : "The version number of the Building Block Definition this Building Block is based on."
             },
-            "instanceId" : {
+            "definitionUuid" : {
               "type" : "string",
-              "description" : "The instance id this Service Instance should use."
+              "description" : "The UUID of the Building Block Definition this Building Block is based on."
             },
-            "ownedByWorkspace" : {
+            "tenantIdentifier" : {
               "type" : "string",
-              "description" : "The workspace that this Service Instance belongs to."
+              "description" : "The full identifier of the tenant, this Building Block is created in."
             }
           },
-          "required" : [ "instanceId", "marketplaceIdentifier", "ownedByProject", "ownedByWorkspace" ]
+          "required" : [ "definitionUuid", "definitionVersion", "tenantIdentifier" ]
         },
         "apiVersion" : {
           "type" : "string",
-          "description" : "Version of Service Instance datatype. Matches the version part provided within the `Accept` request header."
+          "description" : "Version of Building Block datatype. Matches the version part provided within the `Accept` request header."
         },
         "kind" : {
           "type" : "string",
@@ -2907,29 +3022,57 @@
         },
         "spec" : {
           "type" : "object",
-          "description" : "Specifications for the Service Instance.",
+          "description" : "All fields in this section describe the Building Block.",
           "properties" : {
-            "creator" : {
-              "type" : "string",
-              "description" : "The creator's username that creates this Service Instance"
-            },
-            "displayName" : {
-              "type" : "string",
-              "description" : "The display name of the Service Instance."
+            "parentBuildingBlocks" : {
+              "type" : "array",
+              "description" : "List of parent building blocks, which are required for the Building Block. If none given, an empty list needs to be provided.",
+              "items" : {
+                "type" : "object",
+                "properties" : {
+                  "buildingBlockUuid" : {
+                    "type" : "string",
+                    "description" : "The UUID of the parent Building Block."
+                  },
+                  "definitionUuid" : {
+                    "type" : "string",
+                    "description" : "The UUID of the Building Block Definition of the parent Building Block."
+                  }
+                },
+                "required" : [ "buildingBlockUuid", "definitionUuid" ]
+              }
             },
-            "planId" : {
-              "type" : "string",
-              "description" : "The id of the plan for this Service Instance"
+            "inputs" : {
+              "type" : "array",
+              "description" : "List of inputs, which are set on the Building Block.",
+              "items" : {
+                "type" : "object",
+                "properties" : {
+                  "valueType" : {
+                    "type" : "string",
+                    "description" : "The data type of the value. One of STRING, INTEGER, BOOLEAN, FILE, LIST, SINGLE_SELECT, OBJECT."
+                  },
+                  "value" : {
+                    "type" : "string",
+                    "description" : "The value, which is set on this input."
+                  },
+                  "key" : {
+                    "type" : "string",
+                    "description" : "The key of the input as set on the related Building Block Definition."
+                  }
+                },
+                "required" : [ "key", "value", "valueType" ]
+              }
             },
-            "serviceId" : {
+            "displayName" : {
               "type" : "string",
-              "description" : "The id of the service for the Service Instance"
+              "description" : "The display name of the Building Block as it is shown in meshPanel."
             }
           },
-          "required" : [ "creator", "displayName", "planId", "serviceId" ]
+          "required" : [ "displayName", "inputs", "parentBuildingBlocks" ]
         }
       },
-      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"rpbo6smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"rpbo6mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"rpbo6mtdg25\",\n    \"planId\" : \"rpbo6mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
+      "example" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"8d71f49c-1792-4604-825f-7805dd41f8d4\"\n    }]\n  }\n} "
     },
     "api_meshobjects_meshprojectbindings_userbindings-730421910" : {
       "type" : "object",
@@ -2990,6 +3133,20 @@
       },
       "example" : "{\n  \"apiVersion\": \"v3\",\n  \"kind\": \"meshProjectUserBinding\",\n  \"metadata\": {\n    \"name\": \"user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-project-1\",\n    \"ownedByWorkspace\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Project Reader\" },\n  \"subject\": {\n    \"name\" : \"username3\"\n  }\n}  "
     },
+    "meshObjectsRootV2" : {
+      "type" : "object",
+      "required" : [ "_links" ],
+      "properties" : {
+        "_links" : {
+          "type" : "object",
+          "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user.",
+          "properties" : { }
+        }
+      }
+    },
+    "api_meshobjects_meshtagdefinitions_name5593675" : {
+      "example" : "{\n  \"kind\" : \"meshTagDefinition\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"meshWorkspace.costCenter\"\n  },\n  \"spec\" : {\n    \"targetKind\" : \"meshWorkspace\",\n    \"key\" : \"costCenter\",\n    \"valueType\" : {\n      \"string\" : {\n        \"defaultValue\" : \"1001\",\n        \"validationRegex\" : \"^\\\\d{4}$\"\n      },\n      \"email\" : null,\n      \"integer\" : null,\n      \"number\" : null,\n      \"singleSelect\" : null,\n      \"multiSelect\" : null\n    },\n    \"description\" : \"Updated description\",\n    \"displayName\" : \"Updated display name\",\n    \"sortOrder\" : 9999,\n    \"mandatory\" : true,\n    \"immutable\" : false,\n    \"restricted\" : false,\n    \"replicationKey\" : \"updatedReplicationKey\"\n  }\n}"
+    },
     "meshWorkspaceUserBindingList" : {
       "type" : "object",
       "required" : [ "_links", "page" ],
@@ -3147,26 +3304,54 @@
         }
       }
     },
-    "meshPaymentMethodV2" : {
+    "meshUserListV1" : {
       "type" : "object",
-      "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
+      "required" : [ "_embedded", "_links", "page" ],
       "properties" : {
-        "metadata" : {
+        "_links" : {
           "type" : "object",
-          "description" : "Always contains the 'name' and (optional) 'ownedByWorkspace' to uniquely identify the meshPaymentMethod.",
+          "description" : "Currently only contains the self link and <<paging,pagination>> links.",
+          "properties" : { }
+        },
+        "_embedded" : {
+          "type" : "object",
+          "description" : "Contains the actual content of the paged response.",
           "properties" : {
-            "name" : {
-              "type" : "string",
-              "description" : "The paymentMethodIdentifier as 'name'."
-            },
-            "ownedByWorkspace" : {
-              "type" : "string",
-              "description" : "The workspaceIdentifier as 'ownedByWorkspace'."
+            "meshUsers" : {
+              "type" : "array",
+              "description" : "List of <<mesh_user_response_fields,meshUser>>.",
+              "items" : { }
             }
           },
-          "required" : [ "name" ]
+          "required" : [ "meshUsers" ]
         },
-        "apiVersion" : {
+        "page" : {
+          "type" : "object",
+          "description" : "See <<paging,Paging information>>.",
+          "properties" : { }
+        }
+      }
+    },
+    "meshPaymentMethodV2" : {
+      "type" : "object",
+      "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
+      "properties" : {
+        "metadata" : {
+          "type" : "object",
+          "description" : "Always contains the 'name' and (optional) 'ownedByWorkspace' to uniquely identify the meshPaymentMethod.",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The paymentMethodIdentifier as 'name'."
+            },
+            "ownedByWorkspace" : {
+              "type" : "string",
+              "description" : "The workspaceIdentifier as 'ownedByWorkspace'."
+            }
+          },
+          "required" : [ "name" ]
+        },
+        "apiVersion" : {
           "type" : "string",
           "description" : "Version of meshPaymentMethod datatype. Matches the version part provided within the `Accept` request header."
         },
@@ -3233,62 +3418,124 @@
         }
       }
     },
-    "api_meshobjects_meshprojects1522872298" : {
+    "api_meshobjects_meshworkspacebindings_userbindings-271333023" : {
       "type" : "object",
-      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
+      "required" : [ "apiVersion", "kind" ],
       "properties" : {
+        "targetRef" : {
+          "type" : "object",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The identifier of the workspace the user should get assigned to."
+            }
+          },
+          "required" : [ "name" ]
+        },
         "metadata" : {
           "type" : "object",
-          "description" : "Fixed fields that help to identify the meshProject.",
           "properties" : {
             "name" : {
               "type" : "string",
-              "description" : "The identifier that should be unique within a workspace"
+              "description" : "Name of this binding which later can be used to refer to it. It must be globally unique."
+            }
+          },
+          "required" : [ "name" ]
+        },
+        "apiVersion" : {
+          "type" : "string",
+          "description" : "Version of this object"
+        },
+        "kind" : {
+          "type" : "string",
+          "description" : "Type of the returned meshObject"
+        },
+        "subject" : {
+          "type" : "object",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The username of the referenced user."
+            }
+          },
+          "required" : [ "name" ]
+        },
+        "roleRef" : {
+          "type" : "object",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The name of the referenced role for this user."
+            }
+          },
+          "required" : [ "name" ]
+        }
+      },
+      "example" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  "
+    },
+    "api_meshobjects2145858653" : {
+      "example" : "[\n  {\n    \"apiVersion\": \"v1\",\n    \"kind\": \"meshUser\",\n    \"metadata\": {\n      \"name\": \"test-user\"\n    },\n    \"spec\": {\n      \"email\": \"test1-user@meshcloud.io\",\n      \"firstName\": \"test-user-first-name\",\n      \"lastName\": \"test-user-last-name\",\n      \"euid\": \"test-euid\"\n    }\n  },\n  {\n    \"apiVersion\": \"v1\",\n    \"kind\": \"meshWorkspace\",\n    \"metadata\": {\n      \"name\": \"test-workspace\"\n    },\n    \"spec\": {\n      \"displayName\": \"test-display-name\",            \n      \"tags\": {\n        \"environment\": [\n          \"dev\",\n          \"qa\",\n          \"prod\"\n        ],\n        \"anotherTag\": [\n          \"myValue\"\n        ]\n      }\n    }\n  }\n]"
+    },
+    "api_meshobjects_meshserviceinstances_serviceInstanceId-1550263005" : {
+      "type" : "object",
+      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
+      "properties" : {
+        "metadata" : {
+          "type" : "object",
+          "description" : "Metadata and more fields to identify the Service Instance.",
+          "properties" : {
+            "ownedByProject" : {
+              "type" : "string",
+              "description" : "The project that this Service Instance belongs to."
+            },
+            "marketplaceIdentifier" : {
+              "type" : "string",
+              "description" : "The identifier of the marketplace that this Service Instance belongs to."
+            },
+            "instanceId" : {
+              "type" : "string",
+              "description" : "The instance id this Service Instance should use."
             },
             "ownedByWorkspace" : {
               "type" : "string",
-              "description" : "The identifier of the workspace that the project should belong to."
+              "description" : "The workspace that this Service Instance belongs to."
             }
           },
-          "required" : [ "name", "ownedByWorkspace" ]
+          "required" : [ "instanceId", "marketplaceIdentifier", "ownedByProject", "ownedByWorkspace" ]
         },
         "apiVersion" : {
           "type" : "string",
-          "description" : "Version of meshProject datatype. Matches the version part provided within the `Accept` request header."
+          "description" : "Version of Service Instance datatype. Matches the version part provided within the `Accept` request header."
         },
         "kind" : {
           "type" : "string",
-          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshProject' for this endpoint."
+          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshBuildingBlock' for this endpoint."
         },
         "spec" : {
           "type" : "object",
-          "description" : "All fields in this section describe the project.",
+          "description" : "Specifications for the Service Instance.",
           "properties" : {
-            "substitutePaymentMethodIdentifier" : {
+            "creator" : {
               "type" : "string",
-              "description" : "The substitute payment method of the project."
+              "description" : "The creator's username that creates this Service Instance"
             },
-            "paymentMethodIdentifier" : {
+            "displayName" : {
               "type" : "string",
-              "description" : "The payment method of the project."
+              "description" : "The display name of the Service Instance."
             },
-            "displayName" : {
+            "planId" : {
               "type" : "string",
-              "description" : "The display name of the project as it is shown in meshPanel."
+              "description" : "The id of the plan for this Service Instance"
             },
-            "tags" : {
-              "type" : "object",
-              "description" : "Key/Value pairs of tags set on the project. Keep in mind, that values are an array. Also see our general section about <<tags>>",
-              "properties" : { }
+            "serviceId" : {
+              "type" : "string",
+              "description" : "The id of the service for the Service Instance"
             }
           },
-          "required" : [ "displayName", "tags" ]
+          "required" : [ "creator", "displayName", "planId", "serviceId" ]
         }
       },
-      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"rpbo6mpdsv2\"\n  }\n}"
-    },
-    "api_meshobjects2145858653" : {
-      "example" : "[\n  {\n    \"apiVersion\": \"v1\",\n    \"kind\": \"meshUser\",\n    \"metadata\": {\n      \"name\": \"test-user\"\n    },\n    \"spec\": {\n      \"email\": \"test1-user@meshcloud.io\",\n      \"firstName\": \"test-user-first-name\",\n      \"lastName\": \"test-user-last-name\",\n      \"euid\": \"test-euid\"\n    }\n  },\n  {\n    \"apiVersion\": \"v1\",\n    \"kind\": \"meshWorkspace\",\n    \"metadata\": {\n      \"name\": \"test-workspace\"\n    },\n    \"spec\": {\n      \"displayName\": \"test-display-name\",            \n      \"tags\": {\n        \"environment\": [\n          \"dev\",\n          \"qa\",\n          \"prod\"\n        ],\n        \"anotherTag\": [\n          \"myValue\"\n        ]\n      }\n    }\n  }\n]"
+      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
     },
     "api_meshobjects_meshbuildingblockruns_b3116611-e08b-4b00-91c5-10365b25a6ef_status_source1178004746" : {
       "type" : "object",
@@ -3501,91 +3748,6 @@
         }
       }
     },
-    "api_meshobjects_meshbuildingblocks-1350814146" : {
-      "type" : "object",
-      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
-      "properties" : {
-        "metadata" : {
-          "type" : "object",
-          "description" : "Fixed fields that help identify the Building Block.",
-          "properties" : {
-            "definitionVersion" : {
-              "type" : "number",
-              "description" : "The version number of the Building Block Definition this Building Block is based on."
-            },
-            "definitionUuid" : {
-              "type" : "string",
-              "description" : "The UUID of the Building Block Definition this Building Block is based on."
-            },
-            "tenantIdentifier" : {
-              "type" : "string",
-              "description" : "The full identifier of the tenant, this Building Block is created in."
-            }
-          },
-          "required" : [ "definitionUuid", "definitionVersion", "tenantIdentifier" ]
-        },
-        "apiVersion" : {
-          "type" : "string",
-          "description" : "Version of Building Block datatype. Matches the version part provided within the `Accept` request header."
-        },
-        "kind" : {
-          "type" : "string",
-          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshBuildingBlock' for this endpoint."
-        },
-        "spec" : {
-          "type" : "object",
-          "description" : "All fields in this section describe the Building Block.",
-          "properties" : {
-            "parentBuildingBlocks" : {
-              "type" : "array",
-              "description" : "List of parent building blocks, which are required for the Building Block. If none given, an empty list needs to be provided.",
-              "items" : {
-                "type" : "object",
-                "properties" : {
-                  "buildingBlockUuid" : {
-                    "type" : "string",
-                    "description" : "The UUID of the parent Building Block."
-                  },
-                  "definitionUuid" : {
-                    "type" : "string",
-                    "description" : "The UUID of the Building Block Definition of the parent Building Block."
-                  }
-                },
-                "required" : [ "buildingBlockUuid", "definitionUuid" ]
-              }
-            },
-            "inputs" : {
-              "type" : "array",
-              "description" : "List of inputs, which are set on the Building Block.",
-              "items" : {
-                "type" : "object",
-                "properties" : {
-                  "valueType" : {
-                    "type" : "string",
-                    "description" : "The data type of the value. One of STRING, INTEGER, BOOLEAN, FILE, LIST, SINGLE_SELECT, OBJECT."
-                  },
-                  "value" : {
-                    "type" : "string",
-                    "description" : "The value, which is set on this input."
-                  },
-                  "key" : {
-                    "type" : "string",
-                    "description" : "The key of the input as set on the related Building Block Definition."
-                  }
-                },
-                "required" : [ "key", "value", "valueType" ]
-              }
-            },
-            "displayName" : {
-              "type" : "string",
-              "description" : "The display name of the Building Block as it is shown in meshPanel."
-            }
-          },
-          "required" : [ "displayName", "inputs", "parentBuildingBlocks" ]
-        }
-      },
-      "example" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"definitionUuid\" : \"ef6aaf87-3f8c-477c-94f4-f3cf509728ca\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New BuildingBlock\",\n    \"inputs\" : [{\n      \"key\": \"resourceName\",\n      \"value\": \"buildingBlock-for-docs\",\n      \"valueType\": \"STRING\"\n    }],\n    \"parentBuildingBlocks\" : [{\n      \"definitionUuid\": \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"buildingBlockUuid\": \"29e993e4-e121-4917-8a1c-7878354742a4\"\n    }]\n  }\n} "
-    },
     "meshBuildingBlock" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "metadata", "spec", "status" ],
@@ -3855,10 +4017,7 @@
         }
       }
     },
-    "api_login-371819773" : {
-      "example" : "client_id=8a616394-98ad-4541-a0e9-e280f5d92249&client_secret=abcdefghijklmnopqrstuvwxyz0123456789&grant_type=client_credentials"
-    },
-    "meshServiceInstancePost" : {
+    "api_meshobjects_meshserviceinstances-1853629624" : {
       "type" : "object",
       "required" : [ "apiVersion", "kind", "metadata", "spec" ],
       "properties" : {
@@ -3916,63 +4075,69 @@
           },
           "required" : [ "creator", "displayName", "planId", "serviceId" ]
         }
-      }
+      },
+      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"3s6f2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"3s6f2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"3s6f2mtdg25\",\n    \"planId\" : \"3s6f2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
     },
-    "meshUserV2" : {
+    "api_login-371819773" : {
+      "example" : "client_id=8a616394-98ad-4541-a0e9-e280f5d92249&client_secret=abcdefghijklmnopqrstuvwxyz0123456789&grant_type=client_credentials"
+    },
+    "meshServiceInstancePost" : {
       "type" : "object",
-      "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
+      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
       "properties" : {
         "metadata" : {
           "type" : "object",
-          "description" : "Always contains the 'name' to uniquely identify the meshUser.",
+          "description" : "Metadata and more fields to identify the Service Instance.",
           "properties" : {
-            "name" : {
+            "ownedByProject" : {
               "type" : "string",
-              "description" : "The userIdentifier as 'name' to uniquely identify the meshUser."
+              "description" : "The project that this Service Instance belongs to."
+            },
+            "marketplaceIdentifier" : {
+              "type" : "string",
+              "description" : "The identifier of the marketplace that this Service Instance belongs to."
+            },
+            "instanceId" : {
+              "type" : "string",
+              "description" : "The instance id this Service Instance should use."
+            },
+            "ownedByWorkspace" : {
+              "type" : "string",
+              "description" : "The workspace that this Service Instance belongs to."
             }
           },
-          "required" : [ "name" ]
+          "required" : [ "instanceId", "marketplaceIdentifier", "ownedByProject", "ownedByWorkspace" ]
         },
         "apiVersion" : {
           "type" : "string",
-          "description" : "Version of meshUser datatype. Matches the version part provided within the `Accept` request header."
-        },
-        "_links" : {
-          "type" : "object",
-          "description" : "Available <<mesh_user_links,links>> on a meshUser.",
-          "properties" : { }
+          "description" : "Version of Service Instance datatype. Matches the version part provided within the `Accept` request header."
         },
         "kind" : {
           "type" : "string",
-          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshUser' for this endpoint."
+          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshBuildingBlock' for this endpoint."
         },
         "spec" : {
           "type" : "object",
-          "description" : "All fields in this section describe the meshUser.",
+          "description" : "Specifications for the Service Instance.",
           "properties" : {
-            "lastName" : {
+            "creator" : {
               "type" : "string",
-              "description" : "The lastname of the meshUser."
+              "description" : "The creator's username that creates this Service Instance"
             },
-            "firstName" : {
+            "displayName" : {
               "type" : "string",
-              "description" : "The firstname of the meshUser."
+              "description" : "The display name of the Service Instance."
             },
-            "euid" : {
+            "planId" : {
               "type" : "string",
-              "description" : "External User ID which is used to lookup the user in the cloud platforms."
+              "description" : "The id of the plan for this Service Instance"
             },
-            "email" : {
+            "serviceId" : {
               "type" : "string",
-              "description" : "The email of the meshUser."
-            },
-            "tags" : {
-              "type" : "object",
-              "description" : "Key/Value pairs of tags set on the meshUser. Keep in mind, that values are an array. Also see our general section about <<tags>>",
-              "properties" : { }
+              "description" : "The id of the service for the Service Instance"
             }
           },
-          "required" : [ "email", "euid", "firstName", "lastName", "tags" ]
+          "required" : [ "creator", "displayName", "planId", "serviceId" ]
         }
       }
     },
@@ -4132,60 +4297,59 @@
         }
       }
     },
-    "api_meshobjects_meshworkspacebindings_userbindings458029101" : {
+    "api_meshobjects_meshprojects101958771" : {
       "type" : "object",
-      "required" : [ "apiVersion", "kind" ],
+      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
       "properties" : {
-        "targetRef" : {
-          "type" : "object",
-          "properties" : {
-            "name" : {
-              "type" : "string",
-              "description" : "The identifier of the workspace the user should get assigned to."
-            }
-          },
-          "required" : [ "name" ]
-        },
         "metadata" : {
           "type" : "object",
+          "description" : "Fixed fields that help to identify the meshProject.",
           "properties" : {
             "name" : {
               "type" : "string",
-              "description" : "Name of this binding which later can be used to refer to it"
+              "description" : "The identifier that should be unique within a workspace"
+            },
+            "ownedByWorkspace" : {
+              "type" : "string",
+              "description" : "The identifier of the workspace that the project should belong to."
             }
           },
-          "required" : [ "name" ]
+          "required" : [ "name", "ownedByWorkspace" ]
         },
         "apiVersion" : {
           "type" : "string",
-          "description" : "Version of this object"
+          "description" : "Version of meshProject datatype. Matches the version part provided within the `Accept` request header."
         },
         "kind" : {
           "type" : "string",
-          "description" : "Type of the returned meshObject"
+          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshProject' for this endpoint."
         },
-        "subject" : {
+        "spec" : {
           "type" : "object",
+          "description" : "All fields in this section describe the project.",
           "properties" : {
-            "name" : {
+            "substitutePaymentMethodIdentifier" : {
               "type" : "string",
-              "description" : "The username of the referenced user."
-            }
-          },
-          "required" : [ "name" ]
-        },
-        "roleRef" : {
-          "type" : "object",
-          "properties" : {
-            "name" : {
+              "description" : "The substitute payment method of the project."
+            },
+            "paymentMethodIdentifier" : {
               "type" : "string",
-              "description" : "The name of the referenced role for this user."
+              "description" : "The payment method of the project."
+            },
+            "displayName" : {
+              "type" : "string",
+              "description" : "The display name of the project as it is shown in meshPanel."
+            },
+            "tags" : {
+              "type" : "object",
+              "description" : "Key/Value pairs of tags set on the project. Keep in mind, that values are an array. Also see our general section about <<tags>>",
+              "properties" : { }
             }
           },
-          "required" : [ "name" ]
+          "required" : [ "displayName", "tags" ]
         }
       },
-      "example" : "{\n  \"apiVersion\": \"v2\",\n  \"kind\": \"meshWorkspaceUserBinding\",\n  \"metadata\": {\n    \"name\": \"another-user-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Workspace Member\" },\n  \"subject\": {\n    \"name\" : \"username1\"\n  }\n}  "
+      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"3s6f2mpdsv2\"\n  }\n}"
     },
     "meshTenantListV3" : {
       "type" : "object",
@@ -4297,31 +4461,61 @@
         }
       }
     },
-    "meshUserListV2" : {
+    "meshUserV1" : {
       "type" : "object",
-      "required" : [ "_embedded", "_links", "page" ],
+      "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
       "properties" : {
+        "metadata" : {
+          "type" : "object",
+          "description" : "Always contains the 'name' to uniquely identify the meshUser.",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The userIdentifier as 'name' to uniquely identify the meshUser."
+            }
+          },
+          "required" : [ "name" ]
+        },
+        "apiVersion" : {
+          "type" : "string",
+          "description" : "Version of meshUser datatype. Matches the version part provided within the `Accept` request header."
+        },
         "_links" : {
           "type" : "object",
-          "description" : "Currently only contains the self link and <<paging,pagination>> links.",
+          "description" : "Available <<mesh_user_links,links>> on a meshUser.",
           "properties" : { }
         },
-        "_embedded" : {
+        "kind" : {
+          "type" : "string",
+          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshUser' for this endpoint."
+        },
+        "spec" : {
           "type" : "object",
-          "description" : "Contains the actual content of the paged response.",
+          "description" : "All fields in this section describe the meshUser.",
           "properties" : {
-            "meshUsers" : {
-              "type" : "array",
-              "description" : "List of <<mesh_user_response_fields,meshUser>>.",
-              "items" : { }
+            "lastName" : {
+              "type" : "string",
+              "description" : "The lastname of the meshUser."
+            },
+            "firstName" : {
+              "type" : "string",
+              "description" : "The firstname of the meshUser."
+            },
+            "euid" : {
+              "type" : "string",
+              "description" : "External User ID which is used to lookup the user in the cloud platforms."
+            },
+            "email" : {
+              "type" : "string",
+              "description" : "The email of the meshUser."
+            },
+            "tags" : {
+              "type" : "object",
+              "description" : "Key/Value pairs of tags set on the meshUser. Keep in mind, that values are an array. Also see our general section about <<tags>>",
+              "properties" : { }
             }
           },
-          "required" : [ "meshUsers" ]
-        },
-        "page" : {
-          "type" : "object",
-          "description" : "See <<paging,Paging information>>.",
-          "properties" : { }
+          "required" : [ "email", "euid", "firstName", "lastName", "tags" ]
         }
       }
     },
@@ -4364,17 +4558,6 @@
         }
       }
     },
-    "meshObjectsRootV1" : {
-      "type" : "object",
-      "required" : [ "_links" ],
-      "properties" : {
-        "_links" : {
-          "type" : "object",
-          "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user.",
-          "properties" : { }
-        }
-      }
-    },
     "meshPaymentMethodListV2" : {
       "type" : "object",
       "required" : [ "_embedded", "_links", "page" ],
@@ -4403,65 +4586,6 @@
         }
       }
     },
-    "api_meshobjects_meshprojectbindings_groupbindings857573997" : {
-      "type" : "object",
-      "required" : [ "apiVersion", "kind" ],
-      "properties" : {
-        "targetRef" : {
-          "type" : "object",
-          "properties" : {
-            "name" : {
-              "type" : "string",
-              "description" : "The identifier of the project the group should get assigned to."
-            },
-            "ownedByWorkspace" : {
-              "type" : "string",
-              "description" : "The identifier of the workspace which contains the project."
-            }
-          },
-          "required" : [ "name", "ownedByWorkspace" ]
-        },
-        "metadata" : {
-          "type" : "object",
-          "properties" : {
-            "name" : {
-              "type" : "string",
-              "description" : "Name of this binding which later can be used to refer to it"
-            }
-          },
-          "required" : [ "name" ]
-        },
-        "apiVersion" : {
-          "type" : "string",
-          "description" : "Version of this object"
-        },
-        "kind" : {
-          "type" : "string",
-          "description" : "Type of the returned meshObject"
-        },
-        "subject" : {
-          "type" : "object",
-          "properties" : {
-            "name" : {
-              "type" : "string",
-              "description" : "The identifier of the referenced group."
-            }
-          },
-          "required" : [ "name" ]
-        },
-        "roleRef" : {
-          "type" : "object",
-          "properties" : {
-            "name" : {
-              "type" : "string",
-              "description" : "The name of the referenced role for this group."
-            }
-          },
-          "required" : [ "name" ]
-        }
-      },
-      "example" : "{\n  \"apiVersion\": \"v3\",\n  \"kind\": \"meshProjectGroupBinding\",\n  \"metadata\": {\n    \"name\": \"group-binding-name\"\n  },\n  \"targetRef\": {\n    \"name\": \"test-project-1\",\n    \"ownedByWorkspace\": \"test-workspace\"\n  },\n  \"roleRef\": { \"name\": \"Project Reader\" },\n  \"subject\": {\n    \"name\" : \"testgroup\"\n  }\n}  "
-    },
     "meshWorkspaceUserBindingCreate" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "metadata" ],
diff --git a/website/static/api/metadata.html b/website/static/api/metadata.html
index 237ca7a12..7241147b9 100644
--- a/website/static/api/metadata.html
+++ b/website/static/api/metadata.html
@@ -694,7 +694,7 @@ <h4 id="openstack_project_metadata">openStackProjectMetadata</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/technical_specification.html b/website/static/api/technical_specification.html
index 4a2d2be9c..744e3b047 100644
--- a/website/static/api/technical_specification.html
+++ b/website/static/api/technical_specification.html
@@ -635,7 +635,7 @@ <h3 id="versioning">Versioning</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-30 17:46:54 UTC
+Last updated 2024-11-06 13:33:16 UTC
 </div>
 </div>
 </body>

From 9f9db41154b61599e0b73c46c3aa8692dc58f88d Mon Sep 17 00:00:00 2001
From: GitHub Actions <github-actions@meshcloud.io>
Date: Wed, 6 Nov 2024 16:02:53 +0000
Subject: [PATCH 3/3] Added release notes and version entries for 2024.48.0

---
 website/blog/2024-11-06-Release-0.md | 98 ++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 website/blog/2024-11-06-Release-0.md

diff --git a/website/blog/2024-11-06-Release-0.md b/website/blog/2024-11-06-Release-0.md
new file mode 100644
index 000000000..46a8e8d18
--- /dev/null
+++ b/website/blog/2024-11-06-Release-0.md
@@ -0,0 +1,98 @@
+---
+author: meshcloud
+title: Release 2024.48.0
+---
+
+Release period: 2024-10-30 to 2024-11-06
+
+This release includes the following issues:
+* Extra details in API response on HTTP 401 error
+* Landing Zone creation for GitHub
+* Pipeline Trigger for GitHub Action Workflows
+* Filter on Status for Chargebacks and Usage Reports
+* Fix Chargeback Statements with Deleted Tenants
+* Event Logs for User Deletions
+* Exclude Costs from Unmanaged Tenants in Dashboards
+* Create, Update and Delete meshTagDefinition via API
+* Better response for meshObject user and group binding API
+<!--truncate-->
+
+## Ticket Details
+### Extra details in API response on HTTP 401 error
+**Audience:** User<br>
+
+#### Description
+This improves the HTTP 401 error message and now returns a proper error text.
+This fix also add a JSON content-type header for other API error 
+responses.
+
+### Landing Zone creation for GitHub
+**Audience:** User<br>
+
+#### Description
+We removed a bug where landing zone creation was not possible
+for all platforms of type 'GitHub'.
+
+### Pipeline Trigger for GitHub Action Workflows
+**Audience:** Customer, Partner<br>
+
+#### Description
+This functionality empowers platform engineers to provide seamless, easy-to-consume infrastructure automation for application teams. Platform engineers can now offer "Pipeline Building Blocks" that trigger GitHub Action Workflows when added to a tenant. These building block definitions can be published to the marketplace, enabling a smooth user experience for application teams to access and use existing automation without needing Git expertise. We will provide a guide shortly via the product documentation.
+
+### Filter on Status for Chargebacks and Usage Reports
+**Audience:** Customer, Partner<br>
+
+#### Description
+You can now filter chargeback statements and tenant usage reports by status (Open, Finalized, Updated) 
+using a dropdown filter and you can sort the list by the "Generated at" column to easily check for late bills.
+Please note that this improvement is available only if you???re on the new version of the chargeback process.
+
+#### How to use
+To check for all late bills from a previous period, set the "Generated at" column to descending 
+order to view the most recent changes at the top. Then, select "Updated" from the status dropdown and 
+choose the desired period from period column. This will allow you to easily identify any late bills for 
+the specified period.
+
+### Fix Chargeback Statements with Deleted Tenants
+**Audience:** Customer, Partner<br>
+
+#### Description
+In rare cases, chargeback statements were incomplete when some of their
+tenants were already deleted. This is fixed now. Please note that all
+chargeback statements will be re-generated after the deployment to fix the
+incorrect chargeback statements. This process may take a few minutes and
+during this process, chargeback statements will be incomplete.
+
+### Event Logs for User Deletions
+**Audience:** Partner<br>
+
+#### Description
+When a user is deleted from meshStack, this event is now logged in the Event
+Logs section of the Admin Area. To view these events, simply filter by
+selecting Type as "Deleted" and Event as "User".
+
+### Exclude Costs from Unmanaged Tenants in Dashboards
+**Audience:** Partner<br>
+
+#### Description
+With the recently introduced revamped chargeback process, the financials
+dashboard included costs both from tenants managed via meshStack and
+unmanaged tenants. This was changed back to the old behavior where the
+dashboards have shown only costs from managed tenants.
+
+### Create, Update and Delete meshTagDefinition via API
+**Audience:** Partner<br>
+
+#### Description
+Admins can now create, update and delete meshTagDefinitions via the meshObject API.
+Using the terraform provider for meshStack, this enables admins to manage more of their 
+meshStack's configuration as code.
+
+### Better response for meshObject user and group binding API
+**Audience:** User<br>
+
+#### Description
+The docs state that updates to the project user and group bindings are not possible, but the API
+only responded with an HTTP 500 error, regardless of what the exact underlying issue was.
+This has been improved and the error is now a proper HTTP 409 with a proper error message.
+