diff --git a/website/blog/2024-12-12-Release-0.md b/website/blog/2024-12-12-Release-0.md
new file mode 100644
index 000000000..f3911cc50
--- /dev/null
+++ b/website/blog/2024-12-12-Release-0.md
@@ -0,0 +1,115 @@
+---
+author: meshcloud
+title: Release 2024.55.0
+---
+
+Release period: 2024-12-09 to 2024-12-12
+
+This release includes the following issues:
+* Expiring API Key Reminder Notifications
+* Simplified Building Block Creation
+* Fix for Failing Azure Subscription Owner Removals
+* ABAC Support for Azure Role Assignments
+* Deactivate meshCustomer Endpoints
+* Enforce Versioned Accept Header for API
+* Access Overview For Tenant Movement
+* Display Email Instead of Username in Workspace Access Area
+* Search for Users in Workspace Access
+<!--truncate-->
+
+## Ticket Details
+### Expiring API Key Reminder Notifications
+**Audience:** User<br>
+
+#### Description
+As workspace owners or managers, you will now automatically receive reminders about expiring API keys. This ensures you can renew or replace them in time, avoiding disruptions to your applications.
+
+### Simplified Building Block Creation
+**Audience:** User<br>
+
+#### Description
+In the service management area, it is now possible to create building 
+blocks directly in the building block definition view. Simply select 
+an existing tenant and configure the building block.
+
+### Fix for Failing Azure Subscription Owner Removals
+**Audience:** Operator<br>
+
+#### Description
+In some environments the removal of the replicator principal from new Azure Subscriptions
+failed because of a bug in existing role detection. This has been fixed.
+
+### ABAC Support for Azure Role Assignments
+**Audience:** User<br>
+
+#### Description
+With this update, we enable the support for ABAC role assignments.
+This Azure functionality allows more fine-grained control of how your users
+can access your Subscription and resources.
+This feature currently needs to be enabled via a feature flag.
+Please contact the support if you want to try it out.
+
+#### How to use
+After the feature is enabled in your environment you can use the landing
+zone configuration page to set up the Azure ABAC conditions in the role mapping
+options. The ABAC condition is actively checked during replication and if needed 
+is re-applied by the replication process.
+
+### Deactivate meshCustomer Endpoints
+**Audience:** Partner, Customer<br>
+
+#### Description
+After we have renamed meshCustomer to meshWorkspace, our meshCustomer
+endpoints have remained available to ensure a smooth migration process for
+every customer.
+We have previously announced that our legacy meshCustomer API endpoints will
+eventually be removed, and we have gradually deactivated the legacy endpoints
+in more and more customer environments. With this release, the meshCustomer
+API endpoints are now deactivated in all customer environments.
+Most customers are not impacted by this change, since we have already
+deactivated the legacy meshCustomer endpoints in the past for these environments.
+
+#### How to use
+For every meshCustomer endpoint that has been deactivated, there is a
+corresponding meshWorkspace endpoint. Please follow our API docs for more
+details.
+
+### Enforce Versioned Accept Header for API
+**Audience:** Partner, Customer<br>
+
+#### Description
+After we have previously announced that our API endpoints will require a
+versioned Accept header, we have gradually enforced this in more and more
+customer environments. With this release, all customer environments are now
+configured such that the versioned Accept header is required.
+Most customers are not impacted by this change, since we have already
+introduced this configuration change in the past for these environments.
+
+#### How to use
+Please be aware that the Accept header is also required when you call a POST or PUT endpoint.
+This information is included in the API documentation. Following the API docs
+will ensure your requests work correctly.
+
+### Access Overview For Tenant Movement
+**Audience:** User<br>
+
+#### Description
+With this update, we've made moving tenants clearer with a new step showing access and permissions for the destination project, so you know exactly 
+who will have access for tenants after you move it.
+
+### Display Email Instead of Username in Workspace Access Area
+**Audience:** User<br>
+
+#### Description
+This update resolves a cosmetic issue by ensuring that user email 
+addresses are consistently displayed in the user lists within both 
+the project and workspace access screens.
+
+### Search for Users in Workspace Access
+**Audience:** Partner<br>
+
+#### Description
+Finding and managing users' workspace access is now easier with a new search bar in the Workspace Access section.
+This search control is also available when managing workspace access from the Admin Area. 
+This update simplifies member searches and streamlines workspace management.
+
diff --git a/website/static/api/api_index.html b/website/static/api/api_index.html
index 4dd912377..710bb5713 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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/api_key_login.html b/website/static/api/api_key_login.html
index a9caf6011..bd952f51b 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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/api_keys.html b/website/static/api/api_keys.html
index 5f5b60af8..f47a76ca8 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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/common_data_formats.html b/website/static/api/common_data_formats.html
index c45612e81..e8cae2d13 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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/index.html b/website/static/api/index.html
index 22a3e271a..a765acd2e 100644
--- a/website/static/api/index.html
+++ b/website/static/api/index.html
@@ -1497,58 +1497,58 @@ <h3 id="mesh_objects"><a class="link" href="#mesh_objects">meshObjects</a></h3>
 
 {
   "_links" : {
-    "meshprojects" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
+    "meshworkspaceusergroups" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}",
       "templated" : true
     },
-    "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&amp;projectIdentifier={projectIdentifier}",
+    "meshworkspaceuserbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}",
       "templated" : true
     },
-    "meshprojectuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&amp;projectIdentifier={projectIdentifier}",
+    "meshworkspacegroupbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}",
       "templated" : true
     },
-    "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
+    "meshworkspaces" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
+    },
+    "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
     },
     "meshtagdefinitions" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions"
     },
-    "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}",
-      "templated" : true
-    },
-    "meshserviceinstances" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
+    "meshtenants" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
       "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
     },
-    "meshworkspacegroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}",
+    "meshusers" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}",
       "templated" : true
     },
-    "meshworkspaceusergroups" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}",
+    "meshprojects" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
       "templated" : true
     },
-    "meshworkspaces" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
-    },
-    "meshpaymentmethods" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}",
+    "meshprojectgroupbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&amp;projectIdentifier={projectIdentifier}",
       "templated" : true
     },
-    "meshbuildingblocks" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}",
+    "meshprojectuserbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&amp;projectIdentifier={projectIdentifier}",
       "templated" : true
     },
-    "meshbuildingblockruns" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&amp;selector}",
+    "meshserviceinstances" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
       "templated" : true
     },
     "self" : {
@@ -1687,7 +1687,7 @@ <h5 id="_list_meshworkspaces"><a class="link" href="#_list_meshworkspaces">List
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "admin-customer",
-        "createdOn" : "2024-12-04T09:52:35Z"
+        "createdOn" : "2024-12-12T14:24:09Z"
       },
       "spec" : {
         "displayName" : "admin-customer",
@@ -1718,7 +1718,7 @@ <h5 id="_list_meshworkspaces"><a class="link" href="#_list_meshworkspaces">List
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-customer",
-        "createdOn" : "2024-12-04T09:52:35Z"
+        "createdOn" : "2024-12-12T14:24:09Z"
       },
       "spec" : {
         "displayName" : "demo-customer",
@@ -1749,7 +1749,7 @@ <h5 id="_list_meshworkspaces"><a class="link" href="#_list_meshworkspaces">List
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-partner",
-        "createdOn" : "2024-12-04T09:52:35Z"
+        "createdOn" : "2024-12-12T14:24:09Z"
       },
       "spec" : {
         "displayName" : "demo-partner",
@@ -1965,7 +1965,7 @@ <h5 id="_get_meshworkspace"><a class="link" href="#_get_meshworkspace">Get meshW
   "apiVersion" : "v1",
   "metadata" : {
     "name" : "admin-customer",
-    "createdOn" : "2024-12-04T09:52:35Z"
+    "createdOn" : "2024-12-12T14:24:09Z"
   },
   "spec" : {
     "displayName" : "admin-customer",
@@ -2059,7 +2059,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=ipkl2mpdsv2&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=dury1mpdsv2&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>
@@ -2068,7 +2068,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=ipkl2mpdsv2&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=dury1mpdsv2&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>
@@ -2133,7 +2133,7 @@ <h5 id="_list_meshprojects"><a class="link" href="#_list_meshprojects">List mesh
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-project-1",
-        "ownedByWorkspace" : "ipkl2mpdsv2",
+        "ownedByWorkspace" : "dury1mpdsv2",
         "createdOn" : "2024-01-01T00:00:00Z"
       },
       "spec" : {
@@ -2143,38 +2143,38 @@ <h5 id="_list_meshprojects"><a class="link" href="#_list_meshprojects">List mesh
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1"
         },
         "meshtenants" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshusers" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshprojectgroupbindings" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
         }
       }
     } ]
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     }
   },
   "page" : {
@@ -2215,7 +2215,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/ipkl2mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojects/dury1mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2224,7 +2224,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/ipkl2mpdsv2.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/dury1mpdsv2.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>
@@ -2372,9 +2372,9 @@ <h5 id="_get_meshproject"><a class="link" href="#_get_meshproject">Get meshProje
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-1",
-    "ownedByWorkspace" : "ipkl2mpdsv2",
+    "ownedByWorkspace" : "dury1mpdsv2",
     "createdOn" : "2024-01-01T00:00:00Z",
-    "deletedOn" : "2024-12-04T09:53:30.533407962Z"
+    "deletedOn" : "2024-12-12T14:25:19.247376253Z"
   },
   "spec" : {
     "displayName" : "Test Project 1",
@@ -2383,22 +2383,22 @@ <h5 id="_get_meshproject"><a class="link" href="#_get_meshproject">Get meshProje
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
     }
   }
 }</code></pre>
@@ -2449,7 +2449,7 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2"
+    "ownedByWorkspace" : "dury1mpdsv2"
   }
 }</code></pre>
 </div>
@@ -2474,7 +2474,7 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2"
+    "ownedByWorkspace" : "dury1mpdsv2"
   }
 }</code></pre>
 </div>
@@ -2495,7 +2495,7 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2"
+    "ownedByWorkspace" : "dury1mpdsv2"
   }
 }'</code></pre>
 </div>
@@ -2574,7 +2574,7 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
 Vary: Origin
 Vary: Access-Control-Request-Method
 Vary: Access-Control-Request-Headers
-Location: https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-3
+Location: https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-3
 Content-Type: application/vnd.meshcloud.api.meshproject.v2.hal+json
 X-Content-Type-Options: nosniff
 X-XSS-Protection: 0
@@ -2590,8 +2590,8 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2",
-    "createdOn" : "2024-12-04T09:53:30.003792499Z"
+    "ownedByWorkspace" : "dury1mpdsv2",
+    "createdOn" : "2024-12-12T14:25:18.691059079Z"
   },
   "spec" : {
     "displayName" : "Test Project 3",
@@ -2600,22 +2600,22 @@ <h5 id="_post_meshproject"><a class="link" href="#_post_meshproject">Post meshPr
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-3"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-3"
     }
   }
 }</code></pre>
@@ -2672,7 +2672,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/ipkl2mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshprojects/dury1mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2681,7 +2681,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/ipkl2mpdsv2.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/dury1mpdsv2.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>
@@ -2853,7 +2853,7 @@ <h5 id="_list_meshprojectuserbindings"><a class="link" href="#_list_meshprojectu
       "kind" : "meshProjectUserBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "7247a370-817a-4440-96ca-992ab87726bf"
+        "name" : "a952d9e1-5589-47eb-926e-c84e7702c836"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -2868,7 +2868,7 @@ <h5 id="_list_meshprojectuserbindings"><a class="link" href="#_list_meshprojectu
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836"
         }
       }
     } ]
@@ -2915,7 +2915,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/7247a370-817a-4440-96ca-992ab87726bf HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2924,7 +2924,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/7247a370-817a-4440-96ca-992ab87726bf' -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/a952d9e1-5589-47eb-926e-c84e7702c836' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -3016,7 +3016,7 @@ <h5 id="_get_meshprojectuserbinding"><a class="link" href="#_get_meshprojectuser
   "kind" : "meshProjectUserBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "7247a370-817a-4440-96ca-992ab87726bf"
+    "name" : "a952d9e1-5589-47eb-926e-c84e7702c836"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -3031,7 +3031,7 @@ <h5 id="_get_meshprojectuserbinding"><a class="link" href="#_get_meshprojectuser
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836"
     }
   }
 }</code></pre>
@@ -3442,7 +3442,7 @@ <h5 id="_list_meshprojectgroupbindings"><a class="link" href="#_list_meshproject
       "kind" : "meshProjectGroupBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+        "name" : "ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -3457,7 +3457,7 @@ <h5 id="_list_meshprojectgroupbindings"><a class="link" href="#_list_meshproject
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
         }
       }
     } ]
@@ -3504,7 +3504,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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -3513,7 +3513,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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba' -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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -3605,7 +3605,7 @@ <h5 id="_get_meshprojectgroupbinding"><a class="link" href="#_get_meshprojectgro
   "kind" : "meshProjectGroupBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+    "name" : "ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -3620,7 +3620,7 @@ <h5 id="_get_meshprojectgroupbinding"><a class="link" href="#_get_meshprojectgro
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
     }
   }
 }</code></pre>
@@ -3853,7 +3853,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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -3861,7 +3861,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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba' -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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -4569,7 +4569,7 @@ <h5 id="_list_meshworkspacegroupbindings"><a class="link" href="#_list_meshworks
       "kind" : "meshWorkspaceGroupBinding",
       "apiVersion" : "v2",
       "metadata" : {
-        "name" : "849f6844-4a00-41f3-a259-1b1876b32dcb"
+        "name" : "478a32f5-fa30-4f85-9d46-4639ec99e2e3"
       },
       "roleRef" : {
         "name" : "Workspace Manager"
@@ -4583,7 +4583,7 @@ <h5 id="_list_meshworkspacegroupbindings"><a class="link" href="#_list_meshworks
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3"
         }
       }
     } ]
@@ -4630,7 +4630,7 @@ <h5 id="_get_meshworkspacegroupbinding"><a class="link" href="#_get_meshworkspac
 <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/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -4639,7 +4639,7 @@ <h5 id="_get_meshworkspacegroupbinding"><a class="link" href="#_get_meshworkspac
 <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/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb' -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/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -4726,7 +4726,7 @@ <h5 id="_get_meshworkspacegroupbinding"><a class="link" href="#_get_meshworkspac
   "kind" : "meshWorkspaceGroupBinding",
   "apiVersion" : "v2",
   "metadata" : {
-    "name" : "849f6844-4a00-41f3-a259-1b1876b32dcb"
+    "name" : "478a32f5-fa30-4f85-9d46-4639ec99e2e3"
   },
   "roleRef" : {
     "name" : "Workspace Manager"
@@ -4740,7 +4740,7 @@ <h5 id="_get_meshworkspacegroupbinding"><a class="link" href="#_get_meshworkspac
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3"
     }
   }
 }</code></pre>
@@ -5151,12 +5151,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-12-05T09:53:33.547095239Z",
+        "deletedOn" : "2024-12-13T14:25:24.502274400Z",
         "assignedTags" : { },
         "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
       },
       "spec" : {
-        "localId" : "c22da58d-871b-4721-953d-a5128284a59e",
+        "localId" : "32c4c552-ebf8-4f75-8c77-0aea47de189d",
         "landingZoneIdentifier" : "stage-dev",
         "quotas" : [ {
           "key" : "limits.cpu",
@@ -5352,12 +5352,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-12-05T09:53:33.547095239Z",
+    "deletedOn" : "2024-12-13T14:25:24.502274400Z",
     "assignedTags" : { },
     "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
   },
   "spec" : {
-    "localId" : "c22da58d-871b-4721-953d-a5128284a59e",
+    "localId" : "32c4c552-ebf8-4f75-8c77-0aea47de189d",
     "landingZoneIdentifier" : "stage-dev",
     "quotas" : [ {
       "key" : "limits.cpu",
@@ -5777,7 +5777,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-12-04T09:53:22.098763344Z"
+        "createdOn" : "2024-12-12T14:25:10.067505556Z"
       },
       "spec" : {
         "displayName" : "parent block",
@@ -5808,7 +5808,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-12-04T09:53:22.146961264Z"
+        "createdOn" : "2024-12-12T14:25:10.118968516Z"
       },
       "spec" : {
         "displayName" : "child block",
@@ -6099,7 +6099,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-12-04T09:53:22.146961264Z"
+    "createdOn" : "2024-12-12T14:25:10.118968516Z"
   },
   "spec" : {
     "displayName" : "child block",
@@ -6191,7 +6191,7 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "57971196-c2d7-466c-ab68-e3de9c9487de"
+      "buildingBlockUuid": "84d25b93-2534-4f2f-b96e-e8b47657facb"
     }]
   }
 }</code></pre>
@@ -6220,7 +6220,7 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "57971196-c2d7-466c-ab68-e3de9c9487de"
+      "buildingBlockUuid": "84d25b93-2534-4f2f-b96e-e8b47657facb"
     }]
   }
 } '</code></pre>
@@ -6348,7 +6348,7 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
 Vary: Origin
 Vary: Access-Control-Request-Method
 Vary: Access-Control-Request-Headers
-Location: https://mesh-backend-url/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff
+Location: https://mesh-backend-url/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772
 Content-Type: application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json
 X-Content-Type-Options: nosniff
 X-XSS-Protection: 0
@@ -6363,12 +6363,12 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
   "kind" : "meshBuildingBlock",
   "apiVersion" : "v1",
   "metadata" : {
-    "uuid" : "151bace2-358a-4aa5-97be-242964653aff",
+    "uuid" : "a2048c7f-72d7-4aa7-b79a-26fe62ec7772",
     "definitionUuid" : "ef6aaf87-3f8c-477c-94f4-f3cf509728ca",
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-12-04T09:53:23.185770890Z"
+    "createdOn" : "2024-12-12T14:25:11.256635344Z"
   },
   "spec" : {
     "displayName" : "New BuildingBlock",
@@ -6378,7 +6378,7 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
       "valueType" : "STRING"
     } ],
     "parentBuildingBlocks" : [ {
-      "buildingBlockUuid" : "57971196-c2d7-466c-ab68-e3de9c9487de",
+      "buildingBlockUuid" : "84d25b93-2534-4f2f-b96e-e8b47657facb",
       "definitionUuid" : "b23cfb9a-6974-444f-9d33-62134a632373"
     } ]
   },
@@ -6388,13 +6388,13 @@ <h5 id="_post_meshbuildingblock"><a class="link" href="#_post_meshbuildingblock"
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772"
     },
     "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/151bace2-358a-4aa5-97be-242964653aff/purge"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge"
     }
   }
 }</code></pre>
@@ -6411,7 +6411,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/151bace2-358a-4aa5-97be-242964653aff HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -6419,7 +6419,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/151bace2-358a-4aa5-97be-242964653aff' -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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -6449,7 +6449,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/151bace2-358a-4aa5-97be-242964653aff/purge HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">DELETE /api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -6457,7 +6457,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/151bace2-358a-4aa5-97be-242964653aff/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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -6905,7 +6905,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=ipkl2mpmdsv2&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=dury1mpmdsv2&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>
@@ -6914,7 +6914,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=ipkl2mpmdsv2&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=dury1mpmdsv2&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>
@@ -6979,7 +6979,7 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-1",
-        "ownedByWorkspace" : "ipkl2mpmdsv2"
+        "ownedByWorkspace" : "dury1mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 1",
@@ -6999,7 +6999,7 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-2",
-        "ownedByWorkspace" : "ipkl2mpmdsv2"
+        "ownedByWorkspace" : "dury1mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 2",
@@ -7018,16 +7018,16 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=0&amp;size=2"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=0&amp;size=2"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=1&amp;size=2"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=1&amp;size=2"
     }
   },
   "page" : {
@@ -7193,7 +7193,7 @@ <h5 id="_get_meshpaymentmethod"><a class="link" href="#_get_meshpaymentmethod">G
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-payment-method-1",
-    "ownedByWorkspace" : "ipkl2mpmdsv2"
+    "ownedByWorkspace" : "dury1mpmdsv2"
   },
   "spec" : {
     "displayName" : "Test Payment Method 1",
@@ -7401,7 +7401,7 @@ <h5 id="_list_meshusers"><a class="link" href="#_list_meshusers">List meshUsers<
         "email" : "john-doe@example.com",
         "firstName" : "John",
         "lastName" : "Doe",
-        "euid" : "a7f2cd7d-ede8-4d92-8f84-21a63719c6e9",
+        "euid" : "d586c3f5-8ce4-41d5-9469-ea1d27395187",
         "tags" : {
           "environment" : [ "dev", "test", "qa" ]
         }
@@ -7598,7 +7598,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" : "a7f2cd7d-ede8-4d92-8f84-21a63719c6e9",
+    "euid" : "d586c3f5-8ce4-41d5-9469-ea1d27395187",
     "tags" : {
       "environment" : [ "dev", "test", "qa" ]
     }
@@ -8120,20 +8120,20 @@ <h5 id="_list_meshserviceinstances"><a class="link" href="#_list_meshserviceinst
       "kind" : "meshServiceInstance",
       "apiVersion" : "v2",
       "metadata" : {
-        "ownedByProject" : "ipkl2mtdg10",
+        "ownedByProject" : "dury1mtdg10",
         "ownedByWorkspace" : "my-mobile-app-team",
-        "marketplaceIdentifier" : "ipkl2mtdg1",
-        "instanceId" : "ipkl2mtdg11"
+        "marketplaceIdentifier" : "dury1mtdg1",
+        "instanceId" : "dury1mtdg11"
       },
       "spec" : {
-        "displayName" : "ipkl2mtdg12",
-        "serviceId" : "ipkl2mtdg5",
-        "planId" : "ipkl2mtdg7",
+        "displayName" : "dury1mtdg12",
+        "serviceId" : "dury1mtdg5",
+        "planId" : "dury1mtdg7",
         "creator" : "Unknown"
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/ipkl2mtdg11"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/dury1mtdg11"
         }
       }
     } ]
@@ -8300,15 +8300,15 @@ <h5 id="_get_meshserviceinstance"><a class="link" href="#_get_meshserviceinstanc
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -8362,15 +8362,15 @@ <h5 id="_post_meshserviceinstance"><a class="link" href="#_post_meshserviceinsta
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -8386,15 +8386,15 @@ <h5 id="_post_meshserviceinstance"><a class="link" href="#_post_meshserviceinsta
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -8498,15 +8498,15 @@ <h5 id="_post_meshserviceinstance"><a class="link" href="#_post_meshserviceinsta
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -8560,15 +8560,15 @@ <h5 id="_put_meshserviceinstance"><a class="link" href="#_put_meshserviceinstanc
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -8584,15 +8584,15 @@ <h5 id="_put_meshserviceinstance"><a class="link" href="#_put_meshserviceinstanc
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -10905,7 +10905,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" : "k3cqCBqdme"
+  "errorId" : "82cVc5J95b"
 }</code></pre>
 </div>
 </div>
@@ -11167,7 +11167,7 @@ <h4 id="openstack_project_metadata"><a class="link" href="#openstack_project_met
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 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 7eee33d51..d5e091116 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-12-04T09:53:22.098763344Z"
+        "createdOn" : "2024-12-12T14:25:10.067505556Z"
       },
       "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-12-04T09:53:22.146961264Z"
+        "createdOn" : "2024-12-12T14:25:10.118968516Z"
       },
       "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-12-04T09:53:22.146961264Z"
+    "createdOn" : "2024-12-12T14:25:10.118968516Z"
   },
   "spec" : {
     "displayName" : "child block",
@@ -1015,7 +1015,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "57971196-c2d7-466c-ab68-e3de9c9487de"
+      "buildingBlockUuid": "84d25b93-2534-4f2f-b96e-e8b47657facb"
     }]
   }
 }</code></pre>
@@ -1044,7 +1044,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "57971196-c2d7-466c-ab68-e3de9c9487de"
+      "buildingBlockUuid": "84d25b93-2534-4f2f-b96e-e8b47657facb"
     }]
   }
 } '</code></pre>
@@ -1172,7 +1172,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
 Vary: Origin
 Vary: Access-Control-Request-Method
 Vary: Access-Control-Request-Headers
-Location: https://mesh-backend-url/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff
+Location: https://mesh-backend-url/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772
 Content-Type: application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json
 X-Content-Type-Options: nosniff
 X-XSS-Protection: 0
@@ -1187,12 +1187,12 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
   "kind" : "meshBuildingBlock",
   "apiVersion" : "v1",
   "metadata" : {
-    "uuid" : "151bace2-358a-4aa5-97be-242964653aff",
+    "uuid" : "a2048c7f-72d7-4aa7-b79a-26fe62ec7772",
     "definitionUuid" : "ef6aaf87-3f8c-477c-94f4-f3cf509728ca",
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-12-04T09:53:23.185770890Z"
+    "createdOn" : "2024-12-12T14:25:11.256635344Z"
   },
   "spec" : {
     "displayName" : "New BuildingBlock",
@@ -1202,7 +1202,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
       "valueType" : "STRING"
     } ],
     "parentBuildingBlocks" : [ {
-      "buildingBlockUuid" : "57971196-c2d7-466c-ab68-e3de9c9487de",
+      "buildingBlockUuid" : "84d25b93-2534-4f2f-b96e-e8b47657facb",
       "definitionUuid" : "b23cfb9a-6974-444f-9d33-62134a632373"
     } ]
   },
@@ -1212,13 +1212,13 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772"
     },
     "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/151bace2-358a-4aa5-97be-242964653aff/purge"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge"
     }
   }
 }</code></pre>
@@ -1235,7 +1235,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/151bace2-358a-4aa5-97be-242964653aff HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -1243,7 +1243,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/151bace2-358a-4aa5-97be-242964653aff' -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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -1273,7 +1273,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/151bace2-358a-4aa5-97be-242964653aff/purge HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -1281,7 +1281,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/151bace2-358a-4aa5-97be-242964653aff/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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -1673,7 +1673,7 @@ <h5 id="_update_sources_and_steps">Update Sources and Steps</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_buildingblockrunner.html b/website/static/api/mesh_buildingblockrunner.html
index 99d0d7fb2..061faea38 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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_object_collection.html b/website/static/api/mesh_object_collection.html
index 9a3d94b9e..9878aa9d3 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" : "k3cqCBqdme"
+  "errorId" : "82cVc5J95b"
 }</code></pre>
 </div>
 </div>
@@ -686,7 +686,7 @@ <h4 id="_deletemeshobjectcollection">deleteMeshObjectCollection</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 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 0d7dd20cc..9f566b2e7 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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_objects.html b/website/static/api/mesh_objects.html
index 847813ed9..8a8a13d38 100644
--- a/website/static/api/mesh_objects.html
+++ b/website/static/api/mesh_objects.html
@@ -597,58 +597,58 @@ <h3 id="mesh_objects">meshObjects</h3>
 
 {
   "_links" : {
-    "meshprojects" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
+    "meshworkspaceusergroups" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}",
       "templated" : true
     },
-    "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&amp;projectIdentifier={projectIdentifier}",
+    "meshworkspaceuserbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}",
       "templated" : true
     },
-    "meshprojectuserbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&amp;projectIdentifier={projectIdentifier}",
+    "meshworkspacegroupbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}",
       "templated" : true
     },
-    "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
+    "meshworkspaces" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
+    },
+    "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
     },
     "meshtagdefinitions" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshtagdefinitions"
     },
-    "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}",
-      "templated" : true
-    },
-    "meshserviceinstances" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
+    "meshtenants" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
       "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
     },
-    "meshworkspacegroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}",
+    "meshusers" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers{?workspaceIdentifier,projectIdentifier,platformIdentifier,workspaceUserGroupIdentifier,projectRole,workspaceRole,email,firstName,lastName,username,euid}",
       "templated" : true
     },
-    "meshworkspaceusergroups" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}",
+    "meshprojects" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
       "templated" : true
     },
-    "meshworkspaces" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
-    },
-    "meshpaymentmethods" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}",
+    "meshprojectgroupbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier={workspaceIdentifier}&amp;projectIdentifier={projectIdentifier}",
       "templated" : true
     },
-    "meshbuildingblocks" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?workspaceIdentifier,customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}",
+    "meshprojectuserbindings" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier={workspaceIdentifier}&amp;projectIdentifier={projectIdentifier}",
       "templated" : true
     },
-    "meshbuildingblockruns" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblockruns?runnerNodeId={runnerNodeId}{&amp;selector}",
+    "meshserviceinstances" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
       "templated" : true
     },
     "self" : {
@@ -787,7 +787,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "admin-customer",
-        "createdOn" : "2024-12-04T09:52:35Z"
+        "createdOn" : "2024-12-12T14:24:09Z"
       },
       "spec" : {
         "displayName" : "admin-customer",
@@ -818,7 +818,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-customer",
-        "createdOn" : "2024-12-04T09:52:35Z"
+        "createdOn" : "2024-12-12T14:24:09Z"
       },
       "spec" : {
         "displayName" : "demo-customer",
@@ -849,7 +849,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-partner",
-        "createdOn" : "2024-12-04T09:52:35Z"
+        "createdOn" : "2024-12-12T14:24:09Z"
       },
       "spec" : {
         "displayName" : "demo-partner",
@@ -1065,7 +1065,7 @@ <h5 id="_get_meshworkspace">Get meshWorkspace</h5>
   "apiVersion" : "v1",
   "metadata" : {
     "name" : "admin-customer",
-    "createdOn" : "2024-12-04T09:52:35Z"
+    "createdOn" : "2024-12-12T14:24:09Z"
   },
   "spec" : {
     "displayName" : "admin-customer",
@@ -1159,7 +1159,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=ipkl2mpdsv2&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=dury1mpdsv2&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>
@@ -1168,7 +1168,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=ipkl2mpdsv2&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=dury1mpdsv2&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>
@@ -1233,7 +1233,7 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-project-1",
-        "ownedByWorkspace" : "ipkl2mpdsv2",
+        "ownedByWorkspace" : "dury1mpdsv2",
         "createdOn" : "2024-01-01T00:00:00Z"
       },
       "spec" : {
@@ -1243,38 +1243,38 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1"
         },
         "meshtenants" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshusers" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshprojectgroupbindings" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
         }
       }
     } ]
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     }
   },
   "page" : {
@@ -1315,7 +1315,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/ipkl2mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects/dury1mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1324,7 +1324,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/ipkl2mpdsv2.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/dury1mpdsv2.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>
@@ -1472,9 +1472,9 @@ <h5 id="_get_meshproject">Get meshProject</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-1",
-    "ownedByWorkspace" : "ipkl2mpdsv2",
+    "ownedByWorkspace" : "dury1mpdsv2",
     "createdOn" : "2024-01-01T00:00:00Z",
-    "deletedOn" : "2024-12-04T09:53:30.533407962Z"
+    "deletedOn" : "2024-12-12T14:25:19.247376253Z"
   },
   "spec" : {
     "displayName" : "Test Project 1",
@@ -1483,22 +1483,22 @@ <h5 id="_get_meshproject">Get meshProject</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
     }
   }
 }</code></pre>
@@ -1549,7 +1549,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2"
+    "ownedByWorkspace" : "dury1mpdsv2"
   }
 }</code></pre>
 </div>
@@ -1574,7 +1574,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2"
+    "ownedByWorkspace" : "dury1mpdsv2"
   }
 }</code></pre>
 </div>
@@ -1595,7 +1595,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2"
+    "ownedByWorkspace" : "dury1mpdsv2"
   }
 }'</code></pre>
 </div>
@@ -1674,7 +1674,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
 Vary: Origin
 Vary: Access-Control-Request-Method
 Vary: Access-Control-Request-Headers
-Location: https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-3
+Location: https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-3
 Content-Type: application/vnd.meshcloud.api.meshproject.v2.hal+json
 X-Content-Type-Options: nosniff
 X-XSS-Protection: 0
@@ -1690,8 +1690,8 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2",
-    "createdOn" : "2024-12-04T09:53:30.003792499Z"
+    "ownedByWorkspace" : "dury1mpdsv2",
+    "createdOn" : "2024-12-12T14:25:18.691059079Z"
   },
   "spec" : {
     "displayName" : "Test Project 3",
@@ -1700,22 +1700,22 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-3"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-3"
     }
   }
 }</code></pre>
@@ -1772,7 +1772,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/ipkl2mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojects/dury1mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1781,7 +1781,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/ipkl2mpdsv2.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/dury1mpdsv2.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>
@@ -1953,7 +1953,7 @@ <h5 id="_list_meshprojectuserbindings">List meshProjectUserBindings</h5>
       "kind" : "meshProjectUserBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "7247a370-817a-4440-96ca-992ab87726bf"
+        "name" : "a952d9e1-5589-47eb-926e-c84e7702c836"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -1968,7 +1968,7 @@ <h5 id="_list_meshprojectuserbindings">List meshProjectUserBindings</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836"
         }
       }
     } ]
@@ -2015,7 +2015,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/7247a370-817a-4440-96ca-992ab87726bf HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2024,7 +2024,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/7247a370-817a-4440-96ca-992ab87726bf' -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/a952d9e1-5589-47eb-926e-c84e7702c836' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -2116,7 +2116,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
   "kind" : "meshProjectUserBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "7247a370-817a-4440-96ca-992ab87726bf"
+    "name" : "a952d9e1-5589-47eb-926e-c84e7702c836"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -2131,7 +2131,7 @@ <h5 id="_get_meshprojectuserbinding">Get meshProjectUserBinding</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836"
     }
   }
 }</code></pre>
@@ -2542,7 +2542,7 @@ <h5 id="_list_meshprojectgroupbindings">List meshProjectGroupBindings</h5>
       "kind" : "meshProjectGroupBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+        "name" : "ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
       },
       "roleRef" : {
         "name" : "Project User"
@@ -2557,7 +2557,7 @@ <h5 id="_list_meshprojectgroupbindings">List meshProjectGroupBindings</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
         }
       }
     } ]
@@ -2604,7 +2604,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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2613,7 +2613,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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba' -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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json'</code></pre>
 </div>
 </div>
@@ -2705,7 +2705,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
   "kind" : "meshProjectGroupBinding",
   "apiVersion" : "v3",
   "metadata" : {
-    "name" : "05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+    "name" : "ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
   },
   "roleRef" : {
     "name" : "Project User"
@@ -2720,7 +2720,7 @@ <h5 id="_get_meshprojectgroupbinding">Get meshProjectGroupBinding</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
     }
   }
 }</code></pre>
@@ -2953,7 +2953,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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -2961,7 +2961,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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba' -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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="paragraph">
@@ -3669,7 +3669,7 @@ <h5 id="_list_meshworkspacegroupbindings">List meshWorkspaceGroupBindings</h5>
       "kind" : "meshWorkspaceGroupBinding",
       "apiVersion" : "v2",
       "metadata" : {
-        "name" : "849f6844-4a00-41f3-a259-1b1876b32dcb"
+        "name" : "478a32f5-fa30-4f85-9d46-4639ec99e2e3"
       },
       "roleRef" : {
         "name" : "Workspace Manager"
@@ -3683,7 +3683,7 @@ <h5 id="_list_meshworkspacegroupbindings">List meshWorkspaceGroupBindings</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3"
         }
       }
     } ]
@@ -3730,7 +3730,7 @@ <h5 id="_get_meshworkspacegroupbinding">Get meshWorkspaceGroupBinding</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/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -3739,7 +3739,7 @@ <h5 id="_get_meshworkspacegroupbinding">Get meshWorkspaceGroupBinding</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/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb' -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/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -3826,7 +3826,7 @@ <h5 id="_get_meshworkspacegroupbinding">Get meshWorkspaceGroupBinding</h5>
   "kind" : "meshWorkspaceGroupBinding",
   "apiVersion" : "v2",
   "metadata" : {
-    "name" : "849f6844-4a00-41f3-a259-1b1876b32dcb"
+    "name" : "478a32f5-fa30-4f85-9d46-4639ec99e2e3"
   },
   "roleRef" : {
     "name" : "Workspace Manager"
@@ -3840,7 +3840,7 @@ <h5 id="_get_meshworkspacegroupbinding">Get meshWorkspaceGroupBinding</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3"
     }
   }
 }</code></pre>
@@ -4251,12 +4251,12 @@ <h5 id="_list_meshtenants">List meshTenants</h5>
         "ownedByProject" : "test-project",
         "ownedByWorkspace" : "test-workspace",
         "platformIdentifier" : "aws.aws-meshstack-dev",
-        "deletedOn" : "2024-12-05T09:53:33.547095239Z",
+        "deletedOn" : "2024-12-13T14:25:24.502274400Z",
         "assignedTags" : { },
         "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
       },
       "spec" : {
-        "localId" : "c22da58d-871b-4721-953d-a5128284a59e",
+        "localId" : "32c4c552-ebf8-4f75-8c77-0aea47de189d",
         "landingZoneIdentifier" : "stage-dev",
         "quotas" : [ {
           "key" : "limits.cpu",
@@ -4452,12 +4452,12 @@ <h5 id="_get_meshtenant">Get meshTenant</h5>
     "ownedByProject" : "test-project",
     "ownedByWorkspace" : "test-workspace",
     "platformIdentifier" : "aws.aws-meshstack-dev",
-    "deletedOn" : "2024-12-05T09:53:33.547095239Z",
+    "deletedOn" : "2024-12-13T14:25:24.502274400Z",
     "assignedTags" : { },
     "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
   },
   "spec" : {
-    "localId" : "c22da58d-871b-4721-953d-a5128284a59e",
+    "localId" : "32c4c552-ebf8-4f75-8c77-0aea47de189d",
     "landingZoneIdentifier" : "stage-dev",
     "quotas" : [ {
       "key" : "limits.cpu",
@@ -4877,7 +4877,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-12-04T09:53:22.098763344Z"
+        "createdOn" : "2024-12-12T14:25:10.067505556Z"
       },
       "spec" : {
         "displayName" : "parent block",
@@ -4908,7 +4908,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-12-04T09:53:22.146961264Z"
+        "createdOn" : "2024-12-12T14:25:10.118968516Z"
       },
       "spec" : {
         "displayName" : "child block",
@@ -5199,7 +5199,7 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-12-04T09:53:22.146961264Z"
+    "createdOn" : "2024-12-12T14:25:10.118968516Z"
   },
   "spec" : {
     "displayName" : "child block",
@@ -5291,7 +5291,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "57971196-c2d7-466c-ab68-e3de9c9487de"
+      "buildingBlockUuid": "84d25b93-2534-4f2f-b96e-e8b47657facb"
     }]
   }
 }</code></pre>
@@ -5320,7 +5320,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
     }],
     "parentBuildingBlocks" : [{
       "definitionUuid": "b23cfb9a-6974-444f-9d33-62134a632373",
-      "buildingBlockUuid": "57971196-c2d7-466c-ab68-e3de9c9487de"
+      "buildingBlockUuid": "84d25b93-2534-4f2f-b96e-e8b47657facb"
     }]
   }
 } '</code></pre>
@@ -5448,7 +5448,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
 Vary: Origin
 Vary: Access-Control-Request-Method
 Vary: Access-Control-Request-Headers
-Location: https://mesh-backend-url/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff
+Location: https://mesh-backend-url/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772
 Content-Type: application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json
 X-Content-Type-Options: nosniff
 X-XSS-Protection: 0
@@ -5463,12 +5463,12 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
   "kind" : "meshBuildingBlock",
   "apiVersion" : "v1",
   "metadata" : {
-    "uuid" : "151bace2-358a-4aa5-97be-242964653aff",
+    "uuid" : "a2048c7f-72d7-4aa7-b79a-26fe62ec7772",
     "definitionUuid" : "ef6aaf87-3f8c-477c-94f4-f3cf509728ca",
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-12-04T09:53:23.185770890Z"
+    "createdOn" : "2024-12-12T14:25:11.256635344Z"
   },
   "spec" : {
     "displayName" : "New BuildingBlock",
@@ -5478,7 +5478,7 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
       "valueType" : "STRING"
     } ],
     "parentBuildingBlocks" : [ {
-      "buildingBlockUuid" : "57971196-c2d7-466c-ab68-e3de9c9487de",
+      "buildingBlockUuid" : "84d25b93-2534-4f2f-b96e-e8b47657facb",
       "definitionUuid" : "b23cfb9a-6974-444f-9d33-62134a632373"
     } ]
   },
@@ -5488,13 +5488,13 @@ <h5 id="_post_meshbuildingblock">Post meshBuildingBlock</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772"
     },
     "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/151bace2-358a-4aa5-97be-242964653aff/purge"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge"
     }
   }
 }</code></pre>
@@ -5511,7 +5511,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/151bace2-358a-4aa5-97be-242964653aff HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -5519,7 +5519,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/151bace2-358a-4aa5-97be-242964653aff' -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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -5549,7 +5549,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/151bace2-358a-4aa5-97be-242964653aff/purge HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Host: mesh-backend-url</code></pre>
 </div>
@@ -5557,7 +5557,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/151bace2-358a-4aa5-97be-242964653aff/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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge' -i -u 'valid_username:valid_password' -X DELETE</code></pre>
 </div>
 </div>
 <div class="listingblock">
@@ -6005,7 +6005,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=ipkl2mpmdsv2&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=dury1mpmdsv2&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>
@@ -6014,7 +6014,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=ipkl2mpmdsv2&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=dury1mpmdsv2&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>
@@ -6079,7 +6079,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-1",
-        "ownedByWorkspace" : "ipkl2mpmdsv2"
+        "ownedByWorkspace" : "dury1mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 1",
@@ -6099,7 +6099,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-payment-method-2",
-        "ownedByWorkspace" : "ipkl2mpmdsv2"
+        "ownedByWorkspace" : "dury1mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 2",
@@ -6118,16 +6118,16 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=0&amp;size=2"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=0&amp;size=2"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=1&amp;size=2"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=1&amp;size=2"
     }
   },
   "page" : {
@@ -6293,7 +6293,7 @@ <h5 id="_get_meshpaymentmethod">Get meshPaymentMethod</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-payment-method-1",
-    "ownedByWorkspace" : "ipkl2mpmdsv2"
+    "ownedByWorkspace" : "dury1mpmdsv2"
   },
   "spec" : {
     "displayName" : "Test Payment Method 1",
@@ -6501,7 +6501,7 @@ <h5 id="_list_meshusers">List meshUsers</h5>
         "email" : "john-doe@example.com",
         "firstName" : "John",
         "lastName" : "Doe",
-        "euid" : "a7f2cd7d-ede8-4d92-8f84-21a63719c6e9",
+        "euid" : "d586c3f5-8ce4-41d5-9469-ea1d27395187",
         "tags" : {
           "environment" : [ "dev", "test", "qa" ]
         }
@@ -6698,7 +6698,7 @@ <h5 id="_get_meshuser">Get meshUser</h5>
     "email" : "john-doe@example.com",
     "firstName" : "John",
     "lastName" : "Doe",
-    "euid" : "a7f2cd7d-ede8-4d92-8f84-21a63719c6e9",
+    "euid" : "d586c3f5-8ce4-41d5-9469-ea1d27395187",
     "tags" : {
       "environment" : [ "dev", "test", "qa" ]
     }
@@ -7220,20 +7220,20 @@ <h5 id="_list_meshserviceinstances">List meshServiceInstances</h5>
       "kind" : "meshServiceInstance",
       "apiVersion" : "v2",
       "metadata" : {
-        "ownedByProject" : "ipkl2mtdg10",
+        "ownedByProject" : "dury1mtdg10",
         "ownedByWorkspace" : "my-mobile-app-team",
-        "marketplaceIdentifier" : "ipkl2mtdg1",
-        "instanceId" : "ipkl2mtdg11"
+        "marketplaceIdentifier" : "dury1mtdg1",
+        "instanceId" : "dury1mtdg11"
       },
       "spec" : {
-        "displayName" : "ipkl2mtdg12",
-        "serviceId" : "ipkl2mtdg5",
-        "planId" : "ipkl2mtdg7",
+        "displayName" : "dury1mtdg12",
+        "serviceId" : "dury1mtdg5",
+        "planId" : "dury1mtdg7",
         "creator" : "Unknown"
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/ipkl2mtdg11"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/dury1mtdg11"
         }
       }
     } ]
@@ -7400,15 +7400,15 @@ <h5 id="_get_meshserviceinstance">Get meshServiceInstance</h5>
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -7462,15 +7462,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -7486,15 +7486,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -7598,15 +7598,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -7660,15 +7660,15 @@ <h5 id="_put_meshserviceinstance">Put meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -7684,15 +7684,15 @@ <h5 id="_put_meshserviceinstance">Put meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -9771,7 +9771,7 @@ <h5 id="_meshexchangerate">meshExchangeRate</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_paymentmethod.html b/website/static/api/mesh_paymentmethod.html
index 53ecdb6bf..c00e763fa 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=ipkl2mpmdsv2&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=dury1mpmdsv2&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=ipkl2mpmdsv2&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=dury1mpmdsv2&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" : "ipkl2mpmdsv2"
+        "ownedByWorkspace" : "dury1mpmdsv2"
       },
       "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" : "ipkl2mpmdsv2"
+        "ownedByWorkspace" : "dury1mpmdsv2"
       },
       "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=ipkl2mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=0&amp;size=2"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=0&amp;size=2"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&amp;page=1&amp;size=2"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&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" : "ipkl2mpmdsv2"
+    "ownedByWorkspace" : "dury1mpmdsv2"
   },
   "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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_project.html b/website/static/api/mesh_project.html
index 9bec1e726..5a6ad3149 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=ipkl2mpdsv2&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=dury1mpdsv2&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=ipkl2mpdsv2&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=dury1mpdsv2&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>
@@ -577,7 +577,7 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "test-project-1",
-        "ownedByWorkspace" : "ipkl2mpdsv2",
+        "ownedByWorkspace" : "dury1mpdsv2",
         "createdOn" : "2024-01-01T00:00:00Z"
       },
       "spec" : {
@@ -587,38 +587,38 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1"
         },
         "meshtenants" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshusers" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshprojectgroupbindings" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
         }
       }
     } ]
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&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/ipkl2mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects/dury1mpdsv2.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/ipkl2mpdsv2.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/dury1mpdsv2.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>
@@ -816,9 +816,9 @@ <h5 id="_get_meshproject">Get meshProject</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-1",
-    "ownedByWorkspace" : "ipkl2mpdsv2",
+    "ownedByWorkspace" : "dury1mpdsv2",
     "createdOn" : "2024-01-01T00:00:00Z",
-    "deletedOn" : "2024-12-04T09:53:30.533407962Z"
+    "deletedOn" : "2024-12-12T14:25:19.247376253Z"
   },
   "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/ipkl2mpdsv2.test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-1"
     }
   }
 }</code></pre>
@@ -893,7 +893,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2"
+    "ownedByWorkspace" : "dury1mpdsv2"
   }
 }</code></pre>
 </div>
@@ -918,7 +918,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2"
+    "ownedByWorkspace" : "dury1mpdsv2"
   }
 }</code></pre>
 </div>
@@ -939,7 +939,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2"
+    "ownedByWorkspace" : "dury1mpdsv2"
   }
 }'</code></pre>
 </div>
@@ -1018,7 +1018,7 @@ <h5 id="_post_meshproject">Post meshProject</h5>
 Vary: Origin
 Vary: Access-Control-Request-Method
 Vary: Access-Control-Request-Headers
-Location: https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-3
+Location: https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-3
 Content-Type: application/vnd.meshcloud.api.meshproject.v2.hal+json
 X-Content-Type-Options: nosniff
 X-XSS-Protection: 0
@@ -1034,8 +1034,8 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "test-project-3",
-    "ownedByWorkspace" : "ipkl2mpdsv2",
-    "createdOn" : "2024-12-04T09:53:30.003792499Z"
+    "ownedByWorkspace" : "dury1mpdsv2",
+    "createdOn" : "2024-12-12T14:25:18.691059079Z"
   },
   "spec" : {
     "displayName" : "Test Project 3",
@@ -1044,22 +1044,22 @@ <h5 id="_post_meshproject">Post meshProject</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/dury1mpdsv2.test-project-3"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-3"
     },
     "meshprojectgroupbindings" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&amp;projectIdentifier=test-project-3"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&amp;projectIdentifier=test-project-3"
     }
   }
 }</code></pre>
@@ -1116,7 +1116,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/ipkl2mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojects/dury1mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1125,7 +1125,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/ipkl2mpdsv2.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/dury1mpdsv2.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>
@@ -1150,7 +1150,7 @@ <h5 id="_delete_meshproject">Delete meshProject</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_project_bindings.html b/website/static/api/mesh_project_bindings.html
index 0b0a3fc14..0377a4e1d 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" : "7247a370-817a-4440-96ca-992ab87726bf"
+        "name" : "a952d9e1-5589-47eb-926e-c84e7702c836"
       },
       "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/7247a370-817a-4440-96ca-992ab87726bf"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836"
         }
       }
     } ]
@@ -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/7247a370-817a-4440-96ca-992ab87726bf HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836 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/7247a370-817a-4440-96ca-992ab87726bf' -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/a952d9e1-5589-47eb-926e-c84e7702c836' -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" : "7247a370-817a-4440-96ca-992ab87726bf"
+    "name" : "a952d9e1-5589-47eb-926e-c84e7702c836"
   },
   "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/7247a370-817a-4440-96ca-992ab87726bf"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836"
     }
   }
 }</code></pre>
@@ -1179,7 +1179,7 @@ <h5 id="_list_meshprojectgroupbindings">List meshProjectGroupBindings</h5>
       "kind" : "meshProjectGroupBinding",
       "apiVersion" : "v3",
       "metadata" : {
-        "name" : "05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+        "name" : "ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
       },
       "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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
         }
       }
     } ]
@@ -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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086 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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba' -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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086' -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" : "05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+    "name" : "ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
   },
   "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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
     }
   }
 }</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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">DELETE /api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086 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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba' -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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086' -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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_serviceinstance.html b/website/static/api/mesh_serviceinstance.html
index 22a6d778e..61a67c527 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" : "ipkl2mtdg10",
+        "ownedByProject" : "dury1mtdg10",
         "ownedByWorkspace" : "my-mobile-app-team",
-        "marketplaceIdentifier" : "ipkl2mtdg1",
-        "instanceId" : "ipkl2mtdg11"
+        "marketplaceIdentifier" : "dury1mtdg1",
+        "instanceId" : "dury1mtdg11"
       },
       "spec" : {
-        "displayName" : "ipkl2mtdg12",
-        "serviceId" : "ipkl2mtdg5",
-        "planId" : "ipkl2mtdg7",
+        "displayName" : "dury1mtdg12",
+        "serviceId" : "dury1mtdg5",
+        "planId" : "dury1mtdg7",
         "creator" : "Unknown"
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/ipkl2mtdg11"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances/dury1mtdg11"
         }
       }
     } ]
@@ -768,15 +768,15 @@ <h5 id="_get_meshserviceinstance">Get meshServiceInstance</h5>
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -830,15 +830,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -854,15 +854,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }'</code></pre>
@@ -966,15 +966,15 @@ <h5 id="_post_meshserviceinstance">Post meshServiceInstance</h5>
   "kind" : "meshServiceInstance",
   "apiVersion" : "v2",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "Unknown"
   },
   "_links" : {
@@ -1028,15 +1028,15 @@ <h5 id="_put_meshserviceinstance">Put meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "creator" : "admin@meshcloud.io"
   }
 }</code></pre>
@@ -1052,15 +1052,15 @@ <h5 id="_put_meshserviceinstance">Put meshServiceInstance</h5>
   "apiVersion" : "v2",
   "kind" : "meshServiceInstance",
   "metadata" : {
-    "ownedByProject" : "ipkl2smsids-1",
+    "ownedByProject" : "dury1smsids-1",
     "ownedByWorkspace" : "my-mobile-app-team",
-    "marketplaceIdentifier" : "ipkl2mtdg21",
+    "marketplaceIdentifier" : "dury1mtdg21",
     "instanceId" : "serviceInstanceId"
   },
   "spec" : {
     "displayName" : "New SI updated",
-    "serviceId" : "ipkl2mtdg25",
-    "planId" : "ipkl2mtdg27",
+    "serviceId" : "dury1mtdg25",
+    "planId" : "dury1mtdg27",
     "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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_tag_definition.html b/website/static/api/mesh_tag_definition.html
index fb02f86b0..901cc1fbb 100644
--- a/website/static/api/mesh_tag_definition.html
+++ b/website/static/api/mesh_tag_definition.html
@@ -1375,7 +1375,7 @@ <h5 id="_delete_meshtagdefinition">Delete meshTagDefinition</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_tenant.html b/website/static/api/mesh_tenant.html
index 0aa016bf9..1e35a5883 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-12-05T09:53:33.547095239Z",
+        "deletedOn" : "2024-12-13T14:25:24.502274400Z",
         "assignedTags" : { },
         "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
       },
       "spec" : {
-        "localId" : "c22da58d-871b-4721-953d-a5128284a59e",
+        "localId" : "32c4c552-ebf8-4f75-8c77-0aea47de189d",
         "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-12-05T09:53:33.547095239Z",
+    "deletedOn" : "2024-12-13T14:25:24.502274400Z",
     "assignedTags" : { },
     "tenantIdentifier" : "test-workspace.test-project.aws.aws-meshstack-dev"
   },
   "spec" : {
-    "localId" : "c22da58d-871b-4721-953d-a5128284a59e",
+    "localId" : "32c4c552-ebf8-4f75-8c77-0aea47de189d",
     "landingZoneIdentifier" : "stage-dev",
     "quotas" : [ {
       "key" : "limits.cpu",
@@ -1058,7 +1058,7 @@ <h5 id="_delete_meshtenant">Delete meshTenant</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_user.html b/website/static/api/mesh_user.html
index 07a76b996..1a3f24d17 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" : "a7f2cd7d-ede8-4d92-8f84-21a63719c6e9",
+        "euid" : "d586c3f5-8ce4-41d5-9469-ea1d27395187",
         "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" : "a7f2cd7d-ede8-4d92-8f84-21a63719c6e9",
+    "euid" : "d586c3f5-8ce4-41d5-9469-ea1d27395187",
     "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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_workspace.html b/website/static/api/mesh_workspace.html
index 7475c59f1..2b6356a83 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-12-04T09:52:35Z"
+        "createdOn" : "2024-12-12T14:24:09Z"
       },
       "spec" : {
         "displayName" : "admin-customer",
@@ -600,7 +600,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-customer",
-        "createdOn" : "2024-12-04T09:52:35Z"
+        "createdOn" : "2024-12-12T14:24:09Z"
       },
       "spec" : {
         "displayName" : "demo-customer",
@@ -631,7 +631,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "apiVersion" : "v1",
       "metadata" : {
         "name" : "demo-partner",
-        "createdOn" : "2024-12-04T09:52:35Z"
+        "createdOn" : "2024-12-12T14:24:09Z"
       },
       "spec" : {
         "displayName" : "demo-partner",
@@ -847,7 +847,7 @@ <h5 id="_get_meshworkspace">Get meshWorkspace</h5>
   "apiVersion" : "v1",
   "metadata" : {
     "name" : "admin-customer",
-    "createdOn" : "2024-12-04T09:52:35Z"
+    "createdOn" : "2024-12-12T14:24:09Z"
   },
   "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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_workspace_bindings.html b/website/static/api/mesh_workspace_bindings.html
index e94a5509e..acf3640d2 100644
--- a/website/static/api/mesh_workspace_bindings.html
+++ b/website/static/api/mesh_workspace_bindings.html
@@ -1124,7 +1124,7 @@ <h5 id="_list_meshworkspacegroupbindings">List meshWorkspaceGroupBindings</h5>
       "kind" : "meshWorkspaceGroupBinding",
       "apiVersion" : "v2",
       "metadata" : {
-        "name" : "849f6844-4a00-41f3-a259-1b1876b32dcb"
+        "name" : "478a32f5-fa30-4f85-9d46-4639ec99e2e3"
       },
       "roleRef" : {
         "name" : "Workspace Manager"
@@ -1138,7 +1138,7 @@ <h5 id="_list_meshworkspacegroupbindings">List meshWorkspaceGroupBindings</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3"
         }
       }
     } ]
@@ -1185,7 +1185,7 @@ <h5 id="_get_meshworkspacegroupbinding">Get meshWorkspaceGroupBinding</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/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1194,7 +1194,7 @@ <h5 id="_get_meshworkspacegroupbinding">Get meshWorkspaceGroupBinding</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/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb' -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/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json'</code></pre>
 </div>
 </div>
@@ -1281,7 +1281,7 @@ <h5 id="_get_meshworkspacegroupbinding">Get meshWorkspaceGroupBinding</h5>
   "kind" : "meshWorkspaceGroupBinding",
   "apiVersion" : "v2",
   "metadata" : {
-    "name" : "849f6844-4a00-41f3-a259-1b1876b32dcb"
+    "name" : "478a32f5-fa30-4f85-9d46-4639ec99e2e3"
   },
   "roleRef" : {
     "name" : "Workspace Manager"
@@ -1295,7 +1295,7 @@ <h5 id="_get_meshworkspacegroupbinding">Get meshWorkspaceGroupBinding</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3"
     }
   }
 }</code></pre>
@@ -1559,7 +1559,7 @@ <h5 id="_delete_meshworkspacegroupbinding">Delete meshWorkspaceGroupBinding</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_workspaceusergroup.html b/website/static/api/mesh_workspaceusergroup.html
index 4004d7624..f9fc0c73b 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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/meshstack-openapi-docs.json b/website/static/api/meshstack-openapi-docs.json
index e56c7c8c5..d12433a48 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.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.",
           "required" : true,
           "schema" : {
             "type" : "string"
           },
-          "example" : "application/vnd.meshcloud.api.meshobjects.v2.hal+json"
+          "example" : "application/vnd.meshcloud.api.meshobjects.v1.hal+json"
         } ],
         "responses" : {
           "200" : {
             "description" : "200",
             "content" : {
-              "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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\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    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\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    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspacegroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\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}"
+                  "meshObjectsRootV1" : {
+                    "value" : "{\n  \"_links\" : {\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    \"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    \"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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\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.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    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\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    \"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    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
+                  "meshObjectsRootV2" : {
+                    "value" : "{\n  \"_links\" : {\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    \"meshworkspacegroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\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    \"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    \"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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\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    \"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}"
                   }
                 }
               }
@@ -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-12-04T09:53:22.098763344Z\"\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-12-04T09:53:22.146961264Z\"\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-12-12T14:25:10.067505556Z\"\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-12-12T14:25:10.118968516Z\"\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\": \"57971196-c2d7-466c-ab68-e3de9c9487de\"\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\": \"84d25b93-2534-4f2f-b96e-e8b47657facb\"\n    }]\n  }\n} "
                 }
               }
             }
@@ -512,7 +512,7 @@
                 },
                 "examples" : {
                   "meshBuildingBlockPost" : {
-                    "value" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"151bace2-358a-4aa5-97be-242964653aff\",\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-12-04T09:53:23.185770890Z\"\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\" : \"57971196-c2d7-466c-ab68-e3de9c9487de\",\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/151bace2-358a-4aa5-97be-242964653aff\"\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/151bace2-358a-4aa5-97be-242964653aff/purge\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"a2048c7f-72d7-4aa7-b79a-26fe62ec7772\",\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-12-12T14:25:11.256635344Z\"\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\" : \"84d25b93-2534-4f2f-b96e-e8b47657facb\",\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772\"\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/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\" : \"ipkl2mpmdsv2\"\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\" : \"ipkl2mpmdsv2\"\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=ipkl2mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&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\" : \"dury1mpmdsv2\"\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\" : \"dury1mpmdsv2\"\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=dury1mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&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\" : \"ipkl2mpdsv2\",\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/ipkl2mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&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\" : \"dury1mpdsv2\",\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/dury1mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&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,7 +681,7 @@
               },
               "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\" : \"ipkl2mpdsv2\"\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\" : \"dury1mpdsv2\"\n  }\n}"
                 }
               }
             }
@@ -697,7 +697,7 @@
                 },
                 "examples" : {
                   "meshProjectPost" : {
-                    "value" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\",\n    \"createdOn\" : \"2024-12-04T09:53:30.003792499Z\"\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/ipkl2mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\",\n    \"createdOn\" : \"2024-12-12T14:25:18.691059079Z\"\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/dury1mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&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\" : \"ipkl2mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"ipkl2mtdg1\",\n        \"instanceId\" : \"ipkl2mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"ipkl2mtdg12\",\n        \"serviceId\" : \"ipkl2mtdg5\",\n        \"planId\" : \"ipkl2mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/ipkl2mtdg11\"\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\" : \"dury1mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"dury1mtdg1\",\n        \"instanceId\" : \"dury1mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"dury1mtdg12\",\n        \"serviceId\" : \"dury1mtdg5\",\n        \"planId\" : \"dury1mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/dury1mtdg11\"\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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
+                  "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
                 }
               }
             }
@@ -854,7 +854,7 @@
                 },
                 "examples" : {
                   "meshServiceInstancePost" : {
-                    "value" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -1047,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-12-05T09:53:33.547095239Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"c22da58d-871b-4721-953d-a5128284a59e\",\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-12-13T14:25:24.502274400Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"32c4c552-ebf8-4f75-8c77-0aea47de189d\",\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}"
                   }
                 }
               }
@@ -1252,7 +1252,7 @@
                 },
                 "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\" : \"ea68029e-0b5f-4ef4-a332-ab475e15a588\",\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}"
+                    "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\" : \"0df33a51-2975-4dbd-97a5-0aabd2ea2709\",\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}"
                   }
                 }
               },
@@ -1262,7 +1262,7 @@
                 },
                 "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\" : \"a7f2cd7d-ede8-4d92-8f84-21a63719c6e9\",\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}"
+                    "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\" : \"d586c3f5-8ce4-41d5-9469-ea1d27395187\",\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}"
                   }
                 }
               }
@@ -1314,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-12-04T09:52:35Z\"\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-12-04T09:52:35Z\"\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-12-04T09:52:35Z\"\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-12-12T14:24:09Z\"\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-12-12T14:24:09Z\"\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-12-12T14:24:09Z\"\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}"
                   }
                 }
               }
@@ -1434,20 +1434,6 @@
         } ]
       }
     },
-    "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff" : {
-      "delete" : {
-        "tags" : [ "api" ],
-        "operationId" : "meshBuildingBlockDelete",
-        "responses" : {
-          "202" : {
-            "description" : "202"
-          }
-        },
-        "security" : [ {
-          "basic" : [ ]
-        } ]
-      }
-    },
     "/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720" : {
       "get" : {
         "tags" : [ "api" ],
@@ -1472,7 +1458,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-12-04T09:53:22.146961264Z\"\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-12-12T14:25:10.118968516Z\"\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}"
                   }
                 }
               }
@@ -1484,6 +1470,20 @@
         } ]
       }
     },
+    "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772" : {
+      "delete" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshBuildingBlockDelete",
+        "responses" : {
+          "202" : {
+            "description" : "202"
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
+      }
+    },
     "/api/meshobjects/meshpaymentmethods/test-payment-method-1" : {
       "get" : {
         "tags" : [ "api" ],
@@ -1508,7 +1508,7 @@
                 },
                 "examples" : {
                   "meshPaymentMethodV2" : {
-                    "value" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"ipkl2mpmdsv2\"\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\" : \"dury1mpmdsv2\"\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}"
                   }
                 }
               }
@@ -1560,7 +1560,7 @@
                 },
                 "examples" : {
                   "meshProjectGroupBindingListV3" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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\" : \"ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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}"
                   }
                 }
               }
@@ -1669,7 +1669,7 @@
                 },
                 "examples" : {
                   "meshProjectUserBindingListV3" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"7247a370-817a-4440-96ca-992ab87726bf\"\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/7247a370-817a-4440-96ca-992ab87726bf\"\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\" : \"a952d9e1-5589-47eb-926e-c84e7702c836\"\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/a952d9e1-5589-47eb-926e-c84e7702c836\"\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}"
                   }
                 }
               }
@@ -1738,7 +1738,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1" : {
+    "/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectV2",
@@ -1762,7 +1762,7 @@
                 },
                 "examples" : {
                   "meshProjectV2" : {
-                    "value" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-12-04T09:53:30.533407962Z\"\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/ipkl2mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-12-12T14:25:19.247376253Z\"\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/dury1mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -1806,7 +1806,7 @@
                 },
                 "examples" : {
                   "meshServiceInstanceGet" : {
-                    "value" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -1843,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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
+                  "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
                 }
               }
             }
@@ -2038,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-12-05T09:53:33.547095239Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"c22da58d-871b-4721-953d-a5128284a59e\",\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-12-13T14:25:24.502274400Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"32c4c552-ebf8-4f75-8c77-0aea47de189d\",\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}"
                   }
                 }
               }
@@ -2071,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\" : \"a7f2cd7d-ede8-4d92-8f84-21a63719c6e9\",\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\" : \"0df33a51-2975-4dbd-97a5-0aabd2ea2709\",\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\" : \"ea68029e-0b5f-4ef4-a332-ab475e15a588\",\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\" : \"d586c3f5-8ce4-41d5-9469-ea1d27395187\",\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}"
                   }
                 }
               }
@@ -2150,7 +2150,7 @@
                 },
                 "examples" : {
                   "meshWorkspaceGroupBindingList" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceGroupBindings\" : [ {\n      \"kind\" : \"meshWorkspaceGroupBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"849f6844-4a00-41f3-a259-1b1876b32dcb\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings?username=john.doe49a0&workspaceRole=Workspace%20Manager\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceGroupBindings\" : [ {\n      \"kind\" : \"meshWorkspaceGroupBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings?username=john.doe49a0&workspaceRole=Workspace%20Manager\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -2360,7 +2360,7 @@
                 },
                 "examples" : {
                   "meshWorkspace" : {
-                    "value" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-12-04T09:52:35Z\"\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-12-12T14:24:09Z\"\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}"
                   }
                 }
               }
@@ -2408,7 +2408,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge" : {
+    "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge" : {
       "delete" : {
         "tags" : [ "api" ],
         "operationId" : "meshBuildingBlockForcePurge",
@@ -2422,7 +2422,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba" : {
+    "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectGroupBindingV3",
@@ -2446,7 +2446,7 @@
                 },
                 "examples" : {
                   "meshProjectGroupBindingV3" : {
-                    "value" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -2470,7 +2470,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf" : {
+    "/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectUserBindingV3",
@@ -2494,7 +2494,7 @@
                 },
                 "examples" : {
                   "meshProjectUserBindingV3" : {
-                    "value" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"7247a370-817a-4440-96ca-992ab87726bf\"\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/7247a370-817a-4440-96ca-992ab87726bf\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"a952d9e1-5589-47eb-926e-c84e7702c836\"\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/a952d9e1-5589-47eb-926e-c84e7702c836\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -2520,7 +2520,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb" : {
+    "/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshWorkspaceGroupBinding",
@@ -2544,7 +2544,7 @@
                 },
                 "examples" : {
                   "meshWorkspaceGroupBinding" : {
-                    "value" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"849f6844-4a00-41f3-a259-1b1876b32dcb\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Manager\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Manager\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -3185,43 +3185,6 @@
           }
         }
       },
-      "meshUserListV2" : {
-        "title" : "meshUserListV2",
-        "required" : [ "_embedded", "_links", "page" ],
-        "type" : "object",
-        "properties" : {
-          "_links" : {
-            "type" : "object",
-            "description" : "Currently only contains the self link and <<paging,pagination>> links."
-          },
-          "_embedded" : {
-            "required" : [ "meshUsers" ],
-            "type" : "object",
-            "properties" : {
-              "meshUsers" : {
-                "type" : "array",
-                "description" : "List of <<mesh_user_response_fields,meshUser>>.",
-                "items" : {
-                  "oneOf" : [ {
-                    "type" : "object"
-                  }, {
-                    "type" : "boolean"
-                  }, {
-                    "type" : "string"
-                  }, {
-                    "type" : "number"
-                  } ]
-                }
-              }
-            },
-            "description" : "Contains the actual content of the paged response."
-          },
-          "page" : {
-            "type" : "object",
-            "description" : "See <<paging,Paging information>>."
-          }
-        }
-      },
       "meshBuildingBlockPost" : {
         "title" : "meshBuildingBlockPost",
         "required" : [ "_links", "apiVersion", "kind", "metadata", "spec", "status" ],
@@ -3359,6 +3322,43 @@
           }
         }
       },
+      "meshUserListV2" : {
+        "title" : "meshUserListV2",
+        "required" : [ "_embedded", "_links", "page" ],
+        "type" : "object",
+        "properties" : {
+          "_links" : {
+            "type" : "object",
+            "description" : "Currently only contains the self link and <<paging,pagination>> links."
+          },
+          "_embedded" : {
+            "required" : [ "meshUsers" ],
+            "type" : "object",
+            "properties" : {
+              "meshUsers" : {
+                "type" : "array",
+                "description" : "List of <<mesh_user_response_fields,meshUser>>.",
+                "items" : {
+                  "oneOf" : [ {
+                    "type" : "object"
+                  }, {
+                    "type" : "boolean"
+                  }, {
+                    "type" : "string"
+                  }, {
+                    "type" : "number"
+                  } ]
+                }
+              }
+            },
+            "description" : "Contains the actual content of the paged response."
+          },
+          "page" : {
+            "type" : "object",
+            "description" : "See <<paging,Paging information>>."
+          }
+        }
+      },
       "api-meshobjectcollections-319085079" : {
         "required" : [ "name", "owner" ],
         "type" : "object",
@@ -4161,7 +4161,7 @@
           }
         }
       },
-      "api-meshobjects-meshserviceinstances-343819711" : {
+      "api-meshobjects-meshserviceinstances-serviceInstanceId-343819711" : {
         "required" : [ "apiVersion", "kind", "metadata", "spec" ],
         "type" : "object",
         "properties" : {
@@ -4973,6 +4973,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" ],
@@ -5041,67 +5102,6 @@
           }
         }
       },
-      "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."
-          }
-        }
-      },
       "meshWorkspaceGroupBindingList" : {
         "title" : "meshWorkspaceGroupBindingList",
         "required" : [ "_links", "page" ],
diff --git a/website/static/api/meshstack-postman-collection-original.json b/website/static/api/meshstack-postman-collection-original.json
index 5dfc6359b..a241c65bc 100644
--- a/website/static/api/meshstack-postman-collection-original.json
+++ b/website/static/api/meshstack-postman-collection-original.json
@@ -205,7 +205,7 @@
       "code" : 201
     } ]
   }, {
-    "id" : "meshObjectsRootV2",
+    "id" : "meshObjectsRootV1",
     "name" : "/api/meshobjects",
     "variable" : [ ],
     "event" : [ ],
@@ -219,14 +219,14 @@
       "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."
       } ]
     },
     "response" : [ {
-      "id" : "meshObjectsRootV2",
-      "name" : "meshObjectsRootV2",
+      "id" : "meshObjectsRootV1",
+      "name" : "meshObjectsRootV1",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -237,22 +237,22 @@
         "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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\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    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\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    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspacegroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\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}",
+      "body" : "{\n  \"_links\" : {\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    \"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    \"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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\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}",
       "code" : 200
     }, {
-      "id" : "meshObjectsRootV1",
-      "name" : "meshObjectsRootV1",
+      "id" : "meshObjectsRootV2",
+      "name" : "meshObjectsRootV2",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -263,18 +263,18 @@
         "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    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\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    \"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    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\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    \"meshworkspacegroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\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    \"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    \"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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\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    \"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}",
       "code" : 200
     } ]
   }, {
@@ -474,6 +474,73 @@
       "body" : "{\n  \"kind\" : \"meshBuildingBlockRun\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"b3116611-e08b-4b00-91c5-10365b25a6ef\"\n  },\n  \"spec\" : {\n    \"runNumber\" : 1,\n    \"buildingBlock\" : {\n      \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"spec\" : {\n        \"displayName\" : \"block\",\n        \"workspaceIdentifier\" : \"workspace\",\n        \"projectIdentifier\" : \"project\",\n        \"fullPlatformIdentifier\" : \"azure\",\n        \"inputs\" : [ {\n          \"key\" : \"variable-name\",\n          \"value\" : \"some-value\",\n          \"type\" : \"STRING\",\n          \"isSensitive\" : false,\n          \"isEnvironment\" : false\n        } ],\n        \"parentBuildingBlocks\" : [ ]\n      }\n    },\n    \"buildingBlockDefinition\" : {\n      \"uuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"spec\" : {\n        \"version\" : 1,\n        \"implementation\" : {\n          \"type\" : \"TERRAFORM\",\n          \"terraformVersion\" : \"v1\",\n          \"repositoryUrl\" : \"https://example.com\",\n          \"async\" : true\n        }\n      }\n    },\n    \"behavior\" : \"APPLY\"\n  },\n  \"status\" : \"IN_PROGRESS\",\n  \"_links\" : {\n    \"registerSource\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns/b3116611-e08b-4b00-91c5-10365b25a6ef/status/source\"\n    },\n    \"updateSource\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns/b3116611-e08b-4b00-91c5-10365b25a6ef/status/source/{sourceId}\",\n      \"templated\" : true\n    },\n    \"meshstackBaseUrl\" : {\n      \"href\" : \"https://mesh-backend-url\"\n    }\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshBuildingBlockPost",
+    "name" : "/api/meshobjects/meshbuildingblocks",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshbuildingblocks",
+        "port" : "8080"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as a `Content-Type` header."
+      }, {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+      } ],
+      "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\": \"84d25b93-2534-4f2f-b96e-e8b47657facb\"\n    }]\n  }\n} ",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshBuildingBlockPost",
+      "name" : "meshBuildingBlockPost",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshbuildingblocks",
+          "port" : "8080"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as a `Content-Type` header."
+        }, {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        } ],
+        "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\": \"84d25b93-2534-4f2f-b96e-e8b47657facb\"\n    }]\n  }\n} ",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"a2048c7f-72d7-4aa7-b79a-26fe62ec7772\",\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-12-12T14:25:11.256635344Z\"\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\" : \"84d25b93-2534-4f2f-b96e-e8b47657facb\",\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772\"\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge\"\n    }\n  }\n}",
+      "code" : 201
+    } ]
   }, {
     "id" : "meshBuildingBlockList",
     "name" : "/api/meshobjects/meshbuildingblocks",
@@ -592,76 +659,9 @@
         "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-12-04T09:53:22.098763344Z\"\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-12-04T09:53:22.146961264Z\"\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-12-12T14:25:10.067505556Z\"\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-12-12T14:25:10.118968516Z\"\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
     } ]
-  }, {
-    "id" : "meshBuildingBlockPost",
-    "name" : "/api/meshobjects/meshbuildingblocks",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-        "protocol" : "https",
-        "host" : "localhost",
-        "path" : "/api/meshobjects/meshbuildingblocks",
-        "port" : "8080"
-      },
-      "method" : "POST",
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as a `Content-Type` header."
-      }, {
-        "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
-      } ],
-      "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\": \"57971196-c2d7-466c-ab68-e3de9c9487de\"\n    }]\n  }\n} ",
-        "urlencoded" : [ ]
-      }
-    },
-    "response" : [ {
-      "id" : "meshBuildingBlockPost",
-      "name" : "meshBuildingBlockPost",
-      "originalRequest" : {
-        "url" : {
-          "protocol" : "https",
-          "host" : "localhost",
-          "path" : "/api/meshobjects/meshbuildingblocks",
-          "port" : "8080"
-        },
-        "method" : "POST",
-        "header" : [ {
-          "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as a `Content-Type` header."
-        }, {
-          "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
-        } ],
-        "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\": \"57971196-c2d7-466c-ab68-e3de9c9487de\"\n    }]\n  }\n} ",
-          "urlencoded" : [ ]
-        }
-      },
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
-        "disabled" : false
-      } ],
-      "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"151bace2-358a-4aa5-97be-242964653aff\",\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-12-04T09:53:23.185770890Z\"\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\" : \"57971196-c2d7-466c-ab68-e3de9c9487de\",\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/151bace2-358a-4aa5-97be-242964653aff\"\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/151bace2-358a-4aa5-97be-242964653aff/purge\"\n    }\n  }\n}",
-      "code" : 201
-    } ]
   }, {
     "id" : "meshPaymentMethodListV2",
     "name" : "/api/meshobjects/meshpaymentmethods",
@@ -732,9 +732,76 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"ipkl2mpmdsv2\"\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\" : \"ipkl2mpmdsv2\"\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=ipkl2mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&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\" : \"dury1mpmdsv2\"\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\" : \"dury1mpmdsv2\"\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=dury1mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&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" : "meshProjectPost",
+    "name" : "/api/meshobjects/meshprojects",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshprojects",
+        "port" : "8080"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "You should use `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an Content-Type header."
+      }, {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.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\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\"\n  }\n}",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshProjectPost",
+      "name" : "meshProjectPost",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshprojects",
+          "port" : "8080"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "You should use `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an Content-Type header."
+        }, {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.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\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\"\n  }\n}",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\",\n    \"createdOn\" : \"2024-12-12T14:25:18.691059079Z\"\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/dury1mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}",
+      "code" : 201
+    } ]
   }, {
     "id" : "meshProjectListV2",
     "name" : "/api/meshobjects/meshprojects",
@@ -813,75 +880,76 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"ipkl2mpdsv2\",\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/ipkl2mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&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}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"dury1mpdsv2\",\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/dury1mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&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" : "meshProjectPost",
-    "name" : "/api/meshobjects/meshprojects",
+    "id" : "meshServiceInstancePost",
+    "name" : "/api/meshobjects/meshserviceinstances",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojects",
+        "path" : "/api/meshobjects/meshserviceinstances",
         "port" : "8080"
       },
       "method" : "POST",
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
         "disabled" : false,
-        "description" : "You should use `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an Content-Type header."
+        "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.meshproject.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
+        "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\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\"\n  }\n}",
+        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "meshProjectPost",
-      "name" : "meshProjectPost",
+      "id" : "meshServiceInstancePost",
+      "name" : "meshServiceInstancePost",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojects",
+          "path" : "/api/meshobjects/meshserviceinstances",
           "port" : "8080"
         },
         "method" : "POST",
         "header" : [ {
           "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8",
+          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
           "disabled" : false,
-          "description" : "You should use `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an Content-Type header."
+          "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.meshproject.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
+          "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\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\"\n  }\n}",
+          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
           "urlencoded" : [ ]
         }
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
-        "disabled" : false
+        "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\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\",\n    \"createdOn\" : \"2024-12-04T09:53:30.003792499Z\"\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/ipkl2mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}",
-      "code" : 201
+      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
+      "code" : 200
     } ]
   }, {
     "id" : "meshServiceInstanceListV2",
@@ -985,75 +1053,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"ipkl2mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"ipkl2mtdg1\",\n        \"instanceId\" : \"ipkl2mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"ipkl2mtdg12\",\n        \"serviceId\" : \"ipkl2mtdg5\",\n        \"planId\" : \"ipkl2mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/ipkl2mtdg11\"\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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"dury1mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"dury1mtdg1\",\n        \"instanceId\" : \"dury1mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"dury1mtdg12\",\n        \"serviceId\" : \"dury1mtdg5\",\n        \"planId\" : \"dury1mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/dury1mtdg11\"\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
     } ]
   }, {
@@ -1188,73 +1188,6 @@
       "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" : "meshTenantPost",
-    "name" : "/api/meshobjects/meshtenants",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-        "protocol" : "https",
-        "host" : "localhost",
-        "path" : "/api/meshobjects/meshtenants",
-        "port" : "8080"
-      },
-      "method" : "POST",
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json;charset=UTF-8",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as a `Content-Type` header."
-      }, {
-        "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.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\": \"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} ",
-        "urlencoded" : [ ]
-      }
-    },
-    "response" : [ {
-      "id" : "meshTenantPost",
-      "name" : "meshTenantPost",
-      "originalRequest" : {
-        "url" : {
-          "protocol" : "https",
-          "host" : "localhost",
-          "path" : "/api/meshobjects/meshtenants",
-          "port" : "8080"
-        },
-        "method" : "POST",
-        "header" : [ {
-          "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json;charset=UTF-8",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as a `Content-Type` header."
-        }, {
-          "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.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\": \"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} ",
-          "urlencoded" : [ ]
-        }
-      },
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
-        "disabled" : false
-      } ],
-      "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.azure.meshcloud-azure-dev\"\n  },\n  \"spec\" : {\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=azure.meshcloud-azure-dev\"\n    }\n  }\n}",
-      "code" : 201
-    } ]
   }, {
     "id" : "meshTenantListV3",
     "name" : "/api/meshobjects/meshtenants",
@@ -1340,8 +1273,75 @@
           "key" : "Accept",
           "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as an `Accept` header to be guaranteed the V3 response format of this endpoint. New versions might be added in future."
-        } ]
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as an `Accept` header to be guaranteed the V3 response format of this endpoint. New versions might be added in future."
+        } ]
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
+        "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-12-13T14:25:24.502274400Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"32c4c552-ebf8-4f75-8c77-0aea47de189d\",\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
+    } ]
+  }, {
+    "id" : "meshTenantPost",
+    "name" : "/api/meshobjects/meshtenants",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshtenants",
+        "port" : "8080"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as a `Content-Type` header."
+      }, {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.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\": \"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} ",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshTenantPost",
+      "name" : "meshTenantPost",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshtenants",
+          "port" : "8080"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as a `Content-Type` header."
+        }, {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.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\": \"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} ",
+          "urlencoded" : [ ]
+        }
       },
       "header" : [ {
         "key" : "Content-Type",
@@ -1349,8 +1349,8 @@
         "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-12-05T09:53:33.547095239Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"c22da58d-871b-4721-953d-a5128284a59e\",\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
+      "body" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.azure.meshcloud-azure-dev\"\n  },\n  \"spec\" : {\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=azure.meshcloud-azure-dev\"\n    }\n  }\n}",
+      "code" : 201
     } ]
   }, {
     "id" : "meshUserListV1",
@@ -1502,7 +1502,7 @@
         "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\" : \"ea68029e-0b5f-4ef4-a332-ab475e15a588\",\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\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"0df33a51-2975-4dbd-97a5-0aabd2ea2709\",\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" : "meshUserListV2",
@@ -1577,7 +1577,7 @@
         "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\" : \"a7f2cd7d-ede8-4d92-8f84-21a63719c6e9\",\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\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"d586c3f5-8ce4-41d5-9469-ea1d27395187\",\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
     } ]
   }, {
@@ -1642,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-12-04T09:52:35Z\"\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-12-04T09:52:35Z\"\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-12-04T09:52:35Z\"\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-12-12T14:24:09Z\"\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-12-12T14:24:09Z\"\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-12-12T14:24:09Z\"\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
     } ]
   }, {
@@ -1781,35 +1781,6 @@
       "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/151bace2-358a-4aa5-97be-242964653aff",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-        "protocol" : "https",
-        "host" : "localhost",
-        "path" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff",
-        "port" : "8080"
-      },
-      "method" : "DELETE"
-    },
-    "response" : [ {
-      "id" : "meshBuildingBlockDelete",
-      "name" : "meshBuildingBlockDelete",
-      "originalRequest" : {
-        "url" : {
-          "protocol" : "https",
-          "host" : "localhost",
-          "path" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff",
-          "port" : "8080"
-        },
-        "method" : "DELETE"
-      },
-      "cookie" : [ ],
-      "code" : 202
-    } ]
   }, {
     "id" : "meshBuildingBlock",
     "name" : "/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720",
@@ -1854,9 +1825,38 @@
         "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-12-04T09:53:22.146961264Z\"\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-12-12T14:25:10.118968516Z\"\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772",
+        "port" : "8080"
+      },
+      "method" : "DELETE"
+    },
+    "response" : [ {
+      "id" : "meshBuildingBlockDelete",
+      "name" : "meshBuildingBlockDelete",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772",
+          "port" : "8080"
+        },
+        "method" : "DELETE"
+      },
+      "cookie" : [ ],
+      "code" : 202
+    } ]
   }, {
     "id" : "meshPaymentMethodV2",
     "name" : "/api/meshobjects/meshpaymentmethods/test-payment-method-1",
@@ -1901,7 +1901,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"ipkl2mpmdsv2\"\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\" : \"dury1mpmdsv2\"\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
     } ]
   }, {
@@ -1966,7 +1966,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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\" : \"ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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
     } ]
   }, {
@@ -2037,7 +2037,7 @@
       "code" : 200
     } ]
   }, {
-    "id" : "meshProjectUserBindingListV3",
+    "id" : "meshProjectUserBindingCreateV3",
     "name" : "/api/meshobjects/meshprojectbindings/userbindings",
     "variable" : [ ],
     "event" : [ ],
@@ -2046,51 +2046,53 @@
         "protocol" : "https",
         "host" : "localhost",
         "path" : "/api/meshobjects/meshprojectbindings/userbindings",
-        "port" : "8080",
-        "query" : [ {
-          "key" : "workspaceIdentifier",
-          "disabled" : false,
-          "description" : "The identifier of the workspace the project with the bindings belongs to."
-        }, {
-          "key" : "projectIdentifier",
-          "disabled" : false,
-          "description" : "The project identifier of the project that contains the requested bindings."
-        } ]
+        "port" : "8080"
       },
-      "method" : "GET",
+      "method" : "POST",
       "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as a `Content-Type` header."
+      }, {
         "key" : "Accept",
         "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as an `Accept` header to be guaranteed the expected 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.meshprojectuserbinding.v3.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\": \"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}  ",
+        "urlencoded" : [ ]
+      }
     },
     "response" : [ {
-      "id" : "meshProjectUserBindingListV3",
-      "name" : "meshProjectUserBindingListV3",
+      "id" : "meshProjectUserBindingCreateV3",
+      "name" : "meshProjectUserBindingCreateV3",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
           "path" : "/api/meshobjects/meshprojectbindings/userbindings",
-          "port" : "8080",
-          "query" : [ {
-            "key" : "workspaceIdentifier",
-            "disabled" : false,
-            "description" : "The identifier of the workspace the project with the bindings belongs to."
-          }, {
-            "key" : "projectIdentifier",
-            "disabled" : false,
-            "description" : "The project identifier of the project that contains the requested bindings."
-          } ]
+          "port" : "8080"
         },
-        "method" : "GET",
+        "method" : "POST",
         "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as a `Content-Type` header."
+        }, {
           "key" : "Accept",
           "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as an `Accept` header to be guaranteed the expected 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.meshprojectuserbinding.v3.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\": \"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}  ",
+          "urlencoded" : [ ]
+        }
       },
       "header" : [ {
         "key" : "Content-Type",
@@ -2098,11 +2100,11 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"7247a370-817a-4440-96ca-992ab87726bf\"\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/7247a370-817a-4440-96ca-992ab87726bf\"\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  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"user-binding-name\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project Reader\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username3\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/user-binding-name\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
-    "id" : "meshProjectUserBindingCreateV3",
+    "id" : "meshProjectUserBindingListV3",
     "name" : "/api/meshobjects/meshprojectbindings/userbindings",
     "variable" : [ ],
     "event" : [ ],
@@ -2111,53 +2113,51 @@
         "protocol" : "https",
         "host" : "localhost",
         "path" : "/api/meshobjects/meshprojectbindings/userbindings",
-        "port" : "8080"
+        "port" : "8080",
+        "query" : [ {
+          "key" : "workspaceIdentifier",
+          "disabled" : false,
+          "description" : "The identifier of the workspace the project with the bindings belongs to."
+        }, {
+          "key" : "projectIdentifier",
+          "disabled" : false,
+          "description" : "The project identifier of the project that contains the requested bindings."
+        } ]
       },
-      "method" : "POST",
+      "method" : "GET",
       "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json;charset=UTF-8",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as a `Content-Type` header."
-      }, {
         "key" : "Accept",
         "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.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\": \"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}  ",
-        "urlencoded" : [ ]
-      }
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions will be added in future."
+      } ]
     },
     "response" : [ {
-      "id" : "meshProjectUserBindingCreateV3",
-      "name" : "meshProjectUserBindingCreateV3",
+      "id" : "meshProjectUserBindingListV3",
+      "name" : "meshProjectUserBindingListV3",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
           "path" : "/api/meshobjects/meshprojectbindings/userbindings",
-          "port" : "8080"
+          "port" : "8080",
+          "query" : [ {
+            "key" : "workspaceIdentifier",
+            "disabled" : false,
+            "description" : "The identifier of the workspace the project with the bindings belongs to."
+          }, {
+            "key" : "projectIdentifier",
+            "disabled" : false,
+            "description" : "The project identifier of the project that contains the requested bindings."
+          } ]
         },
-        "method" : "POST",
+        "method" : "GET",
         "header" : [ {
-          "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json;charset=UTF-8",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as a `Content-Type` header."
-        }, {
           "key" : "Accept",
           "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.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\": \"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}  ",
-          "urlencoded" : [ ]
-        }
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions will be added in future."
+        } ]
       },
       "header" : [ {
         "key" : "Content-Type",
@@ -2165,19 +2165,19 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"user-binding-name\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project Reader\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-project-1\",\n    \"displayName\" : \"Test Project 1\",\n    \"ownedByWorkspace\" : \"test-workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"username3\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/userbindings/user-binding-name\"\n    }\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"a952d9e1-5589-47eb-926e-c84e7702c836\"\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/a952d9e1-5589-47eb-926e-c84e7702c836\"\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
     } ]
   }, {
     "id" : "meshProjectV2",
-    "name" : "/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1",
+    "name" : "/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1",
+        "path" : "/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1",
         "port" : "8080"
       },
       "method" : "GET",
@@ -2195,7 +2195,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1",
+          "path" : "/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1",
           "port" : "8080"
         },
         "method" : "GET",
@@ -2212,11 +2212,11 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-12-04T09:53:30.533407962Z\"\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/ipkl2mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-12-12T14:25:19.247376253Z\"\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/dury1mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
-    "id" : "meshServiceInstancePut",
+    "id" : "meshServiceInstanceDelete",
     "name" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
     "variable" : [ ],
     "event" : [ ],
@@ -2227,27 +2227,11 @@
         "path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
         "port" : "8080"
       },
-      "method" : "PUT",
-      "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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
-        "urlencoded" : [ ]
-      }
+      "method" : "DELETE"
     },
     "response" : [ {
-      "id" : "meshServiceInstancePut",
-      "name" : "meshServiceInstancePut",
+      "id" : "meshServiceInstanceDelete",
+      "name" : "meshServiceInstanceDelete",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -2255,29 +2239,13 @@
           "path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
           "port" : "8080"
         },
-        "method" : "PUT",
-        "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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
-          "urlencoded" : [ ]
-        }
+        "method" : "DELETE"
       },
       "cookie" : [ ],
       "code" : 202
     } ]
   }, {
-    "id" : "meshServiceInstanceDelete",
+    "id" : "meshServiceInstanceGet",
     "name" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
     "variable" : [ ],
     "event" : [ ],
@@ -2288,11 +2256,17 @@
         "path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
         "port" : "8080"
       },
-      "method" : "DELETE"
+      "method" : "GET",
+      "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 a `Content-Type` header."
+      } ]
     },
     "response" : [ {
-      "id" : "meshServiceInstanceDelete",
-      "name" : "meshServiceInstanceDelete",
+      "id" : "meshServiceInstanceGet",
+      "name" : "meshServiceInstanceGet",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -2300,13 +2274,26 @@
           "path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
           "port" : "8080"
         },
-        "method" : "DELETE"
+        "method" : "GET",
+        "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 a `Content-Type` header."
+        } ]
       },
+      "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" : [ ],
-      "code" : 202
+      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
+      "code" : 200
     } ]
   }, {
-    "id" : "meshServiceInstanceGet",
+    "id" : "meshServiceInstancePut",
     "name" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
     "variable" : [ ],
     "event" : [ ],
@@ -2317,17 +2304,27 @@
         "path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
         "port" : "8080"
       },
-      "method" : "GET",
+      "method" : "PUT",
       "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 a `Content-Type` header."
-      } ]
+        "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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+        "urlencoded" : [ ]
+      }
     },
     "response" : [ {
-      "id" : "meshServiceInstanceGet",
-      "name" : "meshServiceInstanceGet",
+      "id" : "meshServiceInstancePut",
+      "name" : "meshServiceInstancePut",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -2335,23 +2332,26 @@
           "path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
           "port" : "8080"
         },
-        "method" : "GET",
+        "method" : "PUT",
         "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 a `Content-Type` header."
-        } ]
+          "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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
-      "code" : 200
+      "code" : 202
     } ]
   }, {
     "id" : "meshTagDefinition",
@@ -2588,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-12-05T09:53:33.547095239Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"c22da58d-871b-4721-953d-a5128284a59e\",\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-12-13T14:25:24.502274400Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"32c4c552-ebf8-4f75-8c77-0aea47de189d\",\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
     } ]
   }, {
@@ -2621,7 +2621,7 @@
       "code" : 202
     } ]
   }, {
-    "id" : "meshUserV2",
+    "id" : "meshUserV1",
     "name" : "/api/meshobjects/meshusers/john-doe",
     "variable" : [ ],
     "event" : [ ],
@@ -2635,14 +2635,14 @@
       "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",
+      "id" : "meshUserV1",
+      "name" : "meshUserV1",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -2653,22 +2653,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  \"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\" : \"a7f2cd7d-ede8-4d92-8f84-21a63719c6e9\",\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}",
+      "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\" : \"0df33a51-2975-4dbd-97a5-0aabd2ea2709\",\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" : "meshUserV1",
-      "name" : "meshUserV1",
+      "id" : "meshUserV2",
+      "name" : "meshUserV2",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -2679,18 +2679,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  \"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\" : \"ea68029e-0b5f-4ef4-a332-ab475e15a588\",\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\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"d586c3f5-8ce4-41d5-9469-ea1d27395187\",\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
     } ]
   }, {
@@ -2755,7 +2755,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceGroupBindings\" : [ {\n      \"kind\" : \"meshWorkspaceGroupBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"849f6844-4a00-41f3-a259-1b1876b32dcb\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings?username=john.doe49a0&workspaceRole=Workspace%20Manager\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceGroupBindings\" : [ {\n      \"kind\" : \"meshWorkspaceGroupBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings?username=john.doe49a0&workspaceRole=Workspace%20Manager\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2825,6 +2825,73 @@
       "body" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"my-group-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\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/my-group-binding-name\"\n    }\n  }\n}",
       "code" : 201
     } ]
+  }, {
+    "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\" : \"john.doe49a0\"\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\" : \"john.doe49a0\"\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\" : \"john.doe49a0\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/another-user-binding-name\"\n    }\n  }\n}",
+      "code" : 201
+    } ]
   }, {
     "id" : "meshWorkspaceUserBindingList",
     "name" : "/api/meshobjects/meshworkspacebindings/userbindings",
@@ -2898,73 +2965,6 @@
       "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\" : \"john.doe49a0\"\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=john.doe49a0&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\" : \"john.doe49a0\"\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\" : \"john.doe49a0\"\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\" : \"john.doe49a0\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/another-user-binding-name\"\n    }\n  }\n}",
-      "code" : 201
-    } ]
   }, {
     "id" : "meshWorkspace",
     "name" : "/api/meshobjects/meshworkspaces/admin-customer",
@@ -3009,7 +3009,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-12-04T09:52:35Z\"\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-12-12T14:24:09Z\"\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
     } ]
   }, {
@@ -3061,14 +3061,14 @@
     } ]
   }, {
     "id" : "meshBuildingBlockForcePurge",
-    "name" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge",
+    "name" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge",
+        "path" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge",
         "port" : "8080"
       },
       "method" : "DELETE"
@@ -3080,7 +3080,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge",
+          "path" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge",
           "port" : "8080"
         },
         "method" : "DELETE"
@@ -3088,16 +3088,45 @@
       "cookie" : [ ],
       "code" : 202
     } ]
+  }, {
+    "id" : "meshProjectGroupBindingDeleteV3",
+    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+        "protocol" : "https",
+        "host" : "localhost",
+        "path" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
+        "port" : "8080"
+      },
+      "method" : "DELETE"
+    },
+    "response" : [ {
+      "id" : "meshProjectGroupBindingDeleteV3",
+      "name" : "meshProjectGroupBindingDeleteV3",
+      "originalRequest" : {
+        "url" : {
+          "protocol" : "https",
+          "host" : "localhost",
+          "path" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
+          "port" : "8080"
+        },
+        "method" : "DELETE"
+      },
+      "cookie" : [ ],
+      "code" : 204
+    } ]
   }, {
     "id" : "meshProjectGroupBindingV3",
-    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
+    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
+        "path" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
         "port" : "8080"
       },
       "method" : "GET",
@@ -3115,7 +3144,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
+          "path" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
           "port" : "8080"
         },
         "method" : "GET",
@@ -3132,48 +3161,19 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\n    }\n  }\n}",
       "code" : 200
     } ]
-  }, {
-    "id" : "meshProjectGroupBindingDeleteV3",
-    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-        "protocol" : "https",
-        "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
-        "port" : "8080"
-      },
-      "method" : "DELETE"
-    },
-    "response" : [ {
-      "id" : "meshProjectGroupBindingDeleteV3",
-      "name" : "meshProjectGroupBindingDeleteV3",
-      "originalRequest" : {
-        "url" : {
-          "protocol" : "https",
-          "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
-          "port" : "8080"
-        },
-        "method" : "DELETE"
-      },
-      "cookie" : [ ],
-      "code" : 204
-    } ]
   }, {
     "id" : "meshProjectUserBindingV3",
-    "name" : "/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf",
+    "name" : "/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf",
+        "path" : "/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836",
         "port" : "8080"
       },
       "method" : "GET",
@@ -3191,7 +3191,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf",
+          "path" : "/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836",
           "port" : "8080"
         },
         "method" : "GET",
@@ -3208,7 +3208,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"7247a370-817a-4440-96ca-992ab87726bf\"\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/7247a370-817a-4440-96ca-992ab87726bf\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"a952d9e1-5589-47eb-926e-c84e7702c836\"\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/a952d9e1-5589-47eb-926e-c84e7702c836\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -3242,14 +3242,14 @@
     } ]
   }, {
     "id" : "meshWorkspaceGroupBinding",
-    "name" : "/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb",
+    "name" : "/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb",
+        "path" : "/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3",
         "port" : "8080"
       },
       "method" : "GET",
@@ -3267,7 +3267,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb",
+          "path" : "/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3",
           "port" : "8080"
         },
         "method" : "GET",
@@ -3284,7 +3284,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"849f6844-4a00-41f3-a259-1b1876b32dcb\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Manager\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Manager\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
diff --git a/website/static/api/meshstack-postman-collection.json b/website/static/api/meshstack-postman-collection.json
index 6de31e6dd..eaadedceb 100644
--- a/website/static/api/meshstack-postman-collection.json
+++ b/website/static/api/meshstack-postman-collection.json
@@ -197,7 +197,7 @@
       "code" : 201
     } ]
   }, {
-    "id" : "meshObjectsRootV2",
+    "id" : "meshObjectsRootV1",
     "name" : "/api/meshobjects",
     "variable" : [ ],
     "event" : [ ],
@@ -210,14 +210,14 @@
       "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."
       } ]
     },
     "response" : [ {
-      "id" : "meshObjectsRootV2",
-      "name" : "meshObjectsRootV2",
+      "id" : "meshObjectsRootV1",
+      "name" : "meshObjectsRootV1",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects",
@@ -227,22 +227,22 @@
         "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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\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    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\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    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspacegroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\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}",
+      "body" : "{\n  \"_links\" : {\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    \"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    \"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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\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}",
       "code" : 200
     }, {
-      "id" : "meshObjectsRootV1",
-      "name" : "meshObjectsRootV1",
+      "id" : "meshObjectsRootV2",
+      "name" : "meshObjectsRootV2",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects",
@@ -252,18 +252,18 @@
         "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    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\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    \"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    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\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    \"meshworkspacegroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\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    \"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    \"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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\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    \"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}",
       "code" : 200
     } ]
   }, {
@@ -457,6 +457,71 @@
 ,       "body" : "{\n  \"kind\" : \"meshBuildingBlockRun\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"b3116611-e08b-4b00-91c5-10365b25a6ef\"\n  },\n  \"spec\" : {\n    \"runNumber\" : 1,\n    \"buildingBlock\" : {\n      \"uuid\" : \"68ce5455-2a4a-4a4b-a324-6a6c18cab85a\",\n      \"spec\" : {\n        \"displayName\" : \"block\",\n        \"workspaceIdentifier\" : \"workspace\",\n        \"projectIdentifier\" : \"project\",\n        \"fullPlatformIdentifier\" : \"azure\",\n        \"inputs\" : [ {\n          \"key\" : \"variable-name\",\n          \"value\" : \"some-value\",\n          \"type\" : \"STRING\",\n          \"isSensitive\" : false,\n          \"isEnvironment\" : false\n        } ],\n        \"parentBuildingBlocks\" : [ ]\n      }\n    },\n    \"buildingBlockDefinition\" : {\n      \"uuid\" : \"b23cfb9a-6974-444f-9d33-62134a632373\",\n      \"spec\" : {\n        \"version\" : 1,\n        \"implementation\" : {\n          \"type\" : \"TERRAFORM\",\n          \"terraformVersion\" : \"v1\",\n          \"repositoryUrl\" : \"https://example.com\",\n          \"async\" : true\n        }\n      }\n    },\n    \"behavior\" : \"APPLY\"\n  },\n  \"status\" : \"IN_PROGRESS\",\n  \"_links\" : {\n    \"registerSource\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns/b3116611-e08b-4b00-91c5-10365b25a6ef/status/source\"\n    },\n    \"updateSource\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblockruns/b3116611-e08b-4b00-91c5-10365b25a6ef/status/source/{sourceId}\",\n      \"templated\" : true\n    },\n    \"meshstackBaseUrl\" : {\n      \"href\" : \"https://mesh-backend-url\"\n    }\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshBuildingBlockPost",
+    "name" : "/api/meshobjects/meshbuildingblocks",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshbuildingblocks"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as a `Content-Type` header."
+      }, {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+      } ],
+      "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\": \"84d25b93-2534-4f2f-b96e-e8b47657facb\"\n    }]\n  }\n} ",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshBuildingBlockPost",
+      "name" : "meshBuildingBlockPost",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshbuildingblocks"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as a `Content-Type` header."
+        }, {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+        } ],
+        "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\": \"84d25b93-2534-4f2f-b96e-e8b47657facb\"\n    }]\n  }\n} ",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"a2048c7f-72d7-4aa7-b79a-26fe62ec7772\",\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-12-12T14:25:11.256635344Z\"\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\" : \"84d25b93-2534-4f2f-b96e-e8b47657facb\",\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772\"\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge\"\n    }\n  }\n}",
+      "code" : 201
+    } ]
   }, {
     "id" : "meshBuildingBlockList",
     "name" : "/api/meshobjects/meshbuildingblocks",
@@ -573,74 +638,9 @@
         "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-12-04T09:53:22.098763344Z\"\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-12-04T09:53:22.146961264Z\"\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-12-12T14:25:10.067505556Z\"\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-12-12T14:25:10.118968516Z\"\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
     } ]
-  }, {
-    "id" : "meshBuildingBlockPost",
-    "name" : "/api/meshobjects/meshbuildingblocks",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks"
-      },
-      "method" : "POST",
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as a `Content-Type` header."
-      }, {
-        "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
-      } ],
-      "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\": \"57971196-c2d7-466c-ab68-e3de9c9487de\"\n    }]\n  }\n} ",
-        "urlencoded" : [ ]
-      }
-    },
-    "response" : [ {
-      "id" : "meshBuildingBlockPost",
-      "name" : "meshBuildingBlockPost",
-      "originalRequest" : {
-        "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks"
-        },
-        "method" : "POST",
-        "header" : [ {
-          "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json;charset=UTF-8",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as a `Content-Type` header."
-        }, {
-          "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
-        } ],
-        "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\": \"57971196-c2d7-466c-ab68-e3de9c9487de\"\n    }]\n  }\n} ",
-          "urlencoded" : [ ]
-        }
-      },
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json",
-        "disabled" : false
-      } ],
-      "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"151bace2-358a-4aa5-97be-242964653aff\",\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-12-04T09:53:23.185770890Z\"\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\" : \"57971196-c2d7-466c-ab68-e3de9c9487de\",\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/151bace2-358a-4aa5-97be-242964653aff\"\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/151bace2-358a-4aa5-97be-242964653aff/purge\"\n    }\n  }\n}",
-      "code" : 201
-    } ]
   }, {
     "id" : "meshPaymentMethodListV2",
     "name" : "/api/meshobjects/meshpaymentmethods",
@@ -709,9 +709,74 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"kind\" : \"meshPaymentMethod\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"ipkl2mpmdsv2\"\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\" : \"ipkl2mpmdsv2\"\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=ipkl2mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&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\" : \"dury1mpmdsv2\"\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\" : \"dury1mpmdsv2\"\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=dury1mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&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" : "meshProjectPost",
+    "name" : "/api/meshobjects/meshprojects",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojects",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshprojects"
+      },
+      "method" : "POST",
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "You should use `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an Content-Type header."
+      }, {
+        "key" : "Accept",
+        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.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\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\"\n  }\n}",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshProjectPost",
+      "name" : "meshProjectPost",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojects",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshprojects"
+        },
+        "method" : "POST",
+        "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "You should use `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an Content-Type header."
+        }, {
+          "key" : "Accept",
+          "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.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\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\"\n  }\n}",
+          "urlencoded" : [ ]
+        }
+      },
+      "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
+        "disabled" : false
+      } ],
+      "cookie" : [ ],
+      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\",\n    \"createdOn\" : \"2024-12-12T14:25:18.691059079Z\"\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/dury1mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}",
+      "code" : 201
+    } ]
   }, {
     "id" : "meshProjectListV2",
     "name" : "/api/meshobjects/meshprojects",
@@ -788,73 +853,74 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"ipkl2mpdsv2\",\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/ipkl2mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&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}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"kind\" : \"meshProject\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"dury1mpdsv2\",\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/dury1mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&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" : "meshProjectPost",
-    "name" : "/api/meshobjects/meshprojects",
+    "id" : "meshServiceInstancePost",
+    "name" : "/api/meshobjects/meshserviceinstances",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojects",
+	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojects"
+"path" : "/api/meshobjects/meshserviceinstances"
       },
       "method" : "POST",
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
         "disabled" : false,
-        "description" : "You should use `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an Content-Type header."
+        "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.meshproject.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
+        "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\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\"\n  }\n}",
+        "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "meshProjectPost",
-      "name" : "meshProjectPost",
+      "id" : "meshServiceInstancePost",
+      "name" : "meshServiceInstancePost",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojects",
+	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojects"
+"path" : "/api/meshobjects/meshserviceinstances"
         },
         "method" : "POST",
         "header" : [ {
           "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json;charset=UTF-8",
+          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8",
           "disabled" : false,
-          "description" : "You should use `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an Content-Type header."
+          "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.meshproject.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.v2.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions might be added in future."
+          "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\": \"meshProject\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 3\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\"\n  }\n}",
+          "raw" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
           "urlencoded" : [ ]
         }
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
-        "disabled" : false
+        "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\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-3\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\",\n    \"createdOn\" : \"2024-12-04T09:53:30.003792499Z\"\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/ipkl2mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    }\n  }\n}",
-      "code" : 201
+      "body" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
+      "code" : 200
     } ]
   }, {
     "id" : "meshServiceInstanceListV2",
@@ -956,73 +1022,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"ipkl2mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"ipkl2mtdg1\",\n        \"instanceId\" : \"ipkl2mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"ipkl2mtdg12\",\n        \"serviceId\" : \"ipkl2mtdg5\",\n        \"planId\" : \"ipkl2mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/ipkl2mtdg11\"\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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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    \"meshServiceInstances\" : [ {\n      \"kind\" : \"meshServiceInstance\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"dury1mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"dury1mtdg1\",\n        \"instanceId\" : \"dury1mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"dury1mtdg12\",\n        \"serviceId\" : \"dury1mtdg5\",\n        \"planId\" : \"dury1mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/dury1mtdg11\"\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
     } ]
   }, {
@@ -1154,7 +1154,7 @@
       "code" : 200
     } ]
   }, {
-    "id" : "meshTenantPost",
+    "id" : "meshTenantListV3",
     "name" : "/api/meshobjects/meshtenants",
     "variable" : [ ],
     "event" : [ ],
@@ -1163,51 +1163,81 @@
 	"raw": "{{baseUrl}}/api/meshobjects/meshtenants",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshtenants"
+,         "query" : [ {
+          "key" : "workspaceIdentifier",
+          "disabled" : false,
+          "description" : "Filter for meshTenants that belong to the meshWorkspace with given identifier. (optional)"
+        }, {
+          "key" : "projectIdentifier",
+          "disabled" : false,
+          "description" : "Filter for meshTenants that belong to the meshProject with given identifier. (optional)"
+        }, {
+          "key" : "platformIdentifier",
+          "disabled" : false,
+          "description" : "Filter for meshTenants that belong to the meshPlatform with given identifier. (optional)"
+        }, {
+          "key" : "deletionState",
+          "disabled" : false,
+          "description" : "Filter for meshTenants with a certain deletion state. Possible values are: [ACTIVE](default option) All meshTenants that are not deleted or submitted for deletion,[MARKED_FOR_DELETION] All meshTenants that are awaiting manual deletion approval, or [DELETED] All meshTenants that are deleted or submitted for deletion"
+        }, {
+          "key" : "page",
+          "disabled" : false,
+          "description" : "The page number (default=0). See <<paging,Paging information>>."
+        }, {
+          "key" : "size",
+          "disabled" : false,
+          "description" : "The amount of elements in a single page (default={default-page-size}). See <<paging,Paging information>>."
+        } ]
       },
-      "method" : "POST",
+      "method" : "GET",
       "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json;charset=UTF-8",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as a `Content-Type` header."
-      }, {
         "key" : "Accept",
         "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.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\": \"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} ",
-        "urlencoded" : [ ]
-      }
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as an `Accept` header to be guaranteed the V3 response format of this endpoint. New versions might be added in future."
+      } ]
     },
     "response" : [ {
-      "id" : "meshTenantPost",
-      "name" : "meshTenantPost",
+      "id" : "meshTenantListV3",
+      "name" : "meshTenantListV3",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects/meshtenants",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshtenants"
+,           "query" : [ {
+            "key" : "workspaceIdentifier",
+            "disabled" : false,
+            "description" : "Filter for meshTenants that belong to the meshWorkspace with given identifier. (optional)"
+          }, {
+            "key" : "projectIdentifier",
+            "disabled" : false,
+            "description" : "Filter for meshTenants that belong to the meshProject with given identifier. (optional)"
+          }, {
+            "key" : "platformIdentifier",
+            "disabled" : false,
+            "description" : "Filter for meshTenants that belong to the meshPlatform with given identifier. (optional)"
+          }, {
+            "key" : "deletionState",
+            "disabled" : false,
+            "description" : "Filter for meshTenants with a certain deletion state. Possible values are: [ACTIVE](default option) All meshTenants that are not deleted or submitted for deletion,[MARKED_FOR_DELETION] All meshTenants that are awaiting manual deletion approval, or [DELETED] All meshTenants that are deleted or submitted for deletion"
+          }, {
+            "key" : "page",
+            "disabled" : false,
+            "description" : "The page number (default=0). See <<paging,Paging information>>."
+          }, {
+            "key" : "size",
+            "disabled" : false,
+            "description" : "The amount of elements in a single page (default={default-page-size}). See <<paging,Paging information>>."
+          } ]
         },
-        "method" : "POST",
+        "method" : "GET",
         "header" : [ {
-          "key" : "Content-Type",
-          "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json;charset=UTF-8",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as a `Content-Type` header."
-        }, {
           "key" : "Accept",
           "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.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\": \"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} ",
-          "urlencoded" : [ ]
-        }
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as an `Accept` header to be guaranteed the V3 response format of this endpoint. New versions might be added in future."
+        } ]
       },
       "header" : [ {
         "key" : "Content-Type",
@@ -1215,11 +1245,11 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.azure.meshcloud-azure-dev\"\n  },\n  \"spec\" : {\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=azure.meshcloud-azure-dev\"\n    }\n  }\n}",
-      "code" : 201
+      "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-12-13T14:25:24.502274400Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"32c4c552-ebf8-4f75-8c77-0aea47de189d\",\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
     } ]
   }, {
-    "id" : "meshTenantListV3",
+    "id" : "meshTenantPost",
     "name" : "/api/meshobjects/meshtenants",
     "variable" : [ ],
     "event" : [ ],
@@ -1228,81 +1258,51 @@
 	"raw": "{{baseUrl}}/api/meshobjects/meshtenants",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshtenants"
-,         "query" : [ {
-          "key" : "workspaceIdentifier",
-          "disabled" : false,
-          "description" : "Filter for meshTenants that belong to the meshWorkspace with given identifier. (optional)"
-        }, {
-          "key" : "projectIdentifier",
-          "disabled" : false,
-          "description" : "Filter for meshTenants that belong to the meshProject with given identifier. (optional)"
-        }, {
-          "key" : "platformIdentifier",
-          "disabled" : false,
-          "description" : "Filter for meshTenants that belong to the meshPlatform with given identifier. (optional)"
-        }, {
-          "key" : "deletionState",
-          "disabled" : false,
-          "description" : "Filter for meshTenants with a certain deletion state. Possible values are: [ACTIVE](default option) All meshTenants that are not deleted or submitted for deletion,[MARKED_FOR_DELETION] All meshTenants that are awaiting manual deletion approval, or [DELETED] All meshTenants that are deleted or submitted for deletion"
-        }, {
-          "key" : "page",
-          "disabled" : false,
-          "description" : "The page number (default=0). See <<paging,Paging information>>."
-        }, {
-          "key" : "size",
-          "disabled" : false,
-          "description" : "The amount of elements in a single page (default={default-page-size}). See <<paging,Paging information>>."
-        } ]
       },
-      "method" : "GET",
+      "method" : "POST",
       "header" : [ {
+        "key" : "Content-Type",
+        "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json;charset=UTF-8",
+        "disabled" : false,
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as a `Content-Type` header."
+      }, {
         "key" : "Accept",
         "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as an `Accept` header to be guaranteed the V3 response format of this endpoint. New versions might be added in future."
-      } ]
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.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\": \"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} ",
+        "urlencoded" : [ ]
+      }
     },
     "response" : [ {
-      "id" : "meshTenantListV3",
-      "name" : "meshTenantListV3",
+      "id" : "meshTenantPost",
+      "name" : "meshTenantPost",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects/meshtenants",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshtenants"
-,           "query" : [ {
-            "key" : "workspaceIdentifier",
-            "disabled" : false,
-            "description" : "Filter for meshTenants that belong to the meshWorkspace with given identifier. (optional)"
-          }, {
-            "key" : "projectIdentifier",
-            "disabled" : false,
-            "description" : "Filter for meshTenants that belong to the meshProject with given identifier. (optional)"
-          }, {
-            "key" : "platformIdentifier",
-            "disabled" : false,
-            "description" : "Filter for meshTenants that belong to the meshPlatform with given identifier. (optional)"
-          }, {
-            "key" : "deletionState",
-            "disabled" : false,
-            "description" : "Filter for meshTenants with a certain deletion state. Possible values are: [ACTIVE](default option) All meshTenants that are not deleted or submitted for deletion,[MARKED_FOR_DELETION] All meshTenants that are awaiting manual deletion approval, or [DELETED] All meshTenants that are deleted or submitted for deletion"
-          }, {
-            "key" : "page",
-            "disabled" : false,
-            "description" : "The page number (default=0). See <<paging,Paging information>>."
-          }, {
-            "key" : "size",
-            "disabled" : false,
-            "description" : "The amount of elements in a single page (default={default-page-size}). See <<paging,Paging information>>."
-          } ]
         },
-        "method" : "GET",
+        "method" : "POST",
         "header" : [ {
+          "key" : "Content-Type",
+          "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json;charset=UTF-8",
+          "disabled" : false,
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as a `Content-Type` header."
+        }, {
           "key" : "Accept",
           "value" : "application/vnd.meshcloud.api.meshtenant.v3.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.hal+json` as an `Accept` header to be guaranteed the V3 response format of this endpoint. New versions might be added in future."
-        } ]
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshtenant.v3.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\": \"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} ",
+          "urlencoded" : [ ]
+        }
       },
       "header" : [ {
         "key" : "Content-Type",
@@ -1310,8 +1310,8 @@
         "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-12-05T09:53:33.547095239Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"c22da58d-871b-4721-953d-a5128284a59e\",\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
+      "body" : "{\n  \"kind\" : \"meshTenant\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.azure.meshcloud-azure-dev\"\n  },\n  \"spec\" : {\n    \"landingZoneIdentifier\" : \"stage-dev\",\n    \"quotas\" : [ ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/test-workspace.test-project.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=test-workspace&projectIdentifier=test-project&platformIdentifier=azure.meshcloud-azure-dev\"\n    }\n  }\n}",
+      "code" : 201
     } ]
   }, {
     "id" : "meshUserListV1",
@@ -1461,7 +1461,7 @@
         "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\" : \"ea68029e-0b5f-4ef4-a332-ab475e15a588\",\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\" : \"v1\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"0df33a51-2975-4dbd-97a5-0aabd2ea2709\",\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" : "meshUserListV2",
@@ -1535,7 +1535,7 @@
         "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\" : \"a7f2cd7d-ede8-4d92-8f84-21a63719c6e9\",\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\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"d586c3f5-8ce4-41d5-9469-ea1d27395187\",\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
     } ]
   }, {
@@ -1598,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-12-04T09:52:35Z\"\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-12-04T09:52:35Z\"\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-12-04T09:52:35Z\"\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-12-12T14:24:09Z\"\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-12-12T14:24:09Z\"\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-12-12T14:24:09Z\"\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
     } ]
   }, {
@@ -1733,33 +1733,6 @@
       "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/151bace2-358a-4aa5-97be-242964653aff",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff"
-      },
-      "method" : "DELETE"
-    },
-    "response" : [ {
-      "id" : "meshBuildingBlockDelete",
-      "name" : "meshBuildingBlockDelete",
-      "originalRequest" : {
-        "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff"
-        },
-        "method" : "DELETE"
-      },
-      "cookie" : [ ],
-      "code" : 202
-    } ]
   }, {
     "id" : "meshBuildingBlock",
     "name" : "/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720",
@@ -1802,9 +1775,36 @@
         "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-12-04T09:53:22.146961264Z\"\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-12-12T14:25:10.118968516Z\"\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772"
+      },
+      "method" : "DELETE"
+    },
+    "response" : [ {
+      "id" : "meshBuildingBlockDelete",
+      "name" : "meshBuildingBlockDelete",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772"
+        },
+        "method" : "DELETE"
+      },
+      "cookie" : [ ],
+      "code" : 202
+    } ]
   }, {
     "id" : "meshPaymentMethodV2",
     "name" : "/api/meshobjects/meshpaymentmethods/test-payment-method-1",
@@ -1847,7 +1847,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshPaymentMethod\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"ipkl2mpmdsv2\"\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\" : \"dury1mpmdsv2\"\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
     } ]
   }, {
@@ -1910,7 +1910,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectGroupBindings\" : [ {\n      \"kind\" : \"meshProjectGroupBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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\" : \"ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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
     } ]
   }, {
@@ -1978,69 +1978,6 @@
       "body" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"group-binding-name\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Project Reader\"\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/group-binding-name\"\n    }\n  }\n}",
       "code" : 200
     } ]
-  }, {
-    "id" : "meshProjectUserBindingListV3",
-    "name" : "/api/meshobjects/meshprojectbindings/userbindings",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/userbindings"
-,         "query" : [ {
-          "key" : "workspaceIdentifier",
-          "disabled" : false,
-          "description" : "The identifier of the workspace the project with the bindings belongs to."
-        }, {
-          "key" : "projectIdentifier",
-          "disabled" : false,
-          "description" : "The project identifier of the project that contains the requested bindings."
-        } ]
-      },
-      "method" : "GET",
-      "header" : [ {
-        "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
-        "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions will be added in future."
-      } ]
-    },
-    "response" : [ {
-      "id" : "meshProjectUserBindingListV3",
-      "name" : "meshProjectUserBindingListV3",
-      "originalRequest" : {
-        "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/userbindings"
-,           "query" : [ {
-            "key" : "workspaceIdentifier",
-            "disabled" : false,
-            "description" : "The identifier of the workspace the project with the bindings belongs to."
-          }, {
-            "key" : "projectIdentifier",
-            "disabled" : false,
-            "description" : "The project identifier of the project that contains the requested bindings."
-          } ]
-        },
-        "method" : "GET",
-        "header" : [ {
-          "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
-          "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions will be added in future."
-        } ]
-      },
-      "header" : [ {
-        "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
-        "disabled" : false
-      } ],
-      "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"7247a370-817a-4440-96ca-992ab87726bf\"\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/7247a370-817a-4440-96ca-992ab87726bf\"\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
-    } ]
   }, {
     "id" : "meshProjectUserBindingCreateV3",
     "name" : "/api/meshobjects/meshprojectbindings/userbindings",
@@ -2107,108 +2044,112 @@
       "code" : 200
     } ]
   }, {
-    "id" : "meshProjectV2",
-    "name" : "/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1",
+    "id" : "meshProjectUserBindingListV3",
+    "name" : "/api/meshobjects/meshprojectbindings/userbindings",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1"
+"path" : "/api/meshobjects/meshprojectbindings/userbindings"
+,         "query" : [ {
+          "key" : "workspaceIdentifier",
+          "disabled" : false,
+          "description" : "The identifier of the workspace the project with the bindings belongs to."
+        }, {
+          "key" : "projectIdentifier",
+          "disabled" : false,
+          "description" : "The project identifier of the project that contains the requested bindings."
+        } ]
       },
       "method" : "GET",
       "header" : [ {
         "key" : "Accept",
-        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
         "disabled" : false,
-        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.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.meshprojectuserbinding.v3.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions will be added in future."
       } ]
     },
     "response" : [ {
-      "id" : "meshProjectV2",
-      "name" : "meshProjectV2",
+      "id" : "meshProjectUserBindingListV3",
+      "name" : "meshProjectUserBindingListV3",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1"
+"path" : "/api/meshobjects/meshprojectbindings/userbindings"
+,           "query" : [ {
+            "key" : "workspaceIdentifier",
+            "disabled" : false,
+            "description" : "The identifier of the workspace the project with the bindings belongs to."
+          }, {
+            "key" : "projectIdentifier",
+            "disabled" : false,
+            "description" : "The project identifier of the project that contains the requested bindings."
+          } ]
         },
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.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.meshprojectuserbinding.v3.hal+json` as an `Accept` header to be guaranteed the expected response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshproject.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"ipkl2mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-12-04T09:53:30.533407962Z\"\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/ipkl2mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshProjectUserBindings\" : [ {\n      \"kind\" : \"meshProjectUserBinding\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"a952d9e1-5589-47eb-926e-c84e7702c836\"\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/a952d9e1-5589-47eb-926e-c84e7702c836\"\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
     } ]
   }, {
-    "id" : "meshServiceInstancePut",
-    "name" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
+    "id" : "meshProjectV2",
+    "name" : "/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances/serviceInstanceId",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId"
+"path" : "/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1"
       },
-      "method" : "PUT",
+      "method" : "GET",
       "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",
+        "value" : "application/vnd.meshcloud.api.meshproject.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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
-        "urlencoded" : [ ]
-      }
+        "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.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" : "meshServiceInstancePut",
-      "name" : "meshServiceInstancePut",
+      "id" : "meshProjectV2",
+      "name" : "meshProjectV2",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances/serviceInstanceId",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId"
+"path" : "/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1"
         },
-        "method" : "PUT",
+        "method" : "GET",
         "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",
+          "value" : "application/vnd.meshcloud.api.meshproject.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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
-          "urlencoded" : [ ]
-        }
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshproject.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.meshproject.v2.hal+json",
+        "disabled" : false
+      } ],
       "cookie" : [ ],
-      "code" : 202
+      "body" : "{\n  \"kind\" : \"meshProject\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"dury1mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-12-12T14:25:19.247376253Z\"\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/dury1mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}",
+      "code" : 200
     } ]
   }, {
     "id" : "meshServiceInstanceDelete",
@@ -2280,9 +2221,68 @@
         "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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}",
       "code" : 200
     } ]
+  }, {
+    "id" : "meshServiceInstancePut",
+    "name" : "/api/meshobjects/meshserviceinstances/serviceInstanceId",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances/serviceInstanceId",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId"
+      },
+      "method" : "PUT",
+      "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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+        "urlencoded" : [ ]
+      }
+    },
+    "response" : [ {
+      "id" : "meshServiceInstancePut",
+      "name" : "meshServiceInstancePut",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshserviceinstances/serviceInstanceId",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshserviceinstances/serviceInstanceId"
+        },
+        "method" : "PUT",
+        "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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}",
+          "urlencoded" : [ ]
+        }
+      },
+      "cookie" : [ ],
+      "code" : 202
+    } ]
   }, {
     "id" : "meshTagDefinition",
     "name" : "/api/meshobjects/meshtagdefinitions/{name}",
@@ -2510,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-12-05T09:53:33.547095239Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"c22da58d-871b-4721-953d-a5128284a59e\",\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-12-13T14:25:24.502274400Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"32c4c552-ebf8-4f75-8c77-0aea47de189d\",\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
     } ]
   }, {
@@ -2541,7 +2541,7 @@
       "code" : 202
     } ]
   }, {
-    "id" : "meshUserV2",
+    "id" : "meshUserV1",
     "name" : "/api/meshobjects/meshusers/john-doe",
     "variable" : [ ],
     "event" : [ ],
@@ -2554,14 +2554,14 @@
       "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",
+      "id" : "meshUserV1",
+      "name" : "meshUserV1",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects/meshusers/john-doe",
@@ -2571,22 +2571,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  \"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\" : \"a7f2cd7d-ede8-4d92-8f84-21a63719c6e9\",\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}",
+      "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\" : \"0df33a51-2975-4dbd-97a5-0aabd2ea2709\",\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" : "meshUserV1",
-      "name" : "meshUserV1",
+      "id" : "meshUserV2",
+      "name" : "meshUserV2",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects/meshusers/john-doe",
@@ -2596,18 +2596,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  \"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\" : \"ea68029e-0b5f-4ef4-a332-ab475e15a588\",\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\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"d586c3f5-8ce4-41d5-9469-ea1d27395187\",\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
     } ]
   }, {
@@ -2670,7 +2670,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceGroupBindings\" : [ {\n      \"kind\" : \"meshWorkspaceGroupBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"849f6844-4a00-41f3-a259-1b1876b32dcb\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings?username=john.doe49a0&workspaceRole=Workspace%20Manager\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceGroupBindings\" : [ {\n      \"kind\" : \"meshWorkspaceGroupBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings?username=john.doe49a0&workspaceRole=Workspace%20Manager\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -2738,6 +2738,71 @@
       "body" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"my-group-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\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/my-group-binding-name\"\n    }\n  }\n}",
       "code" : 201
     } ]
+  }, {
+    "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\" : \"john.doe49a0\"\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\" : \"john.doe49a0\"\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\" : \"john.doe49a0\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/another-user-binding-name\"\n    }\n  }\n}",
+      "code" : 201
+    } ]
   }, {
     "id" : "meshWorkspaceUserBindingList",
     "name" : "/api/meshobjects/meshworkspacebindings/userbindings",
@@ -2809,71 +2874,6 @@
       "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\" : \"john.doe49a0\"\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=john.doe49a0&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\" : \"john.doe49a0\"\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\" : \"john.doe49a0\"\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\" : \"john.doe49a0\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings/another-user-binding-name\"\n    }\n  }\n}",
-      "code" : 201
-    } ]
   }, {
     "id" : "meshWorkspace",
     "name" : "/api/meshobjects/meshworkspaces/admin-customer",
@@ -2916,7 +2916,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshWorkspace\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-12-04T09:52:35Z\"\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-12-12T14:24:09Z\"\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
     } ]
   }, {
@@ -2966,14 +2966,14 @@
     } ]
   }, {
     "id" : "meshBuildingBlockForcePurge",
-    "name" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge",
+    "name" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge",
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge"
+"path" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge"
       },
       "method" : "DELETE"
     },
@@ -2982,25 +2982,52 @@
       "name" : "meshBuildingBlockForcePurge",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge",
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge"
+"path" : "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge"
         },
         "method" : "DELETE"
       },
       "cookie" : [ ],
       "code" : 202
     } ]
+  }, {
+    "id" : "meshProjectGroupBindingDeleteV3",
+    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
+    "variable" : [ ],
+    "event" : [ ],
+    "request" : {
+      "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
+      },
+      "method" : "DELETE"
+    },
+    "response" : [ {
+      "id" : "meshProjectGroupBindingDeleteV3",
+      "name" : "meshProjectGroupBindingDeleteV3",
+      "originalRequest" : {
+        "url" : {
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
+"host": "{{baseUrl}}",
+"path" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
+        },
+        "method" : "DELETE"
+      },
+      "cookie" : [ ],
+      "code" : 204
+    } ]
   }, {
     "id" : "meshProjectGroupBindingV3",
-    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
+    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+"path" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
       },
       "method" : "GET",
       "header" : [ {
@@ -3015,9 +3042,9 @@
       "name" : "meshProjectGroupBindingV3",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
+"path" : "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086"
         },
         "method" : "GET",
         "header" : [ {
@@ -3033,46 +3060,19 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\n    }\n  }\n}",
       "code" : 200
     } ]
-  }, {
-    "id" : "meshProjectGroupBindingDeleteV3",
-    "name" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
-    "variable" : [ ],
-    "event" : [ ],
-    "request" : {
-      "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
-      },
-      "method" : "DELETE"
-    },
-    "response" : [ {
-      "id" : "meshProjectGroupBindingDeleteV3",
-      "name" : "meshProjectGroupBindingDeleteV3",
-      "originalRequest" : {
-        "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba",
-"host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba"
-        },
-        "method" : "DELETE"
-      },
-      "cookie" : [ ],
-      "code" : 204
-    } ]
   }, {
     "id" : "meshProjectUserBindingV3",
-    "name" : "/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf",
+    "name" : "/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf"
+"path" : "/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836"
       },
       "method" : "GET",
       "header" : [ {
@@ -3087,9 +3087,9 @@
       "name" : "meshProjectUserBindingV3",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf"
+"path" : "/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836"
         },
         "method" : "GET",
         "header" : [ {
@@ -3105,7 +3105,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"7247a370-817a-4440-96ca-992ab87726bf\"\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/7247a370-817a-4440-96ca-992ab87726bf\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"a952d9e1-5589-47eb-926e-c84e7702c836\"\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/a952d9e1-5589-47eb-926e-c84e7702c836\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -3137,14 +3137,14 @@
     } ]
   }, {
     "id" : "meshWorkspaceGroupBinding",
-    "name" : "/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb",
+    "name" : "/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb",
+	"raw": "{{baseUrl}}/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb"
+"path" : "/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3"
       },
       "method" : "GET",
       "header" : [ {
@@ -3159,9 +3159,9 @@
       "name" : "meshWorkspaceGroupBinding",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb",
+	"raw": "{{baseUrl}}/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb"
+"path" : "/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3"
         },
         "method" : "GET",
         "header" : [ {
@@ -3177,7 +3177,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"849f6844-4a00-41f3-a259-1b1876b32dcb\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Manager\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Manager\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
diff --git a/website/static/api/meshstack-swagger-docs.json b/website/static/api/meshstack-swagger-docs.json
index 47f610ff1..9696634ba 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" : "meshObjectsRootV2",
-        "produces" : [ "application/vnd.meshcloud.api.meshobjects.v2.hal+json", "application/vnd.meshcloud.api.meshobjects.v1.hal+json" ],
+        "operationId" : "meshObjectsRootV1",
+        "produces" : [ "application/vnd.meshcloud.api.meshobjects.v1.hal+json", "application/vnd.meshcloud.api.meshobjects.v2.hal+json" ],
         "parameters" : [ {
           "name" : "Accept",
           "in" : "header",
-          "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.",
           "required" : true,
           "type" : "string"
         } ],
@@ -164,10 +164,10 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshobjects.v2.hal+json" : "{\n  \"_links\" : {\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\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    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshtagdefinitions\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtagdefinitions\"\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    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceuserbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/userbindings{?username,workspaceRole,workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspacegroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings{?username,workspaceRole}\",\n      \"templated\" : true\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups{?workspaceIdentifier,username}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\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.v1.hal+json" : "{\n  \"_links\" : {\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    \"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    \"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    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\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}"
             },
             "schema" : {
-              "$ref" : "#/definitions/meshObjectsRootV2"
+              "$ref" : "#/definitions/meshObjectsRootV1"
             }
           }
         },
@@ -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-12-04T09:53:22.098763344Z\"\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-12-04T09:53:22.146961264Z\"\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-12-12T14:25:10.067505556Z\"\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-12-12T14:25:10.118968516Z\"\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-2024090638"
+            "$ref" : "#/definitions/api_meshobjects_meshbuildingblocks568378912"
           },
           "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\": \"57971196-c2d7-466c-ab68-e3de9c9487de\"\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\": \"84d25b93-2534-4f2f-b96e-e8b47657facb\"\n    }]\n  }\n} "
           }
         } ],
         "responses" : {
           "201" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"151bace2-358a-4aa5-97be-242964653aff\",\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-12-04T09:53:23.185770890Z\"\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\" : \"57971196-c2d7-466c-ab68-e3de9c9487de\",\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/151bace2-358a-4aa5-97be-242964653aff\"\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/151bace2-358a-4aa5-97be-242964653aff/purge\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json" : "{\n  \"kind\" : \"meshBuildingBlock\",\n  \"apiVersion\" : \"v1\",\n  \"metadata\" : {\n    \"uuid\" : \"a2048c7f-72d7-4aa7-b79a-26fe62ec7772\",\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-12-12T14:25:11.256635344Z\"\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\" : \"84d25b93-2534-4f2f-b96e-e8b47657facb\",\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772\"\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/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/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\" : \"ipkl2mpmdsv2\"\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\" : \"ipkl2mpmdsv2\"\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=ipkl2mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=ipkl2mpmdsv2&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\" : \"dury1mpmdsv2\"\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\" : \"dury1mpmdsv2\"\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=dury1mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=dury1mpmdsv2&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\" : \"ipkl2mpdsv2\",\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/ipkl2mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=ipkl2mpdsv2&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\" : \"dury1mpdsv2\",\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/dury1mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshprojectgroupbindings\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=dury1mpdsv2&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_meshprojects1964539819"
+            "$ref" : "#/definitions/api_meshobjects_meshprojects1708355356"
           },
           "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\" : \"ipkl2mpdsv2\"\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\" : \"dury1mpdsv2\"\n  }\n}"
           }
         } ],
         "responses" : {
           "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\" : \"ipkl2mpdsv2\",\n    \"createdOn\" : \"2024-12-04T09:53:30.003792499Z\"\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/ipkl2mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&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\" : \"dury1mpdsv2\",\n    \"createdOn\" : \"2024-12-12T14:25:18.691059079Z\"\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/dury1mpdsv2.test-project-3\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-3\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&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\" : \"ipkl2mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"ipkl2mtdg1\",\n        \"instanceId\" : \"ipkl2mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"ipkl2mtdg12\",\n        \"serviceId\" : \"ipkl2mtdg5\",\n        \"planId\" : \"ipkl2mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/ipkl2mtdg11\"\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\" : \"dury1mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"dury1mtdg1\",\n        \"instanceId\" : \"dury1mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"dury1mtdg12\",\n        \"serviceId\" : \"dury1mtdg5\",\n        \"planId\" : \"dury1mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/dury1mtdg11\"\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_meshserviceinstances289441832"
+            "$ref" : "#/definitions/api_meshobjects_meshserviceinstances-377631252"
           },
           "x-examples" : {
-            "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\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\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
             },
             "headers" : {
               "Content-Type" : {
@@ -813,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-12-05T09:53:33.547095239Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"c22da58d-871b-4721-953d-a5128284a59e\",\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-12-13T14:25:24.502274400Z\",\n        \"assignedTags\" : { },\n        \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n      },\n      \"spec\" : {\n        \"localId\" : \"32c4c552-ebf8-4f75-8c77-0aea47de189d\",\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"
@@ -968,7 +968,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "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\" : \"ea68029e-0b5f-4ef4-a332-ab475e15a588\",\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" : "{\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\" : \"0df33a51-2975-4dbd-97a5-0aabd2ea2709\",\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/meshUserListV1"
@@ -1008,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-12-04T09:52:35Z\"\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-12-04T09:52:35Z\"\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-12-04T09:52:35Z\"\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-12-12T14:24:09Z\"\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-12-12T14:24:09Z\"\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-12-12T14:24:09Z\"\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"
@@ -1105,21 +1105,6 @@
         } ]
       }
     },
-    "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff" : {
-      "delete" : {
-        "tags" : [ "api" ],
-        "operationId" : "meshBuildingBlockDelete",
-        "responses" : {
-          "202" : {
-            "description" : "",
-            "examples" : { }
-          }
-        },
-        "security" : [ {
-          "basic" : [ ]
-        } ]
-      }
-    },
     "/api/meshobjects/meshbuildingblocks/5646eafe-5d56-43e5-84fe-329bb050d720" : {
       "get" : {
         "tags" : [ "api" ],
@@ -1136,7 +1121,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-12-04T09:53:22.146961264Z\"\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-12-12T14:25:10.118968516Z\"\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"
@@ -1148,6 +1133,21 @@
         } ]
       }
     },
+    "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772" : {
+      "delete" : {
+        "tags" : [ "api" ],
+        "operationId" : "meshBuildingBlockDelete",
+        "responses" : {
+          "202" : {
+            "description" : "",
+            "examples" : { }
+          }
+        },
+        "security" : [ {
+          "basic" : [ ]
+        } ]
+      }
+    },
     "/api/meshobjects/meshpaymentmethods/test-payment-method-1" : {
       "get" : {
         "tags" : [ "api" ],
@@ -1164,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\" : \"ipkl2mpmdsv2\"\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\" : \"dury1mpmdsv2\"\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"
@@ -1204,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\" : \"05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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\" : \"ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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"
@@ -1287,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\" : \"7247a370-817a-4440-96ca-992ab87726bf\"\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/7247a370-817a-4440-96ca-992ab87726bf\"\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\" : \"a952d9e1-5589-47eb-926e-c84e7702c836\"\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/a952d9e1-5589-47eb-926e-c84e7702c836\"\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"
@@ -1342,7 +1342,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojects/ipkl2mpdsv2.test-project-1" : {
+    "/api/meshobjects/meshprojects/dury1mpdsv2.test-project-1" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectV2",
@@ -1358,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\" : \"ipkl2mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-12-04T09:53:30.533407962Z\"\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/ipkl2mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=ipkl2mpdsv2&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=ipkl2mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=ipkl2mpdsv2&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\" : \"dury1mpdsv2\",\n    \"createdOn\" : \"2024-01-01T00:00:00Z\",\n    \"deletedOn\" : \"2024-12-12T14:25:19.247376253Z\"\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/dury1mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers?workspaceIdentifier=dury1mpdsv2&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=dury1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshprojectgroupbindings\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojectbindings/groupbindings?workspaceIdentifier=dury1mpdsv2&projectIdentifier=test-project-1\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectV2"
@@ -1386,7 +1386,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json" : "{\n  \"kind\" : \"meshServiceInstance\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"Unknown\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances/serviceInstanceId\"\n    }\n  }\n}"
             },
             "headers" : {
               "Content-Type" : {
@@ -1424,10 +1424,10 @@
           "name" : "",
           "required" : false,
           "schema" : {
-            "$ref" : "#/definitions/api_meshobjects_meshserviceinstances_serviceInstanceId662019"
+            "$ref" : "#/definitions/api_meshobjects_meshserviceinstances_serviceInstanceId-1208869433"
           },
           "x-examples" : {
-            "application/vnd.meshcloud.api.meshserviceinstance.v2.hal+json;charset=UTF-8" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\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\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
           }
         } ],
         "responses" : {
@@ -1576,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-12-05T09:53:33.547095239Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"c22da58d-871b-4721-953d-a5128284a59e\",\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-12-13T14:25:24.502274400Z\",\n    \"assignedTags\" : { },\n    \"tenantIdentifier\" : \"test-workspace.test-project.aws.aws-meshstack-dev\"\n  },\n  \"spec\" : {\n    \"localId\" : \"32c4c552-ebf8-4f75-8c77-0aea47de189d\",\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"
@@ -1606,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"
         } ],
@@ -1619,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\" : \"a7f2cd7d-ede8-4d92-8f84-21a63719c6e9\",\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\" : \"0df33a51-2975-4dbd-97a5-0aabd2ea2709\",\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"
             }
           }
         },
@@ -1659,7 +1659,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceGroupBindings\" : [ {\n      \"kind\" : \"meshWorkspaceGroupBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"849f6844-4a00-41f3-a259-1b1876b32dcb\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings?username=john.doe49a0&workspaceRole=Workspace%20Manager\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshWorkspaceGroupBindings\" : [ {\n      \"kind\" : \"meshWorkspaceGroupBinding\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n      },\n      \"roleRef\" : {\n        \"name\" : \"Workspace Manager\"\n      },\n      \"targetRef\" : {\n        \"name\" : \"test-workspace\",\n        \"displayName\" : \"test-workspace Workspace\"\n      },\n      \"subject\" : {\n        \"name\" : \"testgroup\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings?username=john.doe49a0&workspaceRole=Workspace%20Manager\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 50,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshWorkspaceGroupBindingList"
@@ -1819,7 +1819,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-12-04T09:52:35Z\"\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-12-12T14:24:09Z\"\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"
@@ -1859,7 +1859,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshbuildingblocks/151bace2-358a-4aa5-97be-242964653aff/purge" : {
+    "/api/meshobjects/meshbuildingblocks/a2048c7f-72d7-4aa7-b79a-26fe62ec7772/purge" : {
       "delete" : {
         "tags" : [ "api" ],
         "operationId" : "meshBuildingBlockForcePurge",
@@ -1874,7 +1874,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojectbindings/groupbindings/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba" : {
+    "/api/meshobjects/meshprojectbindings/groupbindings/ff4c83e0-92b6-4609-92b8-0a4a77d5a086" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectGroupBindingV3",
@@ -1890,7 +1890,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\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/05fca6ce-8e8d-4a26-8f8c-c70e3491e5ba\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshprojectgroupbinding.v3.hal+json" : "{\n  \"kind\" : \"meshProjectGroupBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\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/ff4c83e0-92b6-4609-92b8-0a4a77d5a086\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectGroupBindingV3"
@@ -1915,7 +1915,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojectbindings/userbindings/7247a370-817a-4440-96ca-992ab87726bf" : {
+    "/api/meshobjects/meshprojectbindings/userbindings/a952d9e1-5589-47eb-926e-c84e7702c836" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectUserBindingV3",
@@ -1931,7 +1931,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"7247a370-817a-4440-96ca-992ab87726bf\"\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/7247a370-817a-4440-96ca-992ab87726bf\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshprojectuserbinding.v3.hal+json" : "{\n  \"kind\" : \"meshProjectUserBinding\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"a952d9e1-5589-47eb-926e-c84e7702c836\"\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/a952d9e1-5589-47eb-926e-c84e7702c836\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshProjectUserBindingV3"
@@ -1958,7 +1958,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb" : {
+    "/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshWorkspaceGroupBinding",
@@ -1974,7 +1974,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"849f6844-4a00-41f3-a259-1b1876b32dcb\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Manager\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/849f6844-4a00-41f3-a259-1b1876b32dcb\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshworkspacegroupbinding.v2.hal+json" : "{\n  \"kind\" : \"meshWorkspaceGroupBinding\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n  },\n  \"roleRef\" : {\n    \"name\" : \"Workspace Manager\"\n  },\n  \"targetRef\" : {\n    \"name\" : \"test-workspace\",\n    \"displayName\" : \"test-workspace Workspace\"\n  },\n  \"subject\" : {\n    \"name\" : \"testgroup\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspacebindings/groupbindings/478a32f5-fa30-4f85-9d46-4639ec99e2e3\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshWorkspaceGroupBinding"
@@ -2120,74 +2120,6 @@
     "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" ],
-      "properties" : {
-        "targetRef" : {
-          "type" : "object",
-          "properties" : {
-            "displayName" : {
-              "type" : "string",
-              "description" : "The name of the project the user is assigned to."
-            },
-            "name" : {
-              "type" : "string",
-              "description" : "The identifier of the project the user is assigned to."
-            },
-            "ownedByWorkspace" : {
-              "type" : "string",
-              "description" : "The identifier of the workspace which contains the project."
-            }
-          },
-          "required" : [ "displayName", "name", "ownedByWorkspace" ]
-        },
-        "metadata" : {
-          "type" : "object",
-          "description" : "Always contains the 'name' to uniquely identify the meshProjectUserBinding.",
-          "properties" : {
-            "name" : {
-              "type" : "string",
-              "description" : "The meshProjectUserBinding identifier as 'name' to uniquely identify the meshProjectUserBinding."
-            }
-          },
-          "required" : [ "name" ]
-        },
-        "apiVersion" : {
-          "type" : "string",
-          "description" : "Version of meshProjectUserBinding datatype. Matches the version part provided within the `Accept` request header."
-        },
-        "_links" : {
-          "type" : "object",
-          "description" : "Currently only contains the self link.",
-          "properties" : { }
-        },
-        "subject" : {
-          "type" : "object",
-          "properties" : {
-            "name" : {
-              "type" : "string",
-              "description" : "The username of the referenced user."
-            }
-          },
-          "required" : [ "name" ]
-        },
-        "kind" : {
-          "type" : "string",
-          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshProjectUserBinding' for this endpoint."
-        },
-        "roleRef" : {
-          "type" : "object",
-          "properties" : {
-            "name" : {
-              "type" : "string",
-              "description" : "The name of the referenced role for this user."
-            }
-          },
-          "required" : [ "name" ]
-        }
-      }
-    },
     "meshTenantV3" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
@@ -2259,6 +2191,74 @@
         }
       }
     },
+    "meshProjectUserBindingV3" : {
+      "type" : "object",
+      "required" : [ "_links", "apiVersion", "kind", "metadata" ],
+      "properties" : {
+        "targetRef" : {
+          "type" : "object",
+          "properties" : {
+            "displayName" : {
+              "type" : "string",
+              "description" : "The name of the project the user is assigned to."
+            },
+            "name" : {
+              "type" : "string",
+              "description" : "The identifier of the project the user is assigned to."
+            },
+            "ownedByWorkspace" : {
+              "type" : "string",
+              "description" : "The identifier of the workspace which contains the project."
+            }
+          },
+          "required" : [ "displayName", "name", "ownedByWorkspace" ]
+        },
+        "metadata" : {
+          "type" : "object",
+          "description" : "Always contains the 'name' to uniquely identify the meshProjectUserBinding.",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The meshProjectUserBinding identifier as 'name' to uniquely identify the meshProjectUserBinding."
+            }
+          },
+          "required" : [ "name" ]
+        },
+        "apiVersion" : {
+          "type" : "string",
+          "description" : "Version of meshProjectUserBinding datatype. Matches the version part provided within the `Accept` request header."
+        },
+        "_links" : {
+          "type" : "object",
+          "description" : "Currently only contains the self link.",
+          "properties" : { }
+        },
+        "subject" : {
+          "type" : "object",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The username of the referenced user."
+            }
+          },
+          "required" : [ "name" ]
+        },
+        "kind" : {
+          "type" : "string",
+          "description" : "As a common meshObject structure exists, every meshObject has a 'kind'. This is always 'meshProjectUserBinding' for this endpoint."
+        },
+        "roleRef" : {
+          "type" : "object",
+          "properties" : {
+            "name" : {
+              "type" : "string",
+              "description" : "The name of the referenced role for this user."
+            }
+          },
+          "required" : [ "name" ]
+        }
+      }
+    },
     "meshTenantPost" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
@@ -2577,7 +2577,35 @@
         }
       }
     },
-    "api_meshobjects_meshserviceinstances_serviceInstanceId662019" : {
+    "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" : { }
+        }
+      }
+    },
+    "api_meshobjects_meshserviceinstances-377631252" : {
       "type" : "object",
       "required" : [ "apiVersion", "kind", "metadata", "spec" ],
       "properties" : {
@@ -2636,35 +2664,7 @@
           "required" : [ "creator", "displayName", "planId", "serviceId" ]
         }
       },
-      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\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" : { }
-        }
-      }
+      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
     },
     "meshBuildingBlockRunCreate" : {
       "type" : "object",
@@ -2972,17 +2972,6 @@
       },
       "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}"
     },
@@ -3303,41 +3292,13 @@
         }
       }
     },
-    "meshUserListV1" : {
+    "api_meshobjects_meshtenants1030657354" : {
       "type" : "object",
-      "required" : [ "_embedded", "_links", "page" ],
+      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
       "properties" : {
-        "_links" : {
-          "type" : "object",
-          "description" : "Currently only contains the self link and <<paging,pagination>> links.",
-          "properties" : { }
-        },
-        "_embedded" : {
+        "metadata" : {
           "type" : "object",
-          "description" : "Contains the actual content of the paged response.",
-          "properties" : {
-            "meshUsers" : {
-              "type" : "array",
-              "description" : "List of <<mesh_user_response_fields,meshUser>>.",
-              "items" : { }
-            }
-          },
-          "required" : [ "meshUsers" ]
-        },
-        "page" : {
-          "type" : "object",
-          "description" : "See <<paging,Paging information>>.",
-          "properties" : { }
-        }
-      }
-    },
-    "api_meshobjects_meshtenants1030657354" : {
-      "type" : "object",
-      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
-      "properties" : {
-        "metadata" : {
-          "type" : "object",
-          "description" : "Fixed fields that help identify the Tenant.",
+          "description" : "Fixed fields that help identify the Tenant.",
           "properties" : {
             "ownedByProject" : {
               "type" : "string",
@@ -3380,6 +3341,34 @@
       },
       "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} "
     },
+    "meshUserListV1" : {
+      "type" : "object",
+      "required" : [ "_embedded", "_links", "page" ],
+      "properties" : {
+        "_links" : {
+          "type" : "object",
+          "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" : {
+            "meshUsers" : {
+              "type" : "array",
+              "description" : "List of <<mesh_user_response_fields,meshUser>>.",
+              "items" : { }
+            }
+          },
+          "required" : [ "meshUsers" ]
+        },
+        "page" : {
+          "type" : "object",
+          "description" : "See <<paging,Paging information>>.",
+          "properties" : { }
+        }
+      }
+    },
     "meshPaymentMethodV2" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
@@ -3438,91 +3427,6 @@
         }
       }
     },
-    "api_meshobjects_meshbuildingblocks-2024090638" : {
-      "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, SET, 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\": \"57971196-c2d7-466c-ab68-e3de9c9487de\"\n    }]\n  }\n} "
-    },
     "meshServiceInstanceListV2" : {
       "type" : "object",
       "required" : [ "_embedded", "_links", "page" ],
@@ -3676,59 +3580,66 @@
         }
       }
     },
-    "api_meshobjects_meshprojects1964539819" : {
+    "api_meshobjects_meshserviceinstances_serviceInstanceId-1208869433" : {
       "type" : "object",
       "required" : [ "apiVersion", "kind", "metadata", "spec" ],
       "properties" : {
         "metadata" : {
           "type" : "object",
-          "description" : "Fixed fields that help to identify the meshProject.",
+          "description" : "Metadata and more fields to identify the Service Instance.",
           "properties" : {
-            "name" : {
+            "ownedByProject" : {
               "type" : "string",
-              "description" : "The identifier that should be unique within a workspace"
+              "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\" : \"ipkl2mpdsv2\"\n  }\n}"
+      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"dury1smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"dury1mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI updated\",\n    \"serviceId\" : \"dury1mtdg25\",\n    \"planId\" : \"dury1mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
     },
     "meshWorkspaceGroupBindingCreate" : {
       "type" : "object",
@@ -3941,6 +3852,91 @@
         }
       }
     },
+    "api_meshobjects_meshbuildingblocks568378912" : {
+      "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, SET, 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\": \"84d25b93-2534-4f2f-b96e-e8b47657facb\"\n    }]\n  }\n} "
+    },
     "meshProjectGroupBindingCreateV3" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind" ],
@@ -4162,6 +4158,60 @@
         }
       }
     },
+    "api_meshobjects_meshprojects1708355356" : {
+      "type" : "object",
+      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
+      "properties" : {
+        "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"
+            },
+            "ownedByWorkspace" : {
+              "type" : "string",
+              "description" : "The identifier of the workspace that the project should belong to."
+            }
+          },
+          "required" : [ "name", "ownedByWorkspace" ]
+        },
+        "apiVersion" : {
+          "type" : "string",
+          "description" : "Version of meshProject 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."
+        },
+        "spec" : {
+          "type" : "object",
+          "description" : "All fields in this section describe the project.",
+          "properties" : {
+            "substitutePaymentMethodIdentifier" : {
+              "type" : "string",
+              "description" : "The substitute payment method of the project."
+            },
+            "paymentMethodIdentifier" : {
+              "type" : "string",
+              "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" : [ "displayName", "tags" ]
+        }
+      },
+      "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\" : \"dury1mpdsv2\"\n  }\n}"
+    },
     "api_login-371819773" : {
       "example" : "client_id=8a616394-98ad-4541-a0e9-e280f5d92249&client_secret=abcdefghijklmnopqrstuvwxyz0123456789&grant_type=client_credentials"
     },
@@ -4225,64 +4275,6 @@
         }
       }
     },
-    "meshUserV2" : {
-      "type" : "object",
-      "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" : "Available <<mesh_user_links,links>> on a meshUser.",
-          "properties" : { }
-        },
-        "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" : "All fields in this section describe the meshUser.",
-          "properties" : {
-            "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" : [ "email", "euid", "firstName", "lastName", "tags" ]
-        }
-      }
-    },
     "meshTagDefinitionList" : {
       "type" : "object",
       "required" : [ "_embedded", "_links", "page" ],
@@ -4542,66 +4534,63 @@
         }
       }
     },
-    "api_meshobjects_meshserviceinstances289441832" : {
+    "meshUserV1" : {
       "type" : "object",
-      "required" : [ "apiVersion", "kind", "metadata", "spec" ],
+      "required" : [ "_links", "apiVersion", "kind", "metadata", "spec" ],
       "properties" : {
         "metadata" : {
           "type" : "object",
-          "description" : "Metadata and more fields to identify the Service Instance.",
+          "description" : "Always contains the 'name' to uniquely identify the meshUser.",
           "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" : {
+            "name" : {
               "type" : "string",
-              "description" : "The workspace that this Service Instance belongs to."
+              "description" : "The userIdentifier as 'name' to uniquely identify the meshUser."
             }
           },
-          "required" : [ "instanceId", "marketplaceIdentifier", "ownedByProject", "ownedByWorkspace" ]
+          "required" : [ "name" ]
         },
         "apiVersion" : {
           "type" : "string",
-          "description" : "Version of Service Instance datatype. Matches the version part provided within the `Accept` request header."
+          "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" : { }
         },
         "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 'meshUser' for this endpoint."
         },
         "spec" : {
           "type" : "object",
-          "description" : "Specifications for the Service Instance.",
+          "description" : "All fields in this section describe the meshUser.",
           "properties" : {
-            "creator" : {
+            "lastName" : {
               "type" : "string",
-              "description" : "The creator's username that creates this Service Instance"
+              "description" : "The lastname of the meshUser."
             },
-            "displayName" : {
+            "firstName" : {
               "type" : "string",
-              "description" : "The display name of the Service Instance."
+              "description" : "The firstname of the meshUser."
             },
-            "planId" : {
+            "euid" : {
               "type" : "string",
-              "description" : "The id of the plan for this Service Instance"
+              "description" : "External User ID which is used to lookup the user in the cloud platforms."
             },
-            "serviceId" : {
+            "email" : {
               "type" : "string",
-              "description" : "The id of the service for the Service Instance"
+              "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" : [ "creator", "displayName", "planId", "serviceId" ]
+          "required" : [ "email", "euid", "firstName", "lastName", "tags" ]
         }
-      },
-      "example" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshServiceInstance\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"ipkl2smsids-1\",\n    \"ownedByWorkspace\" : \"my-mobile-app-team\",\n    \"marketplaceIdentifier\" : \"ipkl2mtdg21\",\n    \"instanceId\" : \"serviceInstanceId\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"New SI\",\n    \"serviceId\" : \"ipkl2mtdg25\",\n    \"planId\" : \"ipkl2mtdg27\",\n    \"creator\" : \"admin@meshcloud.io\"\n  }\n}"
+      }
     },
     "metadataRoot" : {
       "type" : "object",
@@ -4642,30 +4631,13 @@
         }
       }
     },
-    "meshPaymentMethodListV2" : {
+    "meshObjectsRootV1" : {
       "type" : "object",
-      "required" : [ "_embedded", "_links", "page" ],
+      "required" : [ "_links" ],
       "properties" : {
         "_links" : {
           "type" : "object",
-          "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" : {
-            "meshPaymentMethods" : {
-              "type" : "array",
-              "description" : "List of <<mesh_paymentmethods_response_fields,meshPaymentMethod>>.",
-              "items" : { }
-            }
-          },
-          "required" : [ "meshPaymentMethods" ]
-        },
-        "page" : {
-          "type" : "object",
-          "description" : "See <<paging,Paging information>>.",
+          "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user.",
           "properties" : { }
         }
       }
@@ -4725,6 +4697,34 @@
       },
       "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\" : \"john.doe49a0\"\n  }\n}  "
     },
+    "meshPaymentMethodListV2" : {
+      "type" : "object",
+      "required" : [ "_embedded", "_links", "page" ],
+      "properties" : {
+        "_links" : {
+          "type" : "object",
+          "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" : {
+            "meshPaymentMethods" : {
+              "type" : "array",
+              "description" : "List of <<mesh_paymentmethods_response_fields,meshPaymentMethod>>.",
+              "items" : { }
+            }
+          },
+          "required" : [ "meshPaymentMethods" ]
+        },
+        "page" : {
+          "type" : "object",
+          "description" : "See <<paging,Paging information>>.",
+          "properties" : { }
+        }
+      }
+    },
     "meshWorkspaceUserBindingCreate" : {
       "type" : "object",
       "required" : [ "_links", "apiVersion", "kind", "metadata" ],
diff --git a/website/static/api/metadata.html b/website/static/api/metadata.html
index 27c44095f..454ce7fcf 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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/technical_specification.html b/website/static/api/technical_specification.html
index 08ed70d0a..d10be8625 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-12-04 09:51:05 UTC
+Last updated 2024-12-12 14:22:53 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/api_index.html b/website/static/billing-api/api_index.html
index 1431ae431..1caf8a578 100644
--- a/website/static/billing-api/api_index.html
+++ b/website/static/billing-api/api_index.html
@@ -559,7 +559,7 @@ <h3 id="_index">Index</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:50:58 UTC
+Last updated 2024-12-12 14:22:49 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 6f477fe6e..7ecbb49d1 100644
--- a/website/static/billing-api/common_data_formats.html
+++ b/website/static/billing-api/common_data_formats.html
@@ -519,7 +519,7 @@ <h3 id="paging">Paging</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:50:58 UTC
+Last updated 2024-12-12 14:22:49 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/index.html b/website/static/billing-api/index.html
index 414c95667..87edda2c4 100644
--- a/website/static/billing-api/index.html
+++ b/website/static/billing-api/index.html
@@ -1228,7 +1228,7 @@ <h5 id="_list_meshtenantusagereports"><a class="link" href="#_list_meshtenantusa
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-        "lastModified" : "2024-12-04T09:52:29.032796500Z",
+        "lastModified" : "2024-12-12T14:24:16.999379900Z",
         "finalized" : true
       },
       "spec" : {
@@ -1473,7 +1473,7 @@ <h5 id="_get_meshtenantusagereport"><a class="link" href="#_get_meshtenantusager
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-    "lastModified" : "2024-12-04T09:52:29.032796500Z",
+    "lastModified" : "2024-12-12T14:24:16.999379900Z",
     "finalized" : true
   },
   "spec" : {
@@ -1660,7 +1660,7 @@ <h5 id="_list_meshchargebacks"><a class="link" href="#_list_meshchargebacks">Lis
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-04T09:52:25.618547800Z",
+        "createdOn" : "2024-12-12T14:24:14.233639Z",
         "finalized" : true
       },
       "spec" : {
@@ -1722,7 +1722,7 @@ <h5 id="_list_meshchargebacks"><a class="link" href="#_list_meshchargebacks">Lis
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-04T09:52:25.620066Z",
+        "createdOn" : "2024-12-12T14:24:14.235252700Z",
         "finalized" : true
       },
       "spec" : {
@@ -2008,14 +2008,14 @@ <h5 id="_get_meshchargeback"><a class="link" href="#_get_meshchargeback">Get mes
 Expires: 0
 Strict-Transport-Security: max-age=31536000 ; includeSubDomains
 X-Frame-Options: DENY
-Content-Length: 1852
+Content-Length: 1849
 
 {
   "kind" : "meshChargeback",
   "apiVersion" : "v3",
   "metadata" : {
     "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-    "createdOn" : "2024-12-04T09:52:25.618547800Z",
+    "createdOn" : "2024-12-12T14:24:14.233639Z",
     "finalized" : true
   },
   "spec" : {
@@ -2356,7 +2356,7 @@ <h5 id="_put_meshresourceusagereports"><a class="link" href="#_put_meshresourceu
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:50:58 UTC
+Last updated 2024-12-12 14:22:49 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 8f865ca3c..e1cd13b4c 100644
--- a/website/static/billing-api/mesh_chargeback.html
+++ b/website/static/billing-api/mesh_chargeback.html
@@ -593,7 +593,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-04T09:52:25.618547800Z",
+        "createdOn" : "2024-12-12T14:24:14.233639Z",
         "finalized" : true
       },
       "spec" : {
@@ -655,7 +655,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-04T09:52:25.620066Z",
+        "createdOn" : "2024-12-12T14:24:14.235252700Z",
         "finalized" : true
       },
       "spec" : {
@@ -941,14 +941,14 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
 Expires: 0
 Strict-Transport-Security: max-age=31536000 ; includeSubDomains
 X-Frame-Options: DENY
-Content-Length: 1852
+Content-Length: 1849
 
 {
   "kind" : "meshChargeback",
   "apiVersion" : "v3",
   "metadata" : {
     "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-    "createdOn" : "2024-12-04T09:52:25.618547800Z",
+    "createdOn" : "2024-12-12T14:24:14.233639Z",
     "finalized" : true
   },
   "spec" : {
@@ -1013,7 +1013,7 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:50:58 UTC
+Last updated 2024-12-12 14:22:49 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/mesh_objects.html b/website/static/billing-api/mesh_objects.html
index 4f361977c..f4807b93f 100644
--- a/website/static/billing-api/mesh_objects.html
+++ b/website/static/billing-api/mesh_objects.html
@@ -728,7 +728,7 @@ <h5 id="_list_meshtenantusagereports">List meshTenantUsageReports</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-        "lastModified" : "2024-12-04T09:52:29.032796500Z",
+        "lastModified" : "2024-12-12T14:24:16.999379900Z",
         "finalized" : true
       },
       "spec" : {
@@ -973,7 +973,7 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-    "lastModified" : "2024-12-04T09:52:29.032796500Z",
+    "lastModified" : "2024-12-12T14:24:16.999379900Z",
     "finalized" : true
   },
   "spec" : {
@@ -1160,7 +1160,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-04T09:52:25.618547800Z",
+        "createdOn" : "2024-12-12T14:24:14.233639Z",
         "finalized" : true
       },
       "spec" : {
@@ -1222,7 +1222,7 @@ <h5 id="_list_meshchargebacks">List meshChargebacks</h5>
       "apiVersion" : "v3",
       "metadata" : {
         "name" : "2024-11-01Z/testPartner:testWorkspace:testProject",
-        "createdOn" : "2024-12-04T09:52:25.620066Z",
+        "createdOn" : "2024-12-12T14:24:14.235252700Z",
         "finalized" : true
       },
       "spec" : {
@@ -1508,14 +1508,14 @@ <h5 id="_get_meshchargeback">Get meshChargeback</h5>
 Expires: 0
 Strict-Transport-Security: max-age=31536000 ; includeSubDomains
 X-Frame-Options: DENY
-Content-Length: 1852
+Content-Length: 1849
 
 {
   "kind" : "meshChargeback",
   "apiVersion" : "v3",
   "metadata" : {
     "name" : "2024-12-01Z/testPartner:testWorkspace:testProject",
-    "createdOn" : "2024-12-04T09:52:25.618547800Z",
+    "createdOn" : "2024-12-12T14:24:14.233639Z",
     "finalized" : true
   },
   "spec" : {
@@ -1854,7 +1854,7 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:50:58 UTC
+Last updated 2024-12-12 14:22:49 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 1d4c8e703..60848a955 100644
--- a/website/static/billing-api/mesh_resource_usage_report.html
+++ b/website/static/billing-api/mesh_resource_usage_report.html
@@ -716,7 +716,7 @@ <h5 id="_put_meshresourceusagereports">Put meshResourceUsageReports</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:50:58 UTC
+Last updated 2024-12-12 14:22:49 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 c7d285796..e1fea2e05 100644
--- a/website/static/billing-api/mesh_tenant_usage_reports.html
+++ b/website/static/billing-api/mesh_tenant_usage_reports.html
@@ -605,7 +605,7 @@ <h5 id="_list_meshtenantusagereports">List meshTenantUsageReports</h5>
       "apiVersion" : "v2",
       "metadata" : {
         "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-        "lastModified" : "2024-12-04T09:52:29.032796500Z",
+        "lastModified" : "2024-12-12T14:24:16.999379900Z",
         "finalized" : true
       },
       "spec" : {
@@ -850,7 +850,7 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
   "apiVersion" : "v2",
   "metadata" : {
     "name" : "gcp1.gcp-ffm:project:2018-01-01Z",
-    "lastModified" : "2024-12-04T09:52:29.032796500Z",
+    "lastModified" : "2024-12-12T14:24:16.999379900Z",
     "finalized" : true
   },
   "spec" : {
@@ -887,7 +887,7 @@ <h5 id="_get_meshtenantusagereport">Get meshTenantUsageReport</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:50:58 UTC
+Last updated 2024-12-12 14:22:49 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 337d55471..5c78fd709 100644
--- a/website/static/billing-api/meshmetering-openapi-docs.json
+++ b/website/static/billing-api/meshmetering-openapi-docs.json
@@ -159,7 +159,7 @@
                 },
                 "examples" : {
                   "meshChargebackList" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-04T09:52:25.618547800Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-04T09:52:25.620066Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-12T14:24:14.235252700Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -275,7 +275,7 @@
                 },
                 "examples" : {
                   "meshTenantUsageReportsList" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-04T09:52:29.032796500Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -311,7 +311,7 @@
                 },
                 "examples" : {
                   "meshChargeback" : {
-                    "value" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-04T09:52:25.618547800Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -347,7 +347,7 @@
                 },
                 "examples" : {
                   "meshTenantUsageReport" : {
-                    "value" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-04T09:52:29.032796500Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}"
+                    "value" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -531,6 +531,17 @@
           }
         }
       },
+      "meshObjectsRoot" : {
+        "title" : "meshObjectsRoot",
+        "required" : [ "_links" ],
+        "type" : "object",
+        "properties" : {
+          "_links" : {
+            "type" : "object",
+            "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user."
+          }
+        }
+      },
       "meshChargeback" : {
         "title" : "meshChargeback",
         "required" : [ "_links", "apiVersion", "kind", "metadata", "spec", "status" ],
@@ -698,17 +709,6 @@
           }
         }
       },
-      "meshObjectsRoot" : {
-        "title" : "meshObjectsRoot",
-        "required" : [ "_links" ],
-        "type" : "object",
-        "properties" : {
-          "_links" : {
-            "type" : "object",
-            "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user."
-          }
-        }
-      },
       "meshTenantUsageReportsList" : {
         "title" : "meshTenantUsageReportsList",
         "required" : [ "_embedded", "_links", "page" ],
diff --git a/website/static/billing-api/meshmetering-postman-collection-original.json b/website/static/billing-api/meshmetering-postman-collection-original.json
index bd02e0d29..07880cc4b 100644
--- a/website/static/billing-api/meshmetering-postman-collection-original.json
+++ b/website/static/billing-api/meshmetering-postman-collection-original.json
@@ -200,7 +200,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-04T09:52:25.618547800Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-04T09:52:25.620066Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-12T14:24:14.235252700Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -329,7 +329,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-04T09:52:29.032796500Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -376,7 +376,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-04T09:52:25.618547800Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -423,7 +423,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-04T09:52:29.032796500Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}",
       "code" : 200
     } ]
   } ],
diff --git a/website/static/billing-api/meshmetering-postman-collection.json b/website/static/billing-api/meshmetering-postman-collection.json
index 775c052d8..dd0571c10 100644
--- a/website/static/billing-api/meshmetering-postman-collection.json
+++ b/website/static/billing-api/meshmetering-postman-collection.json
@@ -194,7 +194,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-04T09:52:25.618547800Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-04T09:52:25.620066Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-12T14:24:14.235252700Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -321,7 +321,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-04T09:52:29.032796500Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -366,7 +366,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-04T09:52:25.618547800Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -411,7 +411,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-04T09:52:29.032796500Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}",
+      "body" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}",
       "code" : 200
     } ]
   } ],
diff --git a/website/static/billing-api/meshmetering-swagger-docs.json b/website/static/billing-api/meshmetering-swagger-docs.json
index 609160cf2..5509b0666 100644
--- a/website/static/billing-api/meshmetering-swagger-docs.json
+++ b/website/static/billing-api/meshmetering-swagger-docs.json
@@ -122,7 +122,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-04T09:52:25.618547800Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-04T09:52:25.620066Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n  \"_embedded\" : {\n    \"meshChargebacks\" : [ {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-12-01Z\",\n        \"tags\" : {\n          \"paymentIdentifier\" : [ \"123\" ]\n        },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test1-localProjectId\",\n          \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n          \"reportId\" : \"test1-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 1.65,\n          \"baseNetAmount\" : 1.65,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        }, {\n          \"reportCategory\" : \"BILLING\",\n          \"platformTenantId\" : \"test2-localProjectId\",\n          \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n          \"reportId\" : \"test2-reportId\",\n          \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n          \"period\" : \"2019-07-01Z\",\n          \"netAmount\" : 3.12,\n          \"baseNetAmount\" : 3.12,\n          \"baseCurrency\" : \"EUR\",\n          \"exchangeRate\" : 1,\n          \"currency\" : \"EUR\",\n          \"sellerId\" : \"Operations\",\n          \"sellerProductGroup\" : \"Platform Team\"\n        } ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 4.77,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 4.77\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    }, {\n      \"kind\" : \"meshChargeback\",\n      \"apiVersion\" : \"v3\",\n      \"metadata\" : {\n        \"name\" : \"2024-11-01Z/testPartner:testWorkspace:testProject\",\n        \"createdOn\" : \"2024-12-12T14:24:14.235252700Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"period\" : \"2024-11-01Z\",\n        \"tags\" : { },\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"status\" : {\n        \"timeframe\" : {\n          \"from\" : \"2024-11-01T00:00:00Z\",\n          \"to\" : \"2024-12-01T00:00:00Z\"\n        },\n        \"lineItems\" : [ ],\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 0,\n          \"baseCurrency\" : \"EUR\",\n          \"baseNetAmount\" : 0\n        } ]\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-11-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks?workspaceIdentifier=testWorkspace&page=0&size=10&sort=name,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 2,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshChargebackList"
@@ -210,7 +210,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-04T09:52:29.032796500Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
+              "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n  \"_embedded\" : {\n    \"meshTenantUsageReports\" : [ {\n      \"kind\" : \"meshTenantUsageReport\",\n      \"apiVersion\" : \"v2\",\n      \"metadata\" : {\n        \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n        \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\n        \"finalized\" : true\n      },\n      \"spec\" : {\n        \"period\" : \"2018-01-01Z\",\n        \"reportCategory\" : \"BILLING\",\n        \"platformType\" : \"Gcp\",\n        \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n        \"platformTenantId\" : \"project\"\n      },\n      \"status\" : {\n        \"projectIdentifier\" : \"testProject\",\n        \"timeframe\" : {\n          \"from\" : \"2024-12-01T00:00:00Z\",\n          \"to\" : \"2025-01-01T00:00:00Z\"\n        },\n        \"netAmounts\" : [ {\n          \"currency\" : \"EUR\",\n          \"amount\" : 128,\n          \"baseCurrency\" : \"EUR\",\n          \"baseAmount\" : 0\n        } ],\n        \"workspaceIdentifier\" : \"testWorkspace\"\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports?workspaceIdentifier=testWorkspace&page=0&size=10&sort=period,desc\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 10,\n    \"totalElements\" : 1,\n    \"totalPages\" : 1,\n    \"number\" : 0\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshTenantUsageReportsList"
@@ -238,7 +238,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-04T09:52:25.618547800Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshchargeback.v3.hal+json" : "{\n  \"kind\" : \"meshChargeback\",\n  \"apiVersion\" : \"v3\",\n  \"metadata\" : {\n    \"name\" : \"2024-12-01Z/testPartner:testWorkspace:testProject\",\n    \"createdOn\" : \"2024-12-12T14:24:14.233639Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"period\" : \"2024-12-01Z\",\n    \"tags\" : {\n      \"paymentIdentifier\" : [ \"123\" ]\n    },\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"status\" : {\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"lineItems\" : [ {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test1-localProjectId\",\n      \"platformFullIdentifier\" : \"test1-instance.test1-location\",\n      \"reportId\" : \"test1-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 1.65,\n      \"baseNetAmount\" : 1.65,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    }, {\n      \"reportCategory\" : \"BILLING\",\n      \"platformTenantId\" : \"test2-localProjectId\",\n      \"platformFullIdentifier\" : \"test2-instance.test2-location\",\n      \"reportId\" : \"test2-reportId\",\n      \"entryDate\" : \"2019-08-03T00:07:01.289Z\",\n      \"period\" : \"2019-07-01Z\",\n      \"netAmount\" : 3.12,\n      \"baseNetAmount\" : 3.12,\n      \"baseCurrency\" : \"EUR\",\n      \"exchangeRate\" : 1,\n      \"currency\" : \"EUR\",\n      \"sellerId\" : \"Operations\",\n      \"sellerProductGroup\" : \"Platform Team\"\n    } ],\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 4.77,\n      \"baseCurrency\" : \"EUR\",\n      \"baseNetAmount\" : 4.77\n    } ]\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshchargebacks/2024-12-01Z/testPartner%3AtestWorkspace%3AtestProject\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshChargeback"
@@ -266,7 +266,7 @@
           "200" : {
             "description" : "",
             "examples" : {
-              "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-04T09:52:29.032796500Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}"
+              "application/vnd.meshcloud.api.meshtenantusagereport.v2.hal+json" : "{\n  \"kind\" : \"meshTenantUsageReport\",\n  \"apiVersion\" : \"v2\",\n  \"metadata\" : {\n    \"name\" : \"gcp1.gcp-ffm:project:2018-01-01Z\",\n    \"lastModified\" : \"2024-12-12T14:24:16.999379900Z\",\n    \"finalized\" : true\n  },\n  \"spec\" : {\n    \"period\" : \"2018-01-01Z\",\n    \"reportCategory\" : \"BILLING\",\n    \"platformType\" : \"Gcp\",\n    \"platformFullIdentifier\" : \"gcp1.gcp-ffm\",\n    \"platformTenantId\" : \"project\"\n  },\n  \"status\" : {\n    \"projectIdentifier\" : \"testProject\",\n    \"timeframe\" : {\n      \"from\" : \"2024-12-01T00:00:00Z\",\n      \"to\" : \"2025-01-01T00:00:00Z\"\n    },\n    \"netAmounts\" : [ {\n      \"currency\" : \"EUR\",\n      \"amount\" : 128,\n      \"baseCurrency\" : \"EUR\",\n      \"baseAmount\" : 0\n    } ],\n    \"workspaceIdentifier\" : \"testWorkspace\"\n  },\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-billing-url/api/meshobjects/meshtenantusagereports/gcp1.gcp-ffm%3Aproject/2018-01-01Z\"\n    }\n  }\n}"
             },
             "schema" : {
               "$ref" : "#/definitions/meshTenantUsageReport"
@@ -453,17 +453,6 @@
         }
       }
     },
-    "meshObjectsRoot" : {
-      "type" : "object",
-      "required" : [ "_links" ],
-      "properties" : {
-        "_links" : {
-          "type" : "object",
-          "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user.",
-          "properties" : { }
-        }
-      }
-    },
     "meshTenantUsageReportsList" : {
       "type" : "object",
       "required" : [ "_embedded", "_links", "page" ],
@@ -492,6 +481,17 @@
         }
       }
     },
+    "meshObjectsRoot" : {
+      "type" : "object",
+      "required" : [ "_links" ],
+      "properties" : {
+        "_links" : {
+          "type" : "object",
+          "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user.",
+          "properties" : { }
+        }
+      }
+    },
     "apiRoot" : {
       "type" : "object",
       "required" : [ "_links" ],
diff --git a/website/static/billing-api/overview.html b/website/static/billing-api/overview.html
index e7c91218c..b76ccde16 100644
--- a/website/static/billing-api/overview.html
+++ b/website/static/billing-api/overview.html
@@ -582,7 +582,7 @@ <h2 id="_data_types">Data Types</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:50:58 UTC
+Last updated 2024-12-12 14:22:49 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/billing-api/technical_specification.html b/website/static/billing-api/technical_specification.html
index 486358d7f..7d0fdf1c7 100644
--- a/website/static/billing-api/technical_specification.html
+++ b/website/static/billing-api/technical_specification.html
@@ -627,7 +627,7 @@ <h3 id="versioning">Versioning</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-12-04 09:50:58 UTC
+Last updated 2024-12-12 14:22:49 UTC
 </div>
 </div>
 </body>