From ce81f3f665be2f331ce887f516d155e38d2a4d7c Mon Sep 17 00:00:00 2001
From: "github-merge-queue[bot]"
 <118344674+github-merge-queue[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 15:25:48 +0000
Subject: [PATCH 1/2] docs: update meshStack API docs from latest develop build

---
 website/static/api/api_index.html             |   2 +-
 website/static/api/common_data_formats.html   |   2 +-
 website/static/api/index.html                 | 152 +++++++--------
 website/static/api/mesh_buildingblock.html    |  38 ++--
 .../static/api/mesh_object_collection.html    |   4 +-
 .../api/mesh_object_declarative_import.html   |   2 +-
 website/static/api/mesh_objects.html          | 150 +++++++--------
 website/static/api/mesh_paymentmethod.html    |  20 +-
 website/static/api/mesh_project.html          |  34 ++--
 website/static/api/mesh_serviceinstance.html  |  16 +-
 website/static/api/mesh_tenant.html           |  10 +-
 website/static/api/mesh_user.html             |   6 +-
 website/static/api/mesh_workspace.html        |  10 +-
 .../static/api/mesh_workspaceusergroup.html   |   2 +-
 .../static/api/meshstack-openapi-docs.json    | 108 +++++------
 ...meshstack-postman-collection-original.json | 168 ++++++++---------
 .../api/meshstack-postman-collection.json     | 176 +++++++++---------
 website/static/api/metadata.html              |   2 +-
 .../static/api/technical_specification.html   |   2 +-
 19 files changed, 452 insertions(+), 452 deletions(-)

diff --git a/website/static/api/api_index.html b/website/static/api/api_index.html
index e65357f40..6034f296d 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-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/common_data_formats.html b/website/static/api/common_data_formats.html
index ac15c6c2b..684082c50 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-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/index.html b/website/static/api/index.html
index 682785455..96f1ba1c0 100644
--- a/website/static/api/index.html
+++ b/website/static/api/index.html
@@ -1203,34 +1203,34 @@ <h3 id="mesh_objects"><a class="link" href="#mesh_objects">meshObjects</a></h3>
 
 {
   "_links" : {
+    "meshusers" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers/{username}",
+      "templated" : true
+    },
     "meshpaymentmethods" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}",
       "templated" : true
     },
-    "meshworkspaces" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
-    },
-    "meshworkspaceusergroups" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups"
+    "meshprojects" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
+      "templated" : true
     },
     "meshbuildingblocks" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}",
       "templated" : true
     },
-    "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
-      "templated" : true
-    },
     "meshserviceinstances" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
       "templated" : true
     },
-    "meshprojects" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
-      "templated" : true
+    "meshworkspaces" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
     },
-    "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers/{username}",
+    "meshworkspaceusergroups" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups"
+    },
+    "meshtenants" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
       "templated" : true
     },
     "self" : {
@@ -1369,7 +1369,7 @@ <h5 id="_list_meshworkspaces"><a class="link" href="#_list_meshworkspaces">List
       "kind" : "meshWorkspace",
       "metadata" : {
         "name" : "admin-customer",
-        "createdOn" : "2024-03-20T13:16:33Z"
+        "createdOn" : "2024-03-27T15:00:23Z"
       },
       "spec" : {
         "displayName" : "admin-customer",
@@ -1400,7 +1400,7 @@ <h5 id="_list_meshworkspaces"><a class="link" href="#_list_meshworkspaces">List
       "kind" : "meshWorkspace",
       "metadata" : {
         "name" : "demo-customer",
-        "createdOn" : "2024-03-20T13:16:33Z"
+        "createdOn" : "2024-03-27T15:00:23Z"
       },
       "spec" : {
         "displayName" : "demo-customer",
@@ -1431,7 +1431,7 @@ <h5 id="_list_meshworkspaces"><a class="link" href="#_list_meshworkspaces">List
       "kind" : "meshWorkspace",
       "metadata" : {
         "name" : "demo-partner",
-        "createdOn" : "2024-03-20T13:16:33Z"
+        "createdOn" : "2024-03-27T15:00:23Z"
       },
       "spec" : {
         "displayName" : "demo-partner",
@@ -1647,7 +1647,7 @@ <h5 id="_get_meshworkspace"><a class="link" href="#_get_meshworkspace">Get meshW
   "kind" : "meshWorkspace",
   "metadata" : {
     "name" : "admin-customer",
-    "createdOn" : "2024-03-20T13:16:33Z"
+    "createdOn" : "2024-03-27T15:00:23Z"
   },
   "spec" : {
     "displayName" : "admin-customer",
@@ -1741,7 +1741,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=4ykk1mpdsv2&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=a0fl0mpdsv2&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>
@@ -1750,7 +1750,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=4ykk1mpdsv2&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=a0fl0mpdsv2&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>
@@ -1819,16 +1819,16 @@ <h5 id="_list_meshprojects"><a class="link" href="#_list_meshprojects">List mesh
       },
       "metadata" : {
         "name" : "test-project-1",
-        "ownedByWorkspace" : "4ykk1mpdsv2",
-        "createdOn" : "2024-03-20T13:17:23.314713Z"
+        "ownedByWorkspace" : "a0fl0mpdsv2",
+        "createdOn" : "2024-03-27T15:01:11.991770Z"
       },
       "kind" : "meshProject",
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1"
         },
         "meshtenants" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshusers" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshusers"
@@ -1841,16 +1841,16 @@ <h5 id="_list_meshprojects"><a class="link" href="#_list_meshprojects">List mesh
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     }
   },
   "page" : {
@@ -1890,7 +1890,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/4ykk1mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1899,7 +1899,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/4ykk1mpdsv2.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/a0fl0mpdsv2.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>
@@ -2043,16 +2043,16 @@ <h5 id="_get_meshproject"><a class="link" href="#_get_meshproject">Get meshProje
   },
   "metadata" : {
     "name" : "test-project-1",
-    "ownedByWorkspace" : "4ykk1mpdsv2",
-    "createdOn" : "2024-03-20T13:17:23.314713Z"
+    "ownedByWorkspace" : "a0fl0mpdsv2",
+    "createdOn" : "2024-03-27T15:01:11.991770Z"
   },
   "kind" : "meshProject",
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshusers" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshusers"
@@ -2216,11 +2216,11 @@ <h5 id="_list_meshtenants"><a class="link" href="#_list_meshtenants">List meshTe
         "ownedByProject" : "test-project",
         "ownedByWorkspace" : "test-workspace",
         "platformIdentifier" : "azure.meshcloud-azure-dev",
-        "deletedOn" : "2024-03-21T13:17:25.954042Z",
+        "deletedOn" : "2024-03-28T15:01:14.636832Z",
         "assignedTags" : { }
       },
       "spec" : {
-        "localId" : "ed311a8d-8705-4d0e-bf79-ebd5e117991e",
+        "localId" : "2fb9cafb-05e5-468c-a4df-fd7946a3eae4",
         "landingZoneIdentifier" : "stage-dev",
         "quotas" : [ {
           "key" : "limits.cpu",
@@ -2411,11 +2411,11 @@ <h5 id="_get_meshtenant"><a class="link" href="#_get_meshtenant">Get meshTenant<
     "ownedByProject" : "test-project",
     "ownedByWorkspace" : "test-workspace",
     "platformIdentifier" : "azure.meshcloud-azure-dev",
-    "deletedOn" : "2024-03-21T13:17:25.954042Z",
+    "deletedOn" : "2024-03-28T15:01:14.636832Z",
     "assignedTags" : { }
   },
   "spec" : {
-    "localId" : "ed311a8d-8705-4d0e-bf79-ebd5e117991e",
+    "localId" : "2fb9cafb-05e5-468c-a4df-fd7946a3eae4",
     "landingZoneIdentifier" : "stage-dev",
     "quotas" : [ {
       "key" : "limits.cpu",
@@ -2594,12 +2594,12 @@ <h5 id="_list_meshbuildingblocks"><a class="link" href="#_list_meshbuildingblock
       "apiVersion" : "v1",
       "kind" : "meshBuildingBlock",
       "metadata" : {
-        "uuid" : "3406c844-d8d0-4966-a1d4-faebc80560ea",
-        "definitionUuid" : "3a2824e9-9f27-4f5b-9537-dc2d324496cd",
+        "uuid" : "e021a7fb-01b3-4e46-afad-9de6d8b06fe0",
+        "definitionUuid" : "10f838b0-db1f-4a05-b9b9-5aa515c69f31",
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-03-20T13:17:18.386020Z"
+        "createdOn" : "2024-03-27T15:01:07.054938Z"
       },
       "spec" : {
         "displayName" : "parent block",
@@ -2612,7 +2612,7 @@ <h5 id="_list_meshbuildingblocks"><a class="link" href="#_list_meshbuildingblock
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/3406c844-d8d0-4966-a1d4-faebc80560ea"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/e021a7fb-01b3-4e46-afad-9de6d8b06fe0"
         },
         "meshtenant" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
@@ -2622,12 +2622,12 @@ <h5 id="_list_meshbuildingblocks"><a class="link" href="#_list_meshbuildingblock
       "apiVersion" : "v1",
       "kind" : "meshBuildingBlock",
       "metadata" : {
-        "uuid" : "901482dc-9239-426c-abdb-791d077038c4",
-        "definitionUuid" : "91313033-f844-411b-892b-a70dd2476aa6",
+        "uuid" : "10b95856-7733-4f3e-a6dc-45cbda064dd1",
+        "definitionUuid" : "542b5bb3-7786-424f-8754-8894a8e1ef36",
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-03-20T13:17:18.393688Z"
+        "createdOn" : "2024-03-27T15:01:07.064379Z"
       },
       "spec" : {
         "displayName" : "child block",
@@ -2637,8 +2637,8 @@ <h5 id="_list_meshbuildingblocks"><a class="link" href="#_list_meshbuildingblock
           "valueType" : "STRING"
         } ],
         "parentBuildingBlocks" : [ {
-          "buildingBlockUuid" : "3406c844-d8d0-4966-a1d4-faebc80560ea",
-          "definitionUuid" : "3a2824e9-9f27-4f5b-9537-dc2d324496cd"
+          "buildingBlockUuid" : "e021a7fb-01b3-4e46-afad-9de6d8b06fe0",
+          "definitionUuid" : "10f838b0-db1f-4a05-b9b9-5aa515c69f31"
         } ]
       },
       "status" : {
@@ -2651,7 +2651,7 @@ <h5 id="_list_meshbuildingblocks"><a class="link" href="#_list_meshbuildingblock
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1"
         },
         "meshtenant" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
@@ -2701,7 +2701,7 @@ <h5 id="_get_meshbuildingblock"><a class="link" href="#_get_meshbuildingblock">G
 <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/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4 HTTP/1.1
+<pre class="highlightjs highlight nowrap"><code data-lang="http" class="language-http hljs">GET /api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2710,7 +2710,7 @@ <h5 id="_get_meshbuildingblock"><a class="link" href="#_get_meshbuildingblock">G
 <div class="listingblock">
 <div class="title">Example Curl Request</div>
 <div class="content">
-<pre class="highlightjs highlight"><code data-lang="bash" class="language-bash hljs">$ curl 'https://mesh-backend-url/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4' -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/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json'</code></pre>
 </div>
 </div>
@@ -2906,12 +2906,12 @@ <h5 id="_get_meshbuildingblock"><a class="link" href="#_get_meshbuildingblock">G
   "apiVersion" : "v1",
   "kind" : "meshBuildingBlock",
   "metadata" : {
-    "uuid" : "901482dc-9239-426c-abdb-791d077038c4",
-    "definitionUuid" : "91313033-f844-411b-892b-a70dd2476aa6",
+    "uuid" : "10b95856-7733-4f3e-a6dc-45cbda064dd1",
+    "definitionUuid" : "542b5bb3-7786-424f-8754-8894a8e1ef36",
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-03-20T13:17:18.393688Z"
+    "createdOn" : "2024-03-27T15:01:07.064379Z"
   },
   "spec" : {
     "displayName" : "child block",
@@ -2921,8 +2921,8 @@ <h5 id="_get_meshbuildingblock"><a class="link" href="#_get_meshbuildingblock">G
       "valueType" : "STRING"
     } ],
     "parentBuildingBlocks" : [ {
-      "buildingBlockUuid" : "3406c844-d8d0-4966-a1d4-faebc80560ea",
-      "definitionUuid" : "3a2824e9-9f27-4f5b-9537-dc2d324496cd"
+      "buildingBlockUuid" : "e021a7fb-01b3-4e46-afad-9de6d8b06fe0",
+      "definitionUuid" : "10f838b0-db1f-4a05-b9b9-5aa515c69f31"
     } ]
   },
   "status" : {
@@ -2935,7 +2935,7 @@ <h5 id="_get_meshbuildingblock"><a class="link" href="#_get_meshbuildingblock">G
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1"
     },
     "meshtenant" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
@@ -3005,7 +3005,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=4ykk1mpmdsv2&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=a0fl0mpmdsv2&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>
@@ -3014,7 +3014,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=4ykk1mpmdsv2&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=a0fl0mpmdsv2&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>
@@ -3079,7 +3079,7 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
       "kind" : "meshPaymentMethod",
       "metadata" : {
         "name" : "test-payment-method-1",
-        "ownedByWorkspace" : "4ykk1mpmdsv2"
+        "ownedByWorkspace" : "a0fl0mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 1",
@@ -3098,7 +3098,7 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
       "kind" : "meshPaymentMethod",
       "metadata" : {
         "name" : "test-payment-method-2",
-        "ownedByWorkspace" : "4ykk1mpmdsv2"
+        "ownedByWorkspace" : "a0fl0mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 2",
@@ -3116,16 +3116,16 @@ <h5 id="_list_meshpaymentmethods"><a class="link" href="#_list_meshpaymentmethod
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=0&amp;size=2"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=0&amp;size=2"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=1&amp;size=2"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=1&amp;size=2"
     }
   },
   "page" : {
@@ -3291,7 +3291,7 @@ <h5 id="_get_meshpaymentmethod"><a class="link" href="#_get_meshpaymentmethod">G
   "kind" : "meshPaymentMethod",
   "metadata" : {
     "name" : "test-payment-method-1",
-    "ownedByWorkspace" : "4ykk1mpmdsv2"
+    "ownedByWorkspace" : "a0fl0mpmdsv2"
   },
   "spec" : {
     "displayName" : "Test Payment Method 1",
@@ -3498,7 +3498,7 @@ <h5 id="_list_meshusers"><a class="link" href="#_list_meshusers">List meshUsers<
         "email" : "john-doe@example.com",
         "firstName" : "John",
         "lastName" : "Doe",
-        "euid" : "5fdb7ffb-4151-49ea-910f-543b47308fc0",
+        "euid" : "e592b4a9-1fe3-4af0-a735-168f9823604a",
         "tags" : {
           "environment" : [ "dev", "test", "qa" ]
         }
@@ -3695,7 +3695,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" : "5fdb7ffb-4151-49ea-910f-543b47308fc0",
+    "euid" : "e592b4a9-1fe3-4af0-a735-168f9823604a",
     "tags" : {
       "environment" : [ "dev", "test", "qa" ]
     }
@@ -4217,18 +4217,18 @@ <h5 id="_list_meshserviceinstances"><a class="link" href="#_list_meshserviceinst
       "apiVersion" : "v2",
       "kind" : "meshServiceInstance",
       "metadata" : {
-        "ownedByProject" : "4ykk1mtdg10",
+        "ownedByProject" : "a0fl0mtdg10",
         "ownedByWorkspace" : "my-mobile-app-team",
-        "marketplaceIdentifier" : "4ykk1mtdg1",
-        "instanceId" : "4ykk1mtdg11"
+        "marketplaceIdentifier" : "a0fl0mtdg1",
+        "instanceId" : "a0fl0mtdg11"
       },
       "spec" : {
-        "displayName" : "4ykk1mtdg12",
-        "serviceId" : "4ykk1mtdg5",
-        "planId" : "4ykk1mtdg7",
+        "displayName" : "a0fl0mtdg12",
+        "serviceId" : "a0fl0mtdg5",
+        "planId" : "a0fl0mtdg7",
         "creator" : "Unknown"
       },
-      "meaningfulIdentifier" : "meshServiceInstance[4ykk1mtdg11, proj: 4ykk1mtdg10, ws: my-mobile-app-team]"
+      "meaningfulIdentifier" : "meshServiceInstance[a0fl0mtdg11, proj: a0fl0mtdg10, ws: my-mobile-app-team]"
     } ]
   },
   "_links" : {
@@ -5575,7 +5575,7 @@ <h4 id="_deletemeshobjectcollection"><a class="link" href="#_deletemeshobjectcol
 {
   "error" : "MeshBadRequestException",
   "message" : "MeshObjectCollection not-empty-collection cannot be deleted, because it is not empty",
-  "errorId" : "dnHKsd7yMP"
+  "errorId" : "6EHQIADxAN"
 }</code></pre>
 </div>
 </div>
@@ -5837,7 +5837,7 @@ <h4 id="openstack_project_metadata"><a class="link" href="#openstack_project_met
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 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 3dbe55a56..36ff6b40a 100644
--- a/website/static/api/mesh_buildingblock.html
+++ b/website/static/api/mesh_buildingblock.html
@@ -596,12 +596,12 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
       "apiVersion" : "v1",
       "kind" : "meshBuildingBlock",
       "metadata" : {
-        "uuid" : "3406c844-d8d0-4966-a1d4-faebc80560ea",
-        "definitionUuid" : "3a2824e9-9f27-4f5b-9537-dc2d324496cd",
+        "uuid" : "e021a7fb-01b3-4e46-afad-9de6d8b06fe0",
+        "definitionUuid" : "10f838b0-db1f-4a05-b9b9-5aa515c69f31",
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-03-20T13:17:18.386020Z"
+        "createdOn" : "2024-03-27T15:01:07.054938Z"
       },
       "spec" : {
         "displayName" : "parent block",
@@ -614,7 +614,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/3406c844-d8d0-4966-a1d4-faebc80560ea"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/e021a7fb-01b3-4e46-afad-9de6d8b06fe0"
         },
         "meshtenant" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
@@ -624,12 +624,12 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
       "apiVersion" : "v1",
       "kind" : "meshBuildingBlock",
       "metadata" : {
-        "uuid" : "901482dc-9239-426c-abdb-791d077038c4",
-        "definitionUuid" : "91313033-f844-411b-892b-a70dd2476aa6",
+        "uuid" : "10b95856-7733-4f3e-a6dc-45cbda064dd1",
+        "definitionUuid" : "542b5bb3-7786-424f-8754-8894a8e1ef36",
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-03-20T13:17:18.393688Z"
+        "createdOn" : "2024-03-27T15:01:07.064379Z"
       },
       "spec" : {
         "displayName" : "child block",
@@ -639,8 +639,8 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
           "valueType" : "STRING"
         } ],
         "parentBuildingBlocks" : [ {
-          "buildingBlockUuid" : "3406c844-d8d0-4966-a1d4-faebc80560ea",
-          "definitionUuid" : "3a2824e9-9f27-4f5b-9537-dc2d324496cd"
+          "buildingBlockUuid" : "e021a7fb-01b3-4e46-afad-9de6d8b06fe0",
+          "definitionUuid" : "10f838b0-db1f-4a05-b9b9-5aa515c69f31"
         } ]
       },
       "status" : {
@@ -653,7 +653,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1"
         },
         "meshtenant" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
@@ -703,7 +703,7 @@ <h5 id="_get_meshbuildingblock">Get 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">GET /api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json
 Host: mesh-backend-url</code></pre>
@@ -712,7 +712,7 @@ <h5 id="_get_meshbuildingblock">Get 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/901482dc-9239-426c-abdb-791d077038c4' -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/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json'</code></pre>
 </div>
 </div>
@@ -908,12 +908,12 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
   "apiVersion" : "v1",
   "kind" : "meshBuildingBlock",
   "metadata" : {
-    "uuid" : "901482dc-9239-426c-abdb-791d077038c4",
-    "definitionUuid" : "91313033-f844-411b-892b-a70dd2476aa6",
+    "uuid" : "10b95856-7733-4f3e-a6dc-45cbda064dd1",
+    "definitionUuid" : "542b5bb3-7786-424f-8754-8894a8e1ef36",
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-03-20T13:17:18.393688Z"
+    "createdOn" : "2024-03-27T15:01:07.064379Z"
   },
   "spec" : {
     "displayName" : "child block",
@@ -923,8 +923,8 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
       "valueType" : "STRING"
     } ],
     "parentBuildingBlocks" : [ {
-      "buildingBlockUuid" : "3406c844-d8d0-4966-a1d4-faebc80560ea",
-      "definitionUuid" : "3a2824e9-9f27-4f5b-9537-dc2d324496cd"
+      "buildingBlockUuid" : "e021a7fb-01b3-4e46-afad-9de6d8b06fe0",
+      "definitionUuid" : "10f838b0-db1f-4a05-b9b9-5aa515c69f31"
     } ]
   },
   "status" : {
@@ -937,7 +937,7 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1"
     },
     "meshtenant" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
@@ -951,7 +951,7 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_object_collection.html b/website/static/api/mesh_object_collection.html
index 4008ab698..43285ca4b 100644
--- a/website/static/api/mesh_object_collection.html
+++ b/website/static/api/mesh_object_collection.html
@@ -678,7 +678,7 @@ <h4 id="_deletemeshobjectcollection">deleteMeshObjectCollection</h4>
 {
   "error" : "MeshBadRequestException",
   "message" : "MeshObjectCollection not-empty-collection cannot be deleted, because it is not empty",
-  "errorId" : "dnHKsd7yMP"
+  "errorId" : "6EHQIADxAN"
 }</code></pre>
 </div>
 </div>
@@ -687,7 +687,7 @@ <h4 id="_deletemeshobjectcollection">deleteMeshObjectCollection</h4>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 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 424bfe3e3..49e7505a9 100644
--- a/website/static/api/mesh_object_declarative_import.html
+++ b/website/static/api/mesh_object_declarative_import.html
@@ -1523,7 +1523,7 @@ <h5 id="_meshexchangerate">meshExchangeRate</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_objects.html b/website/static/api/mesh_objects.html
index 07cafb12f..f68f2506b 100644
--- a/website/static/api/mesh_objects.html
+++ b/website/static/api/mesh_objects.html
@@ -573,34 +573,34 @@ <h3 id="mesh_objects">meshObjects</h3>
 
 {
   "_links" : {
+    "meshusers" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshusers/{username}",
+      "templated" : true
+    },
     "meshpaymentmethods" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}",
       "templated" : true
     },
-    "meshworkspaces" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
-    },
-    "meshworkspaceusergroups" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups"
+    "meshprojects" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
+      "templated" : true
     },
     "meshbuildingblocks" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}",
       "templated" : true
     },
-    "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
-      "templated" : true
-    },
     "meshserviceinstances" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}",
       "templated" : true
     },
-    "meshprojects" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}",
-      "templated" : true
+    "meshworkspaces" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaces"
     },
-    "meshusers" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshusers/{username}",
+    "meshworkspaceusergroups" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups"
+    },
+    "meshtenants" : {
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}",
       "templated" : true
     },
     "self" : {
@@ -739,7 +739,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "kind" : "meshWorkspace",
       "metadata" : {
         "name" : "admin-customer",
-        "createdOn" : "2024-03-20T13:16:33Z"
+        "createdOn" : "2024-03-27T15:00:23Z"
       },
       "spec" : {
         "displayName" : "admin-customer",
@@ -770,7 +770,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "kind" : "meshWorkspace",
       "metadata" : {
         "name" : "demo-customer",
-        "createdOn" : "2024-03-20T13:16:33Z"
+        "createdOn" : "2024-03-27T15:00:23Z"
       },
       "spec" : {
         "displayName" : "demo-customer",
@@ -801,7 +801,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "kind" : "meshWorkspace",
       "metadata" : {
         "name" : "demo-partner",
-        "createdOn" : "2024-03-20T13:16:33Z"
+        "createdOn" : "2024-03-27T15:00:23Z"
       },
       "spec" : {
         "displayName" : "demo-partner",
@@ -1017,7 +1017,7 @@ <h5 id="_get_meshworkspace">Get meshWorkspace</h5>
   "kind" : "meshWorkspace",
   "metadata" : {
     "name" : "admin-customer",
-    "createdOn" : "2024-03-20T13:16:33Z"
+    "createdOn" : "2024-03-27T15:00:23Z"
   },
   "spec" : {
     "displayName" : "admin-customer",
@@ -1111,7 +1111,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=4ykk1mpdsv2&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=a0fl0mpdsv2&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>
@@ -1120,7 +1120,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=4ykk1mpdsv2&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=a0fl0mpdsv2&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>
@@ -1189,16 +1189,16 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       },
       "metadata" : {
         "name" : "test-project-1",
-        "ownedByWorkspace" : "4ykk1mpdsv2",
-        "createdOn" : "2024-03-20T13:17:23.314713Z"
+        "ownedByWorkspace" : "a0fl0mpdsv2",
+        "createdOn" : "2024-03-27T15:01:11.991770Z"
       },
       "kind" : "meshProject",
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1"
         },
         "meshtenants" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshusers" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshusers"
@@ -1211,16 +1211,16 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     }
   },
   "page" : {
@@ -1260,7 +1260,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/4ykk1mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -1269,7 +1269,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/4ykk1mpdsv2.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/a0fl0mpdsv2.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>
@@ -1413,16 +1413,16 @@ <h5 id="_get_meshproject">Get meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-1",
-    "ownedByWorkspace" : "4ykk1mpdsv2",
-    "createdOn" : "2024-03-20T13:17:23.314713Z"
+    "ownedByWorkspace" : "a0fl0mpdsv2",
+    "createdOn" : "2024-03-27T15:01:11.991770Z"
   },
   "kind" : "meshProject",
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshusers" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshusers"
@@ -1586,11 +1586,11 @@ <h5 id="_list_meshtenants">List meshTenants</h5>
         "ownedByProject" : "test-project",
         "ownedByWorkspace" : "test-workspace",
         "platformIdentifier" : "azure.meshcloud-azure-dev",
-        "deletedOn" : "2024-03-21T13:17:25.954042Z",
+        "deletedOn" : "2024-03-28T15:01:14.636832Z",
         "assignedTags" : { }
       },
       "spec" : {
-        "localId" : "ed311a8d-8705-4d0e-bf79-ebd5e117991e",
+        "localId" : "2fb9cafb-05e5-468c-a4df-fd7946a3eae4",
         "landingZoneIdentifier" : "stage-dev",
         "quotas" : [ {
           "key" : "limits.cpu",
@@ -1781,11 +1781,11 @@ <h5 id="_get_meshtenant">Get meshTenant</h5>
     "ownedByProject" : "test-project",
     "ownedByWorkspace" : "test-workspace",
     "platformIdentifier" : "azure.meshcloud-azure-dev",
-    "deletedOn" : "2024-03-21T13:17:25.954042Z",
+    "deletedOn" : "2024-03-28T15:01:14.636832Z",
     "assignedTags" : { }
   },
   "spec" : {
-    "localId" : "ed311a8d-8705-4d0e-bf79-ebd5e117991e",
+    "localId" : "2fb9cafb-05e5-468c-a4df-fd7946a3eae4",
     "landingZoneIdentifier" : "stage-dev",
     "quotas" : [ {
       "key" : "limits.cpu",
@@ -1964,12 +1964,12 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
       "apiVersion" : "v1",
       "kind" : "meshBuildingBlock",
       "metadata" : {
-        "uuid" : "3406c844-d8d0-4966-a1d4-faebc80560ea",
-        "definitionUuid" : "3a2824e9-9f27-4f5b-9537-dc2d324496cd",
+        "uuid" : "e021a7fb-01b3-4e46-afad-9de6d8b06fe0",
+        "definitionUuid" : "10f838b0-db1f-4a05-b9b9-5aa515c69f31",
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-03-20T13:17:18.386020Z"
+        "createdOn" : "2024-03-27T15:01:07.054938Z"
       },
       "spec" : {
         "displayName" : "parent block",
@@ -1982,7 +1982,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/3406c844-d8d0-4966-a1d4-faebc80560ea"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/e021a7fb-01b3-4e46-afad-9de6d8b06fe0"
         },
         "meshtenant" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
@@ -1992,12 +1992,12 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
       "apiVersion" : "v1",
       "kind" : "meshBuildingBlock",
       "metadata" : {
-        "uuid" : "901482dc-9239-426c-abdb-791d077038c4",
-        "definitionUuid" : "91313033-f844-411b-892b-a70dd2476aa6",
+        "uuid" : "10b95856-7733-4f3e-a6dc-45cbda064dd1",
+        "definitionUuid" : "542b5bb3-7786-424f-8754-8894a8e1ef36",
         "definitionVersion" : 1,
         "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
         "forcePurge" : false,
-        "createdOn" : "2024-03-20T13:17:18.393688Z"
+        "createdOn" : "2024-03-27T15:01:07.064379Z"
       },
       "spec" : {
         "displayName" : "child block",
@@ -2007,8 +2007,8 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
           "valueType" : "STRING"
         } ],
         "parentBuildingBlocks" : [ {
-          "buildingBlockUuid" : "3406c844-d8d0-4966-a1d4-faebc80560ea",
-          "definitionUuid" : "3a2824e9-9f27-4f5b-9537-dc2d324496cd"
+          "buildingBlockUuid" : "e021a7fb-01b3-4e46-afad-9de6d8b06fe0",
+          "definitionUuid" : "10f838b0-db1f-4a05-b9b9-5aa515c69f31"
         } ]
       },
       "status" : {
@@ -2021,7 +2021,7 @@ <h5 id="_list_meshbuildingblocks">List meshBuildingBlocks</h5>
       },
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1"
         },
         "meshtenant" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
@@ -2071,7 +2071,7 @@ <h5 id="_get_meshbuildingblock">Get 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">GET /api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json
 Host: mesh-backend-url</code></pre>
@@ -2080,7 +2080,7 @@ <h5 id="_get_meshbuildingblock">Get 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/901482dc-9239-426c-abdb-791d077038c4' -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/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1' -i -u 'valid_username:valid_password' -X GET \
     -H 'Accept: application/vnd.meshcloud.api.meshbuildingblock.v1.hal+json'</code></pre>
 </div>
 </div>
@@ -2276,12 +2276,12 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
   "apiVersion" : "v1",
   "kind" : "meshBuildingBlock",
   "metadata" : {
-    "uuid" : "901482dc-9239-426c-abdb-791d077038c4",
-    "definitionUuid" : "91313033-f844-411b-892b-a70dd2476aa6",
+    "uuid" : "10b95856-7733-4f3e-a6dc-45cbda064dd1",
+    "definitionUuid" : "542b5bb3-7786-424f-8754-8894a8e1ef36",
     "definitionVersion" : 1,
     "tenantIdentifier" : "my-workspace.my-project.my-platform.my-location",
     "forcePurge" : false,
-    "createdOn" : "2024-03-20T13:17:18.393688Z"
+    "createdOn" : "2024-03-27T15:01:07.064379Z"
   },
   "spec" : {
     "displayName" : "child block",
@@ -2291,8 +2291,8 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
       "valueType" : "STRING"
     } ],
     "parentBuildingBlocks" : [ {
-      "buildingBlockUuid" : "3406c844-d8d0-4966-a1d4-faebc80560ea",
-      "definitionUuid" : "3a2824e9-9f27-4f5b-9537-dc2d324496cd"
+      "buildingBlockUuid" : "e021a7fb-01b3-4e46-afad-9de6d8b06fe0",
+      "definitionUuid" : "10f838b0-db1f-4a05-b9b9-5aa515c69f31"
     } ]
   },
   "status" : {
@@ -2305,7 +2305,7 @@ <h5 id="_get_meshbuildingblock">Get meshBuildingBlock</h5>
   },
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1"
     },
     "meshtenant" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location"
@@ -2375,7 +2375,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=4ykk1mpmdsv2&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=a0fl0mpmdsv2&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>
@@ -2384,7 +2384,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=4ykk1mpmdsv2&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=a0fl0mpmdsv2&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>
@@ -2449,7 +2449,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
       "kind" : "meshPaymentMethod",
       "metadata" : {
         "name" : "test-payment-method-1",
-        "ownedByWorkspace" : "4ykk1mpmdsv2"
+        "ownedByWorkspace" : "a0fl0mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 1",
@@ -2468,7 +2468,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
       "kind" : "meshPaymentMethod",
       "metadata" : {
         "name" : "test-payment-method-2",
-        "ownedByWorkspace" : "4ykk1mpmdsv2"
+        "ownedByWorkspace" : "a0fl0mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 2",
@@ -2486,16 +2486,16 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=0&amp;size=2"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=0&amp;size=2"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=1&amp;size=2"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=1&amp;size=2"
     }
   },
   "page" : {
@@ -2661,7 +2661,7 @@ <h5 id="_get_meshpaymentmethod">Get meshPaymentMethod</h5>
   "kind" : "meshPaymentMethod",
   "metadata" : {
     "name" : "test-payment-method-1",
-    "ownedByWorkspace" : "4ykk1mpmdsv2"
+    "ownedByWorkspace" : "a0fl0mpmdsv2"
   },
   "spec" : {
     "displayName" : "Test Payment Method 1",
@@ -2868,7 +2868,7 @@ <h5 id="_list_meshusers">List meshUsers</h5>
         "email" : "john-doe@example.com",
         "firstName" : "John",
         "lastName" : "Doe",
-        "euid" : "5fdb7ffb-4151-49ea-910f-543b47308fc0",
+        "euid" : "e592b4a9-1fe3-4af0-a735-168f9823604a",
         "tags" : {
           "environment" : [ "dev", "test", "qa" ]
         }
@@ -3065,7 +3065,7 @@ <h5 id="_get_meshuser">Get meshUser</h5>
     "email" : "john-doe@example.com",
     "firstName" : "John",
     "lastName" : "Doe",
-    "euid" : "5fdb7ffb-4151-49ea-910f-543b47308fc0",
+    "euid" : "e592b4a9-1fe3-4af0-a735-168f9823604a",
     "tags" : {
       "environment" : [ "dev", "test", "qa" ]
     }
@@ -3587,18 +3587,18 @@ <h5 id="_list_meshserviceinstances">List meshServiceInstances</h5>
       "apiVersion" : "v2",
       "kind" : "meshServiceInstance",
       "metadata" : {
-        "ownedByProject" : "4ykk1mtdg10",
+        "ownedByProject" : "a0fl0mtdg10",
         "ownedByWorkspace" : "my-mobile-app-team",
-        "marketplaceIdentifier" : "4ykk1mtdg1",
-        "instanceId" : "4ykk1mtdg11"
+        "marketplaceIdentifier" : "a0fl0mtdg1",
+        "instanceId" : "a0fl0mtdg11"
       },
       "spec" : {
-        "displayName" : "4ykk1mtdg12",
-        "serviceId" : "4ykk1mtdg5",
-        "planId" : "4ykk1mtdg7",
+        "displayName" : "a0fl0mtdg12",
+        "serviceId" : "a0fl0mtdg5",
+        "planId" : "a0fl0mtdg7",
         "creator" : "Unknown"
       },
-      "meaningfulIdentifier" : "meshServiceInstance[4ykk1mtdg11, proj: 4ykk1mtdg10, ws: my-mobile-app-team]"
+      "meaningfulIdentifier" : "meshServiceInstance[a0fl0mtdg11, proj: a0fl0mtdg10, ws: my-mobile-app-team]"
     } ]
   },
   "_links" : {
@@ -4710,7 +4710,7 @@ <h5 id="_meshexchangerate">meshExchangeRate</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_paymentmethod.html b/website/static/api/mesh_paymentmethod.html
index 1bad2403e..5f2cc296c 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=4ykk1mpmdsv2&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=a0fl0mpmdsv2&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=4ykk1mpmdsv2&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=a0fl0mpmdsv2&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>
       "kind" : "meshPaymentMethod",
       "metadata" : {
         "name" : "test-payment-method-1",
-        "ownedByWorkspace" : "4ykk1mpmdsv2"
+        "ownedByWorkspace" : "a0fl0mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 1",
@@ -592,7 +592,7 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
       "kind" : "meshPaymentMethod",
       "metadata" : {
         "name" : "test-payment-method-2",
-        "ownedByWorkspace" : "4ykk1mpmdsv2"
+        "ownedByWorkspace" : "a0fl0mpmdsv2"
       },
       "spec" : {
         "displayName" : "Test Payment Method 2",
@@ -610,16 +610,16 @@ <h5 id="_list_meshpaymentmethods">List meshPaymentMethods</h5>
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=0&amp;size=2"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=0&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=0&amp;size=2"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=1&amp;size=2"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&amp;page=1&amp;size=2"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&amp;page=1&amp;size=2"
     }
   },
   "page" : {
@@ -785,7 +785,7 @@ <h5 id="_get_meshpaymentmethod">Get meshPaymentMethod</h5>
   "kind" : "meshPaymentMethod",
   "metadata" : {
     "name" : "test-payment-method-1",
-    "ownedByWorkspace" : "4ykk1mpmdsv2"
+    "ownedByWorkspace" : "a0fl0mpmdsv2"
   },
   "spec" : {
     "displayName" : "Test Payment Method 1",
@@ -807,7 +807,7 @@ <h5 id="_get_meshpaymentmethod">Get meshPaymentMethod</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_project.html b/website/static/api/mesh_project.html
index 0a424a018..a0e7253a2 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=4ykk1mpdsv2&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=a0fl0mpdsv2&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=4ykk1mpdsv2&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=a0fl0mpdsv2&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>
@@ -581,16 +581,16 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
       },
       "metadata" : {
         "name" : "test-project-1",
-        "ownedByWorkspace" : "4ykk1mpdsv2",
-        "createdOn" : "2024-03-20T13:17:23.314713Z"
+        "ownedByWorkspace" : "a0fl0mpdsv2",
+        "createdOn" : "2024-03-27T15:01:11.991770Z"
       },
       "kind" : "meshProject",
       "_links" : {
         "self" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1"
         },
         "meshtenants" : {
-          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&amp;projectIdentifier=test-project-1"
+          "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&amp;projectIdentifier=test-project-1"
         },
         "meshusers" : {
           "href" : "https://mesh-backend-url/api/meshobjects/meshusers"
@@ -603,16 +603,16 @@ <h5 id="_list_meshprojects">List meshProjects</h5>
   },
   "_links" : {
     "first" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=0&amp;size=1"
     },
     "next" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     },
     "last" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&amp;paymentIdentifier=test-payment&amp;page=1&amp;size=1"
     }
   },
   "page" : {
@@ -652,7 +652,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/4ykk1mpdsv2.test-project-1 HTTP/1.1
+<pre class="highlight nowrap"><code class="language-http" data-lang="http">GET /api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1 HTTP/1.1
 Authorization: Basic dmFsaWRfdXNlcm5hbWU6dmFsaWRfcGFzc3dvcmQ=
 Accept: application/vnd.meshcloud.api.meshproject.v2.hal+json
 Host: mesh-backend-url</code></pre>
@@ -661,7 +661,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/4ykk1mpdsv2.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/a0fl0mpdsv2.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>
@@ -805,16 +805,16 @@ <h5 id="_get_meshproject">Get meshProject</h5>
   },
   "metadata" : {
     "name" : "test-project-1",
-    "ownedByWorkspace" : "4ykk1mpdsv2",
-    "createdOn" : "2024-03-20T13:17:23.314713Z"
+    "ownedByWorkspace" : "a0fl0mpdsv2",
+    "createdOn" : "2024-03-27T15:01:11.991770Z"
   },
   "kind" : "meshProject",
   "_links" : {
     "self" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1"
     },
     "meshtenants" : {
-      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&amp;projectIdentifier=test-project-1"
+      "href" : "https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&amp;projectIdentifier=test-project-1"
     },
     "meshusers" : {
       "href" : "https://mesh-backend-url/api/meshobjects/meshusers"
@@ -831,7 +831,7 @@ <h5 id="_get_meshproject">Get meshProject</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_serviceinstance.html b/website/static/api/mesh_serviceinstance.html
index 286af75ab..1eb317e5b 100644
--- a/website/static/api/mesh_serviceinstance.html
+++ b/website/static/api/mesh_serviceinstance.html
@@ -588,18 +588,18 @@ <h5 id="_list_meshserviceinstances">List meshServiceInstances</h5>
       "apiVersion" : "v2",
       "kind" : "meshServiceInstance",
       "metadata" : {
-        "ownedByProject" : "4ykk1mtdg10",
+        "ownedByProject" : "a0fl0mtdg10",
         "ownedByWorkspace" : "my-mobile-app-team",
-        "marketplaceIdentifier" : "4ykk1mtdg1",
-        "instanceId" : "4ykk1mtdg11"
+        "marketplaceIdentifier" : "a0fl0mtdg1",
+        "instanceId" : "a0fl0mtdg11"
       },
       "spec" : {
-        "displayName" : "4ykk1mtdg12",
-        "serviceId" : "4ykk1mtdg5",
-        "planId" : "4ykk1mtdg7",
+        "displayName" : "a0fl0mtdg12",
+        "serviceId" : "a0fl0mtdg5",
+        "planId" : "a0fl0mtdg7",
         "creator" : "Unknown"
       },
-      "meaningfulIdentifier" : "meshServiceInstance[4ykk1mtdg11, proj: 4ykk1mtdg10, ws: my-mobile-app-team]"
+      "meaningfulIdentifier" : "meshServiceInstance[a0fl0mtdg11, proj: a0fl0mtdg10, ws: my-mobile-app-team]"
     } ]
   },
   "_links" : {
@@ -630,7 +630,7 @@ <h5 id="_list_meshserviceinstances">List meshServiceInstances</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_tenant.html b/website/static/api/mesh_tenant.html
index 47787980d..40455bb7d 100644
--- a/website/static/api/mesh_tenant.html
+++ b/website/static/api/mesh_tenant.html
@@ -590,11 +590,11 @@ <h5 id="_list_meshtenants">List meshTenants</h5>
         "ownedByProject" : "test-project",
         "ownedByWorkspace" : "test-workspace",
         "platformIdentifier" : "azure.meshcloud-azure-dev",
-        "deletedOn" : "2024-03-21T13:17:25.954042Z",
+        "deletedOn" : "2024-03-28T15:01:14.636832Z",
         "assignedTags" : { }
       },
       "spec" : {
-        "localId" : "ed311a8d-8705-4d0e-bf79-ebd5e117991e",
+        "localId" : "2fb9cafb-05e5-468c-a4df-fd7946a3eae4",
         "landingZoneIdentifier" : "stage-dev",
         "quotas" : [ {
           "key" : "limits.cpu",
@@ -785,11 +785,11 @@ <h5 id="_get_meshtenant">Get meshTenant</h5>
     "ownedByProject" : "test-project",
     "ownedByWorkspace" : "test-workspace",
     "platformIdentifier" : "azure.meshcloud-azure-dev",
-    "deletedOn" : "2024-03-21T13:17:25.954042Z",
+    "deletedOn" : "2024-03-28T15:01:14.636832Z",
     "assignedTags" : { }
   },
   "spec" : {
-    "localId" : "ed311a8d-8705-4d0e-bf79-ebd5e117991e",
+    "localId" : "2fb9cafb-05e5-468c-a4df-fd7946a3eae4",
     "landingZoneIdentifier" : "stage-dev",
     "quotas" : [ {
       "key" : "limits.cpu",
@@ -815,7 +815,7 @@ <h5 id="_get_meshtenant">Get meshTenant</h5>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_user.html b/website/static/api/mesh_user.html
index cab9612d3..03d92fbaf 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" : "5fdb7ffb-4151-49ea-910f-543b47308fc0",
+        "euid" : "e592b4a9-1fe3-4af0-a735-168f9823604a",
         "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" : "5fdb7ffb-4151-49ea-910f-543b47308fc0",
+    "euid" : "e592b4a9-1fe3-4af0-a735-168f9823604a",
     "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-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_workspace.html b/website/static/api/mesh_workspace.html
index de781ee20..598edaec1 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>
       "kind" : "meshWorkspace",
       "metadata" : {
         "name" : "admin-customer",
-        "createdOn" : "2024-03-20T13:16:33Z"
+        "createdOn" : "2024-03-27T15:00:23Z"
       },
       "spec" : {
         "displayName" : "admin-customer",
@@ -600,7 +600,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "kind" : "meshWorkspace",
       "metadata" : {
         "name" : "demo-customer",
-        "createdOn" : "2024-03-20T13:16:33Z"
+        "createdOn" : "2024-03-27T15:00:23Z"
       },
       "spec" : {
         "displayName" : "demo-customer",
@@ -631,7 +631,7 @@ <h5 id="_list_meshworkspaces">List meshWorkspaces</h5>
       "kind" : "meshWorkspace",
       "metadata" : {
         "name" : "demo-partner",
-        "createdOn" : "2024-03-20T13:16:33Z"
+        "createdOn" : "2024-03-27T15:00:23Z"
       },
       "spec" : {
         "displayName" : "demo-partner",
@@ -847,7 +847,7 @@ <h5 id="_get_meshworkspace">Get meshWorkspace</h5>
   "kind" : "meshWorkspace",
   "metadata" : {
     "name" : "admin-customer",
-    "createdOn" : "2024-03-20T13:16:33Z"
+    "createdOn" : "2024-03-27T15:00:23Z"
   },
   "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-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/mesh_workspaceusergroup.html b/website/static/api/mesh_workspaceusergroup.html
index 54a17f557..b99f001de 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-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/meshstack-openapi-docs.json b/website/static/api/meshstack-openapi-docs.json
index 4e0b46d10..f57e4c8ff 100644
--- a/website/static/api/meshstack-openapi-docs.json
+++ b/website/static/api/meshstack-openapi-docs.json
@@ -141,7 +141,7 @@
                 },
                 "examples" : {
                   "meshObjectsRootV2" : {
-                    "value" : "{\n  \"_links\" : {\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups\"\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
+                    "value" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\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    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
                   }
                 }
               },
@@ -151,7 +151,7 @@
                 },
                 "examples" : {
                   "meshObjectsRootV1" : {
-                    "value" : "{\n  \"_links\" : {\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\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\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
+                    "value" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -368,7 +368,7 @@
                 },
                 "examples" : {
                   "meshBuildingBlockList" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"3406c844-d8d0-4966-a1d4-faebc80560ea\",\n        \"definitionUuid\" : \"3a2824e9-9f27-4f5b-9537-dc2d324496cd\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-20T13:17:18.386020Z\"\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/3406c844-d8d0-4966-a1d4-faebc80560ea\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        }\n      }\n    }, {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"901482dc-9239-426c-abdb-791d077038c4\",\n        \"definitionUuid\" : \"91313033-f844-411b-892b-a70dd2476aa6\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-20T13:17:18.393688Z\"\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\" : \"3406c844-d8d0-4966-a1d4-faebc80560ea\",\n          \"definitionUuid\" : \"3a2824e9-9f27-4f5b-9537-dc2d324496cd\"\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/901482dc-9239-426c-abdb-791d077038c4\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"e021a7fb-01b3-4e46-afad-9de6d8b06fe0\",\n        \"definitionUuid\" : \"10f838b0-db1f-4a05-b9b9-5aa515c69f31\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-27T15:01:07.054938Z\"\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/e021a7fb-01b3-4e46-afad-9de6d8b06fe0\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        }\n      }\n    }, {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"10b95856-7733-4f3e-a6dc-45cbda064dd1\",\n        \"definitionUuid\" : \"542b5bb3-7786-424f-8754-8894a8e1ef36\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-27T15:01:07.064379Z\"\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\" : \"e021a7fb-01b3-4e46-afad-9de6d8b06fe0\",\n          \"definitionUuid\" : \"10f838b0-db1f-4a05-b9b9-5aa515c69f31\"\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/10b95856-7733-4f3e-a6dc-45cbda064dd1\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\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}"
                   }
                 }
               }
@@ -428,7 +428,7 @@
                 },
                 "examples" : {
                   "meshPaymentMethodListV2" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"4ykk1mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { }\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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"4ykk1mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { }\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=4ykk1mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"a0fl0mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { }\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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"a0fl0mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { }\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=a0fl0mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -496,7 +496,7 @@
                 },
                 "examples" : {
                   "meshProjectListV2" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"4ykk1mpdsv2\",\n        \"createdOn\" : \"2024-03-20T13:17:23.314713Z\"\n      },\n      \"kind\" : \"meshProject\",\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&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      \"apiVersion\" : \"v2\",\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"a0fl0mpdsv2\",\n        \"createdOn\" : \"2024-03-27T15:01:11.991770Z\"\n      },\n      \"kind\" : \"meshProject\",\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&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}"
                   }
                 }
               }
@@ -588,7 +588,7 @@
                 },
                 "examples" : {
                   "meshServiceInstanceListV2" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshServiceInstance\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"4ykk1mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"4ykk1mtdg1\",\n        \"instanceId\" : \"4ykk1mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"4ykk1mtdg12\",\n        \"serviceId\" : \"4ykk1mtdg5\",\n        \"planId\" : \"4ykk1mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"meaningfulIdentifier\" : \"meshServiceInstance[4ykk1mtdg11, proj: 4ykk1mtdg10, ws: my-mobile-app-team]\"\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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshServiceInstance\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"a0fl0mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"a0fl0mtdg1\",\n        \"instanceId\" : \"a0fl0mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"a0fl0mtdg12\",\n        \"serviceId\" : \"a0fl0mtdg5\",\n        \"planId\" : \"a0fl0mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"meaningfulIdentifier\" : \"meshServiceInstance[a0fl0mtdg11, proj: a0fl0mtdg10, ws: my-mobile-app-team]\"\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}"
                   }
                 }
               }
@@ -672,7 +672,7 @@
                 },
                 "examples" : {
                   "meshTenantListV3" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"apiVersion\" : \"v3\",\n      \"kind\" : \"meshTenant\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n        \"deletedOn\" : \"2024-03-21T13:17:25.954042Z\",\n        \"assignedTags\" : { }\n      },\n      \"spec\" : {\n        \"localId\" : \"ed311a8d-8705-4d0e-bf79-ebd5e117991e\",\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.azure.meshcloud-azure-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\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      \"apiVersion\" : \"v3\",\n      \"kind\" : \"meshTenant\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n        \"deletedOn\" : \"2024-03-28T15:01:14.636832Z\",\n        \"assignedTags\" : { }\n      },\n      \"spec\" : {\n        \"localId\" : \"2fb9cafb-05e5-468c-a4df-fd7946a3eae4\",\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.azure.meshcloud-azure-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\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}"
                   }
                 }
               }
@@ -724,7 +724,7 @@
                 },
                 "examples" : {
                   "meshWorkspaceList" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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\" : 5,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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\" : 5,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               }
@@ -844,7 +844,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4" : {
+    "/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshBuildingBlock",
@@ -868,7 +868,7 @@
                 },
                 "examples" : {
                   "meshBuildingBlock" : {
-                    "value" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"uuid\" : \"901482dc-9239-426c-abdb-791d077038c4\",\n    \"definitionUuid\" : \"91313033-f844-411b-892b-a70dd2476aa6\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-03-20T13:17:18.393688Z\"\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\" : \"3406c844-d8d0-4966-a1d4-faebc80560ea\",\n      \"definitionUuid\" : \"3a2824e9-9f27-4f5b-9537-dc2d324496cd\"\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/901482dc-9239-426c-abdb-791d077038c4\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    }\n  }\n}"
+                    "value" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"uuid\" : \"10b95856-7733-4f3e-a6dc-45cbda064dd1\",\n    \"definitionUuid\" : \"542b5bb3-7786-424f-8754-8894a8e1ef36\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-03-27T15:01:07.064379Z\"\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\" : \"e021a7fb-01b3-4e46-afad-9de6d8b06fe0\",\n      \"definitionUuid\" : \"10f838b0-db1f-4a05-b9b9-5aa515c69f31\"\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/10b95856-7733-4f3e-a6dc-45cbda064dd1\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -904,7 +904,7 @@
                 },
                 "examples" : {
                   "meshPaymentMethodV2" : {
-                    "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshPaymentMethod\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"4ykk1mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { }\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  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshPaymentMethod\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"a0fl0mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { }\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}"
                   }
                 }
               }
@@ -916,7 +916,7 @@
         } ]
       }
     },
-    "/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1" : {
+    "/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1" : {
       "get" : {
         "tags" : [ "api" ],
         "operationId" : "meshProjectV2",
@@ -940,7 +940,7 @@
                 },
                 "examples" : {
                   "meshProjectV2" : {
-                    "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"4ykk1mpdsv2\",\n    \"createdOn\" : \"2024-03-20T13:17:23.314713Z\"\n  },\n  \"kind\" : \"meshProject\",\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    }\n  }\n}"
+                    "value" : "{\n  \"apiVersion\" : \"v2\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"a0fl0mpdsv2\",\n    \"createdOn\" : \"2024-03-27T15:01:11.991770Z\"\n  },\n  \"kind\" : \"meshProject\",\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -976,7 +976,7 @@
                 },
                 "examples" : {
                   "meshTenantV3" : {
-                    "value" : "{\n  \"apiVersion\" : \"v3\",\n  \"kind\" : \"meshTenant\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"deletedOn\" : \"2024-03-21T13:17:25.954042Z\",\n    \"assignedTags\" : { }\n  },\n  \"spec\" : {\n    \"localId\" : \"ed311a8d-8705-4d0e-bf79-ebd5e117991e\",\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.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    }\n  }\n}"
+                    "value" : "{\n  \"apiVersion\" : \"v3\",\n  \"kind\" : \"meshTenant\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"deletedOn\" : \"2024-03-28T15:01:14.636832Z\",\n    \"assignedTags\" : { }\n  },\n  \"spec\" : {\n    \"localId\" : \"2fb9cafb-05e5-468c-a4df-fd7946a3eae4\",\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.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    }\n  }\n}"
                   }
                 }
               }
@@ -993,9 +993,9 @@
         "tags" : [ "api" ],
         "operationId" : "meshUserListV",
         "parameters" : [ {
-          "name" : "customerIdentifier",
+          "name" : "workspaceIdentifier",
           "in" : "query",
-          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)",
+          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
@@ -1003,7 +1003,7 @@
         }, {
           "name" : "projectIdentifier",
           "in" : "query",
-          "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)",
+          "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
@@ -1017,9 +1017,9 @@
             "type" : "string"
           }
         }, {
-          "name" : "customerRole",
+          "name" : "workspaceRole",
           "in" : "query",
-          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)",
+          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
@@ -1089,17 +1089,17 @@
             "type" : "string"
           }
         }, {
-          "name" : "workspaceIdentifier",
+          "name" : "customerIdentifier",
           "in" : "query",
-          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)",
+          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
           }
         }, {
-          "name" : "workspaceRole",
+          "name" : "customerRole",
           "in" : "query",
-          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)",
+          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)",
           "required" : false,
           "schema" : {
             "type" : "string"
@@ -1107,34 +1107,34 @@
         }, {
           "name" : "Accept",
           "in" : "header",
-          "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.",
           "required" : true,
           "schema" : {
             "type" : "string"
           },
-          "example" : "application/vnd.meshcloud.api.meshuser.v1.hal+json"
+          "example" : "application/vnd.meshcloud.api.meshuser.v2.hal+json"
         } ],
         "responses" : {
           "200" : {
             "description" : "200",
             "content" : {
-              "application/vnd.meshcloud.api.meshuser.v1.hal+json" : {
+              "application/vnd.meshcloud.api.meshuser.v2.hal+json" : {
                 "schema" : {
-                  "$ref" : "#/components/schemas/meshUserListV1"
+                  "$ref" : "#/components/schemas/meshUserListV2"
                 },
                 "examples" : {
-                  "meshUserListV1" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"7d8e60b5-171b-4d88-b459-c953b3a35985\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshcustomerusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?customerIdentifier=%20my-mobile-app-team&customerRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+                  "meshUserListV2" : {
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"e592b4a9-1fe3-4af0-a735-168f9823604a\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
                   }
                 }
               },
-              "application/vnd.meshcloud.api.meshuser.v2.hal+json" : {
+              "application/vnd.meshcloud.api.meshuser.v1.hal+json" : {
                 "schema" : {
-                  "$ref" : "#/components/schemas/meshUserListV2"
+                  "$ref" : "#/components/schemas/meshUserListV1"
                 },
                 "examples" : {
-                  "meshUserListV2" : {
-                    "value" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"5fdb7ffb-4151-49ea-910f-543b47308fc0\",\n        \"tags\" : {\n          \"environment\" : [ \"dev\", \"test\", \"qa\" ]\n        }\n      },\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/john-doe\"\n        },\n        \"meshworkspaceusergroups\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups?username=john-doe\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/?workspaceIdentifier=%20my-mobile-app-team&workspaceRole=Workspace%20Manager&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}"
+                  "meshUserListV1" : {
+                    "value" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"cb445575-9d4e-4309-9dba-d30b09ef3e72\",\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}"
                   }
                 }
               }
@@ -1153,34 +1153,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  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"5fdb7ffb-4151-49ea-910f-543b47308fc0\",\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  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"cb445575-9d4e-4309-9dba-d30b09ef3e72\",\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  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"7d8e60b5-171b-4d88-b459-c953b3a35985\",\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  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"e592b4a9-1fe3-4af0-a735-168f9823604a\",\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}"
                   }
                 }
               }
@@ -1216,7 +1216,7 @@
                 },
                 "examples" : {
                   "meshWorkspace" : {
-                    "value" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshWorkspace\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshWorkspace\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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}"
                   }
                 }
               }
@@ -2074,16 +2074,6 @@
           }
         }
       },
-      "meshObjectsRootV1" : {
-        "title" : "meshObjectsRootV1",
-        "type" : "object",
-        "properties" : {
-          "_links" : {
-            "type" : "object",
-            "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user."
-          }
-        }
-      },
       "meshUserV2" : {
         "title" : "meshUserV2",
         "type" : "object",
@@ -2138,6 +2128,16 @@
           }
         }
       },
+      "meshObjectsRootV1" : {
+        "title" : "meshObjectsRootV1",
+        "type" : "object",
+        "properties" : {
+          "_links" : {
+            "type" : "object",
+            "description" : "All available <<mesh_object_links,meshObject Links>> for the authenticated user."
+          }
+        }
+      },
       "api-meshobjectcollections810465504" : {
         "type" : "object",
         "properties" : {
diff --git a/website/static/api/meshstack-postman-collection-original.json b/website/static/api/meshstack-postman-collection-original.json
index 7a2fa088a..4c5846eb0 100644
--- a/website/static/api/meshstack-postman-collection-original.json
+++ b/website/static/api/meshstack-postman-collection-original.json
@@ -52,7 +52,7 @@
       "code" : 200
     } ]
   }, {
-    "id" : "createMeshObjectCollection",
+    "id" : "deleteMeshObjectCollection",
     "name" : "/api/meshobjectcollections",
     "variable" : [ ],
     "event" : [ ],
@@ -63,7 +63,7 @@
         "path" : "/api/meshobjectcollections",
         "port" : "8080"
       },
-      "method" : "POST",
+      "method" : "DELETE",
       "header" : [ {
         "key" : "Content-Type",
         "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -72,13 +72,13 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
+        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "createMeshObjectCollection",
-      "name" : "createMeshObjectCollection",
+      "id" : "deleteMeshObjectCollection",
+      "name" : "deleteMeshObjectCollection",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -86,7 +86,7 @@
           "path" : "/api/meshobjectcollections",
           "port" : "8080"
         },
-        "method" : "POST",
+        "method" : "DELETE",
         "header" : [ {
           "key" : "Content-Type",
           "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -95,15 +95,15 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
+          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
           "urlencoded" : [ ]
         }
       },
       "cookie" : [ ],
-      "code" : 201
+      "code" : 200
     } ]
   }, {
-    "id" : "deleteMeshObjectCollection",
+    "id" : "createMeshObjectCollection",
     "name" : "/api/meshobjectcollections",
     "variable" : [ ],
     "event" : [ ],
@@ -114,7 +114,7 @@
         "path" : "/api/meshobjectcollections",
         "port" : "8080"
       },
-      "method" : "DELETE",
+      "method" : "POST",
       "header" : [ {
         "key" : "Content-Type",
         "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -123,13 +123,13 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
+        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "deleteMeshObjectCollection",
-      "name" : "deleteMeshObjectCollection",
+      "id" : "createMeshObjectCollection",
+      "name" : "createMeshObjectCollection",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -137,7 +137,7 @@
           "path" : "/api/meshobjectcollections",
           "port" : "8080"
         },
-        "method" : "DELETE",
+        "method" : "POST",
         "header" : [ {
           "key" : "Content-Type",
           "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -146,12 +146,12 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
+          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
           "urlencoded" : [ ]
         }
       },
       "cookie" : [ ],
-      "code" : 200
+      "code" : 201
     } ]
   }, {
     "id" : "meshObjectsRootV2",
@@ -197,7 +197,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups\"\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\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    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     }, {
       "id" : "meshObjectsRootV1",
@@ -223,7 +223,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\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\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -476,7 +476,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"3406c844-d8d0-4966-a1d4-faebc80560ea\",\n        \"definitionUuid\" : \"3a2824e9-9f27-4f5b-9537-dc2d324496cd\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-20T13:17:18.386020Z\"\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/3406c844-d8d0-4966-a1d4-faebc80560ea\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        }\n      }\n    }, {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"901482dc-9239-426c-abdb-791d077038c4\",\n        \"definitionUuid\" : \"91313033-f844-411b-892b-a70dd2476aa6\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-20T13:17:18.393688Z\"\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\" : \"3406c844-d8d0-4966-a1d4-faebc80560ea\",\n          \"definitionUuid\" : \"3a2824e9-9f27-4f5b-9537-dc2d324496cd\"\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/901482dc-9239-426c-abdb-791d077038c4\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"e021a7fb-01b3-4e46-afad-9de6d8b06fe0\",\n        \"definitionUuid\" : \"10f838b0-db1f-4a05-b9b9-5aa515c69f31\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-27T15:01:07.054938Z\"\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/e021a7fb-01b3-4e46-afad-9de6d8b06fe0\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        }\n      }\n    }, {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"10b95856-7733-4f3e-a6dc-45cbda064dd1\",\n        \"definitionUuid\" : \"542b5bb3-7786-424f-8754-8894a8e1ef36\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-27T15:01:07.064379Z\"\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\" : \"e021a7fb-01b3-4e46-afad-9de6d8b06fe0\",\n          \"definitionUuid\" : \"10f838b0-db1f-4a05-b9b9-5aa515c69f31\"\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/10b95856-7733-4f3e-a6dc-45cbda064dd1\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\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
     } ]
   }, {
@@ -549,7 +549,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"4ykk1mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { }\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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"4ykk1mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { }\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=4ykk1mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"a0fl0mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { }\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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"a0fl0mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { }\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=a0fl0mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -630,7 +630,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"4ykk1mpdsv2\",\n        \"createdOn\" : \"2024-03-20T13:17:23.314713Z\"\n      },\n      \"kind\" : \"meshProject\",\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&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      \"apiVersion\" : \"v2\",\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"a0fl0mpdsv2\",\n        \"createdOn\" : \"2024-03-27T15:01:11.991770Z\"\n      },\n      \"kind\" : \"meshProject\",\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&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
     } ]
   }, {
@@ -735,7 +735,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshServiceInstance\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"4ykk1mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"4ykk1mtdg1\",\n        \"instanceId\" : \"4ykk1mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"4ykk1mtdg12\",\n        \"serviceId\" : \"4ykk1mtdg5\",\n        \"planId\" : \"4ykk1mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"meaningfulIdentifier\" : \"meshServiceInstance[4ykk1mtdg11, proj: 4ykk1mtdg10, ws: my-mobile-app-team]\"\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshServiceInstance\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"a0fl0mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"a0fl0mtdg1\",\n        \"instanceId\" : \"a0fl0mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"a0fl0mtdg12\",\n        \"serviceId\" : \"a0fl0mtdg5\",\n        \"planId\" : \"a0fl0mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"meaningfulIdentifier\" : \"meshServiceInstance[a0fl0mtdg11, proj: a0fl0mtdg10, ws: my-mobile-app-team]\"\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
     } ]
   }, {
@@ -832,7 +832,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"apiVersion\" : \"v3\",\n      \"kind\" : \"meshTenant\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n        \"deletedOn\" : \"2024-03-21T13:17:25.954042Z\",\n        \"assignedTags\" : { }\n      },\n      \"spec\" : {\n        \"localId\" : \"ed311a8d-8705-4d0e-bf79-ebd5e117991e\",\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.azure.meshcloud-azure-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"apiVersion\" : \"v3\",\n      \"kind\" : \"meshTenant\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n        \"deletedOn\" : \"2024-03-28T15:01:14.636832Z\",\n        \"assignedTags\" : { }\n      },\n      \"spec\" : {\n        \"localId\" : \"2fb9cafb-05e5-468c-a4df-fd7946a3eae4\",\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.azure.meshcloud-azure-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\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
     } ]
   }, {
@@ -897,7 +897,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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\" : 5,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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\" : 5,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1038,14 +1038,14 @@
     } ]
   }, {
     "id" : "meshBuildingBlock",
-    "name" : "/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4",
+    "name" : "/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4",
+        "path" : "/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1",
         "port" : "8080"
       },
       "method" : "GET",
@@ -1063,7 +1063,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4",
+          "path" : "/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1",
           "port" : "8080"
         },
         "method" : "GET",
@@ -1080,7 +1080,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"uuid\" : \"901482dc-9239-426c-abdb-791d077038c4\",\n    \"definitionUuid\" : \"91313033-f844-411b-892b-a70dd2476aa6\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-03-20T13:17:18.393688Z\"\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\" : \"3406c844-d8d0-4966-a1d4-faebc80560ea\",\n      \"definitionUuid\" : \"3a2824e9-9f27-4f5b-9537-dc2d324496cd\"\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/901482dc-9239-426c-abdb-791d077038c4\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    }\n  }\n}",
+      "body" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"uuid\" : \"10b95856-7733-4f3e-a6dc-45cbda064dd1\",\n    \"definitionUuid\" : \"542b5bb3-7786-424f-8754-8894a8e1ef36\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-03-27T15:01:07.064379Z\"\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\" : \"e021a7fb-01b3-4e46-afad-9de6d8b06fe0\",\n      \"definitionUuid\" : \"10f838b0-db1f-4a05-b9b9-5aa515c69f31\"\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/10b95856-7733-4f3e-a6dc-45cbda064dd1\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1127,19 +1127,19 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshPaymentMethod\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"4ykk1mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { }\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  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshPaymentMethod\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"a0fl0mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { }\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
     } ]
   }, {
     "id" : "meshProjectV2",
-    "name" : "/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1",
+    "name" : "/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
         "protocol" : "https",
         "host" : "localhost",
-        "path" : "/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1",
+        "path" : "/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1",
         "port" : "8080"
       },
       "method" : "GET",
@@ -1157,7 +1157,7 @@
         "url" : {
           "protocol" : "https",
           "host" : "localhost",
-          "path" : "/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1",
+          "path" : "/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1",
           "port" : "8080"
         },
         "method" : "GET",
@@ -1174,7 +1174,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v2\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"4ykk1mpdsv2\",\n    \"createdOn\" : \"2024-03-20T13:17:23.314713Z\"\n  },\n  \"kind\" : \"meshProject\",\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    }\n  }\n}",
+      "body" : "{\n  \"apiVersion\" : \"v2\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"a0fl0mpdsv2\",\n    \"createdOn\" : \"2024-03-27T15:01:11.991770Z\"\n  },\n  \"kind\" : \"meshProject\",\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1221,11 +1221,11 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v3\",\n  \"kind\" : \"meshTenant\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"deletedOn\" : \"2024-03-21T13:17:25.954042Z\",\n    \"assignedTags\" : { }\n  },\n  \"spec\" : {\n    \"localId\" : \"ed311a8d-8705-4d0e-bf79-ebd5e117991e\",\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.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    }\n  }\n}",
+      "body" : "{\n  \"apiVersion\" : \"v3\",\n  \"kind\" : \"meshTenant\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"deletedOn\" : \"2024-03-28T15:01:14.636832Z\",\n    \"assignedTags\" : { }\n  },\n  \"spec\" : {\n    \"localId\" : \"2fb9cafb-05e5-468c-a4df-fd7946a3eae4\",\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.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
-    "id" : "meshUserListV1",
+    "id" : "meshUserListV2",
     "name" : "/api/meshobjects/meshusers/",
     "variable" : [ ],
     "event" : [ ],
@@ -1236,21 +1236,21 @@
         "path" : "/api/meshobjects/meshusers/",
         "port" : "8080",
         "query" : [ {
-          "key" : "customerIdentifier",
+          "key" : "workspaceIdentifier",
           "disabled" : false,
-          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
+          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
         }, {
           "key" : "projectIdentifier",
           "disabled" : false,
-          "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
+          "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
         }, {
           "key" : "platformIdentifier",
           "disabled" : false,
           "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
         }, {
-          "key" : "customerRole",
+          "key" : "workspaceRole",
           "disabled" : false,
-          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
+          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
         }, {
           "key" : "projectRole",
           "disabled" : false,
@@ -1284,26 +1284,26 @@
           "disabled" : false,
           "description" : "The amount of elements in a single page (default={default-page-size}). See <<paging,Paging information>>."
         }, {
-          "key" : "workspaceIdentifier",
+          "key" : "customerIdentifier",
           "disabled" : false,
-          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
+          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
         }, {
-          "key" : "workspaceRole",
+          "key" : "customerRole",
           "disabled" : false,
-          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
+          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
         } ]
       },
       "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."
       } ]
     },
     "response" : [ {
-      "id" : "meshUserListV1",
-      "name" : "meshUserListV1",
+      "id" : "meshUserListV2",
+      "name" : "meshUserListV2",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -1311,21 +1311,21 @@
           "path" : "/api/meshobjects/meshusers/",
           "port" : "8080",
           "query" : [ {
-            "key" : "customerIdentifier",
+            "key" : "workspaceIdentifier",
             "disabled" : false,
-            "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
+            "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
           }, {
             "key" : "projectIdentifier",
             "disabled" : false,
-            "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
+            "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
           }, {
             "key" : "platformIdentifier",
             "disabled" : false,
             "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
           }, {
-            "key" : "customerRole",
+            "key" : "workspaceRole",
             "disabled" : false,
-            "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
+            "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
           }, {
             "key" : "projectRole",
             "disabled" : false,
@@ -1363,22 +1363,22 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"7d8e60b5-171b-4d88-b459-c953b3a35985\",\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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"e592b4a9-1fe3-4af0-a735-168f9823604a\",\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
     }, {
-      "id" : "meshUserListV2",
-      "name" : "meshUserListV2",
+      "id" : "meshUserListV1",
+      "name" : "meshUserListV1",
       "originalRequest" : {
         "url" : {
           "protocol" : "https",
@@ -1386,21 +1386,21 @@
           "path" : "/api/meshobjects/meshusers/",
           "port" : "8080",
           "query" : [ {
-            "key" : "workspaceIdentifier",
+            "key" : "customerIdentifier",
             "disabled" : false,
-            "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
+            "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
           }, {
             "key" : "projectIdentifier",
             "disabled" : false,
-            "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
+            "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
           }, {
             "key" : "platformIdentifier",
             "disabled" : false,
             "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
           }, {
-            "key" : "workspaceRole",
+            "key" : "customerRole",
             "disabled" : false,
-            "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
+            "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
           }, {
             "key" : "projectRole",
             "disabled" : false,
@@ -1438,22 +1438,22 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"5fdb7ffb-4151-49ea-910f-543b47308fc0\",\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"cb445575-9d4e-4309-9dba-d30b09ef3e72\",\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" : "meshUserV2",
+    "id" : "meshUserV1",
     "name" : "/api/meshobjects/meshusers/john-doe",
     "variable" : [ ],
     "event" : [ ],
@@ -1467,14 +1467,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",
@@ -1485,22 +1485,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  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"5fdb7ffb-4151-49ea-910f-543b47308fc0\",\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  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"cb445575-9d4e-4309-9dba-d30b09ef3e72\",\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",
@@ -1511,18 +1511,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  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"7d8e60b5-171b-4d88-b459-c953b3a35985\",\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  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"e592b4a9-1fe3-4af0-a735-168f9823604a\",\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
     } ]
   }, {
@@ -1569,7 +1569,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshWorkspace\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshWorkspace\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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
     } ]
   }, {
diff --git a/website/static/api/meshstack-postman-collection.json b/website/static/api/meshstack-postman-collection.json
index 569069a62..6e532f9e2 100644
--- a/website/static/api/meshstack-postman-collection.json
+++ b/website/static/api/meshstack-postman-collection.json
@@ -50,7 +50,7 @@
       "code" : 200
     } ]
   }, {
-    "id" : "createMeshObjectCollection",
+    "id" : "deleteMeshObjectCollection",
     "name" : "/api/meshobjectcollections",
     "variable" : [ ],
     "event" : [ ],
@@ -60,7 +60,7 @@
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjectcollections"
       },
-      "method" : "POST",
+      "method" : "DELETE",
       "header" : [ {
         "key" : "Content-Type",
         "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -69,20 +69,20 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
+        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "createMeshObjectCollection",
-      "name" : "createMeshObjectCollection",
+      "id" : "deleteMeshObjectCollection",
+      "name" : "deleteMeshObjectCollection",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjectcollections",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjectcollections"
         },
-        "method" : "POST",
+        "method" : "DELETE",
         "header" : [ {
           "key" : "Content-Type",
           "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -91,15 +91,15 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
+          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
           "urlencoded" : [ ]
         }
       },
       "cookie" : [ ],
-      "code" : 201
+      "code" : 200
     } ]
   }, {
-    "id" : "deleteMeshObjectCollection",
+    "id" : "createMeshObjectCollection",
     "name" : "/api/meshobjectcollections",
     "variable" : [ ],
     "event" : [ ],
@@ -109,7 +109,7 @@
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjectcollections"
       },
-      "method" : "DELETE",
+      "method" : "POST",
       "header" : [ {
         "key" : "Content-Type",
         "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -118,20 +118,20 @@
       } ],
       "body" : {
         "mode" : "raw",
-        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
+        "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
         "urlencoded" : [ ]
       }
     },
     "response" : [ {
-      "id" : "deleteMeshObjectCollection",
-      "name" : "deleteMeshObjectCollection",
+      "id" : "createMeshObjectCollection",
+      "name" : "createMeshObjectCollection",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjectcollections",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjectcollections"
         },
-        "method" : "DELETE",
+        "method" : "POST",
         "header" : [ {
           "key" : "Content-Type",
           "value" : "application/vnd.meshcloud.api.meshobjectcollection.v1+json;charset=UTF-8",
@@ -140,12 +140,12 @@
         } ],
         "body" : {
           "mode" : "raw",
-          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\"\n      }\n    ",
+          "raw" : "\n      {\n        \"name\": \"collection-name\",\n        \"owner\": \"collection-owner\",\n        \"description\": \"This is a meshObjectCollection.\"\n      }\n    ",
           "urlencoded" : [ ]
         }
       },
       "cookie" : [ ],
-      "code" : 200
+      "code" : 201
     } ]
   }, {
     "id" : "meshObjectsRootV2",
@@ -189,7 +189,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups\"\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances{?workspaceIdentifier,projectIdentifier,marketplaceIdentifier,serviceIdentifier,planIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?workspaceIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?workspaceIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshbuildingblocks\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshbuildingblocks{?customerIdentifier,projectIdentifier,platformIdentifier,name,definitionName,versionNumber,status}\",\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    \"meshworkspaces\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaces\"\n    },\n    \"meshworkspaceusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshworkspaceusergroups\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?workspaceIdentifier,projectIdentifier,platformIdentifier,deletionState}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     }, {
       "id" : "meshObjectsRootV1",
@@ -214,7 +214,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_links\" : {\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\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\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
+      "body" : "{\n  \"_links\" : {\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers/{username}\",\n      \"templated\" : true\n    },\n    \"meshpaymentmethods\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods{?customerIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshprojects\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects{?customerIdentifier,paymentIdentifier}\",\n      \"templated\" : true\n    },\n    \"meshserviceinstances\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances\"\n    },\n    \"meshcustomers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomers\"\n    },\n    \"meshcustomerusergroups\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshcustomerusergroups\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants{?customerIdentifier,projectIdentifier,platformIdentifier}\",\n      \"templated\" : true\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -461,7 +461,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshBuildingBlocks\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"3406c844-d8d0-4966-a1d4-faebc80560ea\",\n        \"definitionUuid\" : \"3a2824e9-9f27-4f5b-9537-dc2d324496cd\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-20T13:17:18.386020Z\"\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/3406c844-d8d0-4966-a1d4-faebc80560ea\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        }\n      }\n    }, {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"901482dc-9239-426c-abdb-791d077038c4\",\n        \"definitionUuid\" : \"91313033-f844-411b-892b-a70dd2476aa6\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-20T13:17:18.393688Z\"\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\" : \"3406c844-d8d0-4966-a1d4-faebc80560ea\",\n          \"definitionUuid\" : \"3a2824e9-9f27-4f5b-9537-dc2d324496cd\"\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/901482dc-9239-426c-abdb-791d077038c4\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"e021a7fb-01b3-4e46-afad-9de6d8b06fe0\",\n        \"definitionUuid\" : \"10f838b0-db1f-4a05-b9b9-5aa515c69f31\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-27T15:01:07.054938Z\"\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/e021a7fb-01b3-4e46-afad-9de6d8b06fe0\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n        }\n      }\n    }, {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshBuildingBlock\",\n      \"metadata\" : {\n        \"uuid\" : \"10b95856-7733-4f3e-a6dc-45cbda064dd1\",\n        \"definitionUuid\" : \"542b5bb3-7786-424f-8754-8894a8e1ef36\",\n        \"definitionVersion\" : 1,\n        \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n        \"forcePurge\" : false,\n        \"createdOn\" : \"2024-03-27T15:01:07.064379Z\"\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\" : \"e021a7fb-01b3-4e46-afad-9de6d8b06fe0\",\n          \"definitionUuid\" : \"10f838b0-db1f-4a05-b9b9-5aa515c69f31\"\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/10b95856-7733-4f3e-a6dc-45cbda064dd1\"\n        },\n        \"meshtenant\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\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
     } ]
   }, {
@@ -532,7 +532,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshPaymentMethods\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"4ykk1mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { }\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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"4ykk1mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { }\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=4ykk1mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=4ykk1mpmdsv2&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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-1\",\n        \"ownedByWorkspace\" : \"a0fl0mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 1\",\n        \"tags\" : { }\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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshPaymentMethod\",\n      \"metadata\" : {\n        \"name\" : \"test-payment-method-2\",\n        \"ownedByWorkspace\" : \"a0fl0mpmdsv2\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"Test Payment Method 2\",\n        \"tags\" : { }\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=a0fl0mpmdsv2&page=0&size=2\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&page=0&size=2\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&page=1&size=2\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods?workspaceIdentifier=a0fl0mpmdsv2&page=1&size=2\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 2,\n    \"totalElements\" : 3,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -611,7 +611,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshProjects\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"4ykk1mpdsv2\",\n        \"createdOn\" : \"2024-03-20T13:17:23.314713Z\"\n      },\n      \"kind\" : \"meshProject\",\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=4ykk1mpdsv2&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      \"apiVersion\" : \"v2\",\n      \"spec\" : {\n        \"displayName\" : \"Test Project 1\",\n        \"tags\" : { },\n        \"paymentMethodIdentifier\" : \"test-payment\"\n      },\n      \"metadata\" : {\n        \"name\" : \"test-project-1\",\n        \"ownedByWorkspace\" : \"a0fl0mpdsv2\",\n        \"createdOn\" : \"2024-03-27T15:01:11.991770Z\"\n      },\n      \"kind\" : \"meshProject\",\n      \"_links\" : {\n        \"self\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1\"\n        },\n        \"meshtenants\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&projectIdentifier=test-project-1\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n        },\n        \"activePaymentMethod\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&paymentIdentifier=test-payment&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&paymentIdentifier=test-payment&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects?workspaceIdentifier=a0fl0mpdsv2&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
     } ]
   }, {
@@ -714,7 +714,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshServiceInstance\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"4ykk1mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"4ykk1mtdg1\",\n        \"instanceId\" : \"4ykk1mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"4ykk1mtdg12\",\n        \"serviceId\" : \"4ykk1mtdg5\",\n        \"planId\" : \"4ykk1mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"meaningfulIdentifier\" : \"meshServiceInstance[4ykk1mtdg11, proj: 4ykk1mtdg10, ws: my-mobile-app-team]\"\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshserviceinstances?workspaceIdentifier=my-mobile-app-team&page=2&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 3,\n    \"totalPages\" : 3,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshServiceInstances\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshServiceInstance\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"a0fl0mtdg10\",\n        \"ownedByWorkspace\" : \"my-mobile-app-team\",\n        \"marketplaceIdentifier\" : \"a0fl0mtdg1\",\n        \"instanceId\" : \"a0fl0mtdg11\"\n      },\n      \"spec\" : {\n        \"displayName\" : \"a0fl0mtdg12\",\n        \"serviceId\" : \"a0fl0mtdg5\",\n        \"planId\" : \"a0fl0mtdg7\",\n        \"creator\" : \"Unknown\"\n      },\n      \"meaningfulIdentifier\" : \"meshServiceInstance[a0fl0mtdg11, proj: a0fl0mtdg10, ws: my-mobile-app-team]\"\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
     } ]
   }, {
@@ -809,7 +809,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"apiVersion\" : \"v3\",\n      \"kind\" : \"meshTenant\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n        \"deletedOn\" : \"2024-03-21T13:17:25.954042Z\",\n        \"assignedTags\" : { }\n      },\n      \"spec\" : {\n        \"localId\" : \"ed311a8d-8705-4d0e-bf79-ebd5e117991e\",\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.azure.meshcloud-azure-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n        }\n      }\n    } ]\n  },\n  \"_links\" : {\n    \"first\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=0&size=1\"\n    },\n    \"next\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    },\n    \"last\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=test-workspace&projectIdentifier=test-project&deletionState=MARKED_FOR_DELETION&page=1&size=1\"\n    }\n  },\n  \"page\" : {\n    \"size\" : 1,\n    \"totalElements\" : 2,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshTenants\" : [ {\n      \"apiVersion\" : \"v3\",\n      \"kind\" : \"meshTenant\",\n      \"metadata\" : {\n        \"ownedByProject\" : \"test-project\",\n        \"ownedByWorkspace\" : \"test-workspace\",\n        \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n        \"deletedOn\" : \"2024-03-28T15:01:14.636832Z\",\n        \"assignedTags\" : { }\n      },\n      \"spec\" : {\n        \"localId\" : \"2fb9cafb-05e5-468c-a4df-fd7946a3eae4\",\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.azure.meshcloud-azure-dev\"\n        },\n        \"meshusers\" : {\n          \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\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
     } ]
   }, {
@@ -872,7 +872,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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\" : 5,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
+      "body" : "{\n  \"_embedded\" : {\n    \"meshWorkspaces\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"admin-customer\",\n        \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-customer\",\n        \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshWorkspace\",\n      \"metadata\" : {\n        \"name\" : \"demo-partner\",\n        \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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\" : 5,\n    \"totalPages\" : 2,\n    \"number\" : 0\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1009,14 +1009,14 @@
     } ]
   }, {
     "id" : "meshBuildingBlock",
-    "name" : "/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4",
+    "name" : "/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4",
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4"
+"path" : "/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1"
       },
       "method" : "GET",
       "header" : [ {
@@ -1031,9 +1031,9 @@
       "name" : "meshBuildingBlock",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4",
+	"raw": "{{baseUrl}}/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshbuildingblocks/901482dc-9239-426c-abdb-791d077038c4"
+"path" : "/api/meshobjects/meshbuildingblocks/10b95856-7733-4f3e-a6dc-45cbda064dd1"
         },
         "method" : "GET",
         "header" : [ {
@@ -1049,7 +1049,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"uuid\" : \"901482dc-9239-426c-abdb-791d077038c4\",\n    \"definitionUuid\" : \"91313033-f844-411b-892b-a70dd2476aa6\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-03-20T13:17:18.393688Z\"\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\" : \"3406c844-d8d0-4966-a1d4-faebc80560ea\",\n      \"definitionUuid\" : \"3a2824e9-9f27-4f5b-9537-dc2d324496cd\"\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/901482dc-9239-426c-abdb-791d077038c4\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    }\n  }\n}",
+      "body" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshBuildingBlock\",\n  \"metadata\" : {\n    \"uuid\" : \"10b95856-7733-4f3e-a6dc-45cbda064dd1\",\n    \"definitionUuid\" : \"542b5bb3-7786-424f-8754-8894a8e1ef36\",\n    \"definitionVersion\" : 1,\n    \"tenantIdentifier\" : \"my-workspace.my-project.my-platform.my-location\",\n    \"forcePurge\" : false,\n    \"createdOn\" : \"2024-03-27T15:01:07.064379Z\"\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\" : \"e021a7fb-01b3-4e46-afad-9de6d8b06fe0\",\n      \"definitionUuid\" : \"10f838b0-db1f-4a05-b9b9-5aa515c69f31\"\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/10b95856-7733-4f3e-a6dc-45cbda064dd1\"\n    },\n    \"meshtenant\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants/my-workspace.my-project.my-platform.my-location\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1094,19 +1094,19 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshPaymentMethod\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"4ykk1mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { }\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  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshPaymentMethod\",\n  \"metadata\" : {\n    \"name\" : \"test-payment-method-1\",\n    \"ownedByWorkspace\" : \"a0fl0mpmdsv2\"\n  },\n  \"spec\" : {\n    \"displayName\" : \"Test Payment Method 1\",\n    \"tags\" : { }\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
     } ]
   }, {
     "id" : "meshProjectV2",
-    "name" : "/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1",
+    "name" : "/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1",
     "variable" : [ ],
     "event" : [ ],
     "request" : {
       "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1"
+"path" : "/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1"
       },
       "method" : "GET",
       "header" : [ {
@@ -1121,9 +1121,9 @@
       "name" : "meshProjectV2",
       "originalRequest" : {
         "url" : {
-	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1",
+	"raw": "{{baseUrl}}/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1",
 "host": "{{baseUrl}}",
-"path" : "/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1"
+"path" : "/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1"
         },
         "method" : "GET",
         "header" : [ {
@@ -1139,7 +1139,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v2\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"4ykk1mpdsv2\",\n    \"createdOn\" : \"2024-03-20T13:17:23.314713Z\"\n  },\n  \"kind\" : \"meshProject\",\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/4ykk1mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=4ykk1mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    }\n  }\n}",
+      "body" : "{\n  \"apiVersion\" : \"v2\",\n  \"spec\" : {\n    \"displayName\" : \"Test Project 1\",\n    \"tags\" : { },\n    \"paymentMethodIdentifier\" : \"test-payment\"\n  },\n  \"metadata\" : {\n    \"name\" : \"test-project-1\",\n    \"ownedByWorkspace\" : \"a0fl0mpdsv2\",\n    \"createdOn\" : \"2024-03-27T15:01:11.991770Z\"\n  },\n  \"kind\" : \"meshProject\",\n  \"_links\" : {\n    \"self\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshprojects/a0fl0mpdsv2.test-project-1\"\n    },\n    \"meshtenants\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshtenants?workspaceIdentifier=a0fl0mpdsv2&projectIdentifier=test-project-1\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    },\n    \"activePaymentMethod\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshpaymentmethods/test-payment\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
@@ -1184,11 +1184,11 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v3\",\n  \"kind\" : \"meshTenant\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"deletedOn\" : \"2024-03-21T13:17:25.954042Z\",\n    \"assignedTags\" : { }\n  },\n  \"spec\" : {\n    \"localId\" : \"ed311a8d-8705-4d0e-bf79-ebd5e117991e\",\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.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    }\n  }\n}",
+      "body" : "{\n  \"apiVersion\" : \"v3\",\n  \"kind\" : \"meshTenant\",\n  \"metadata\" : {\n    \"ownedByProject\" : \"test-project\",\n    \"ownedByWorkspace\" : \"test-workspace\",\n    \"platformIdentifier\" : \"azure.meshcloud-azure-dev\",\n    \"deletedOn\" : \"2024-03-28T15:01:14.636832Z\",\n    \"assignedTags\" : { }\n  },\n  \"spec\" : {\n    \"localId\" : \"2fb9cafb-05e5-468c-a4df-fd7946a3eae4\",\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.azure.meshcloud-azure-dev\"\n    },\n    \"meshusers\" : {\n      \"href\" : \"https://mesh-backend-url/api/meshobjects/meshusers\"\n    }\n  }\n}",
       "code" : 200
     } ]
   }, {
-    "id" : "meshUserListV1",
+    "id" : "meshUserListV2",
     "name" : "/api/meshobjects/meshusers/",
     "variable" : [ ],
     "event" : [ ],
@@ -1198,21 +1198,21 @@
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshusers/"
 ,         "query" : [ {
-          "key" : "customerIdentifier",
+          "key" : "workspaceIdentifier",
           "disabled" : false,
-          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
+          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
         }, {
           "key" : "projectIdentifier",
           "disabled" : false,
-          "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
+          "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
         }, {
           "key" : "platformIdentifier",
           "disabled" : false,
           "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
         }, {
-          "key" : "customerRole",
+          "key" : "workspaceRole",
           "disabled" : false,
-          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
+          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
         }, {
           "key" : "projectRole",
           "disabled" : false,
@@ -1246,47 +1246,47 @@
           "disabled" : false,
           "description" : "The amount of elements in a single page (default={default-page-size}). See <<paging,Paging information>>."
         }, {
-          "key" : "workspaceIdentifier",
+          "key" : "customerIdentifier",
           "disabled" : false,
-          "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
+          "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
         }, {
-          "key" : "workspaceRole",
+          "key" : "customerRole",
           "disabled" : false,
-          "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
+          "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
         } ]
       },
       "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."
       } ]
     },
     "response" : [ {
-      "id" : "meshUserListV1",
-      "name" : "meshUserListV1",
+      "id" : "meshUserListV2",
+      "name" : "meshUserListV2",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects/meshusers/",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshusers/"
 ,           "query" : [ {
-            "key" : "customerIdentifier",
+            "key" : "workspaceIdentifier",
             "disabled" : false,
-            "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
+            "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
           }, {
             "key" : "projectIdentifier",
             "disabled" : false,
-            "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
+            "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
           }, {
             "key" : "platformIdentifier",
             "disabled" : false,
             "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
           }, {
-            "key" : "customerRole",
+            "key" : "workspaceRole",
             "disabled" : false,
-            "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
+            "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
           }, {
             "key" : "projectRole",
             "disabled" : false,
@@ -1324,43 +1324,43 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"7d8e60b5-171b-4d88-b459-c953b3a35985\",\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      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"e592b4a9-1fe3-4af0-a735-168f9823604a\",\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
     }, {
-      "id" : "meshUserListV2",
-      "name" : "meshUserListV2",
+      "id" : "meshUserListV1",
+      "name" : "meshUserListV1",
       "originalRequest" : {
         "url" : {
 	"raw": "{{baseUrl}}/api/meshobjects/meshusers/",
 "host": "{{baseUrl}}",
 "path" : "/api/meshobjects/meshusers/"
 ,           "query" : [ {
-            "key" : "workspaceIdentifier",
+            "key" : "customerIdentifier",
             "disabled" : false,
-            "description" : "Filter for meshUsers assigned to the meshWorkspace with given identifier. (optional)"
+            "description" : "Filter for meshUsers assigned to the meshCustomer with given identifier. (optional)"
           }, {
             "key" : "projectIdentifier",
             "disabled" : false,
-            "description" : "Requires workspaceIdentifier. Filter for meshUsers having access to the meshProject of a certain workspace with given identifier. (optional)"
+            "description" : "Requires customerIdentifier. Filter for meshUsers having access to the meshProject of a certain customer with given identifier. (optional)"
           }, {
             "key" : "platformIdentifier",
             "disabled" : false,
             "description" : "Filter for meshUsers having access to a meshTenant which exist on the platform with given identifier. (optional)"
           }, {
-            "key" : "workspaceRole",
+            "key" : "customerRole",
             "disabled" : false,
-            "description" : "Filter for meshUsers with given workspace role name, e.g Workspace Manager. (optional)"
+            "description" : "Filter for meshUsers with given customer role name, e.g Workspace Manager. (optional)"
           }, {
             "key" : "projectRole",
             "disabled" : false,
@@ -1398,22 +1398,22 @@
         "method" : "GET",
         "header" : [ {
           "key" : "Accept",
-          "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+          "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
           "disabled" : false,
-          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v2.hal+json` as an `Accept` header to be guaranteed the V2 response format of this endpoint. New versions will be added in future."
+          "description" : "meshApi is <<versioning,versioned>> and you should use  `application/vnd.meshcloud.api.meshuser.v1.hal+json` as an `Accept` header to be guaranteed the V1 response format of this endpoint. New versions will be added in future."
         } ]
       },
       "header" : [ {
         "key" : "Content-Type",
-        "value" : "application/vnd.meshcloud.api.meshuser.v2.hal+json",
+        "value" : "application/vnd.meshcloud.api.meshuser.v1.hal+json",
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"_embedded\" : {\n    \"meshUsers\" : [ {\n      \"apiVersion\" : \"v2\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"5fdb7ffb-4151-49ea-910f-543b47308fc0\",\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      \"apiVersion\" : \"v1\",\n      \"kind\" : \"meshUser\",\n      \"metadata\" : {\n        \"name\" : \"john-doe\"\n      },\n      \"spec\" : {\n        \"email\" : \"john-doe@example.com\",\n        \"firstName\" : \"John\",\n        \"lastName\" : \"Doe\",\n        \"euid\" : \"cb445575-9d4e-4309-9dba-d30b09ef3e72\",\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" : "meshUserV2",
+    "id" : "meshUserV1",
     "name" : "/api/meshobjects/meshusers/john-doe",
     "variable" : [ ],
     "event" : [ ],
@@ -1426,14 +1426,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",
@@ -1443,22 +1443,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  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"5fdb7ffb-4151-49ea-910f-543b47308fc0\",\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  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"cb445575-9d4e-4309-9dba-d30b09ef3e72\",\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",
@@ -1468,18 +1468,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  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"7d8e60b5-171b-4d88-b459-c953b3a35985\",\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  \"apiVersion\" : \"v2\",\n  \"kind\" : \"meshUser\",\n  \"metadata\" : {\n    \"name\" : \"john-doe\"\n  },\n  \"spec\" : {\n    \"email\" : \"john-doe@example.com\",\n    \"firstName\" : \"John\",\n    \"lastName\" : \"Doe\",\n    \"euid\" : \"e592b4a9-1fe3-4af0-a735-168f9823604a\",\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
     } ]
   }, {
@@ -1524,7 +1524,7 @@
         "disabled" : false
       } ],
       "cookie" : [ ],
-      "body" : "{\n  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshWorkspace\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-03-20T13:16:33Z\"\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\"\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  \"apiVersion\" : \"v1\",\n  \"kind\" : \"meshWorkspace\",\n  \"metadata\" : {\n    \"name\" : \"admin-customer\",\n    \"createdOn\" : \"2024-03-27T15:00:23Z\"\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\"\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
     } ]
   }, {
diff --git a/website/static/api/metadata.html b/website/static/api/metadata.html
index c71e79f4b..18eaf0e49 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-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>
diff --git a/website/static/api/technical_specification.html b/website/static/api/technical_specification.html
index efafac612..9cdd6a623 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-03-20 13:12:34 UTC
+Last updated 2024-03-27 14:55:29 UTC
 </div>
 </div>
 </body>

From 73e71e4b88b2cd4f7444e33c38dd3bda73b3e868 Mon Sep 17 00:00:00 2001
From: GitHub Actions <github-actions@meshcloud.io>
Date: Wed, 27 Mar 2024 15:47:02 +0000
Subject: [PATCH 2/2] Added release notes and version entries for 2024.15.0

---
 website/blog/2024-03-27-Release-0.md | 88 ++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 website/blog/2024-03-27-Release-0.md

diff --git a/website/blog/2024-03-27-Release-0.md b/website/blog/2024-03-27-Release-0.md
new file mode 100644
index 000000000..a6a233127
--- /dev/null
+++ b/website/blog/2024-03-27-Release-0.md
@@ -0,0 +1,88 @@
+---
+author: meshcloud
+title: Release 2024.15.0
+---
+
+Release period: 2024-03-21 to 2024-03-27
+
+This release includes the following issues:
+* Fix Azure Replication Failure with OSB Platform Integration
+* Improves Azure Function logging
+* Fix of UI regression during Service Instance deployment
+* Update Product Catalog after Renaming Building Block
+* Building Blocks Marketplace Integration
+* Building Block Costs in the Service Management Area
+* Deleted Tenant Management in Service Management Area
+<!--truncate-->
+
+## Ticket Details
+### Fix Azure Replication Failure with OSB Platform Integration
+**Audience:** Operator<br>
+
+#### Description
+When utilizing the Azure OSB Services platform integration with an Azure platform that shares the 
+same service principal, tenant replication failed. This issue has now been resolved and users can 
+use the same service principal.
+
+### Improves Azure Function logging
+**Audience:** Partner, Operator<br>
+
+#### Description
+The tenant detail view now shows request and response headers as well
+as the response body of an Azure function call to make debugging easier during
+development.
+
+### Fix of UI regression during Service Instance deployment
+**Audience:** User<br>
+
+#### Description
+A previous fix lead to a regression and the failure of updating Service Instances
+which were in a deletion process. It also did not automatically show a dashboard link. 
+This led to a poor user experience in the Marketplace and the issue has been fixed.
+
+### Update Product Catalog after Renaming Building Block
+**Audience:** Customer, Partner<br>
+
+#### Description
+Previously, renaming a Building Block definition did not trigger any changes
+in the Price Catalog if a price for that Building Block was set, resulting in
+Tenant Usage Reports that still included the old Building Block name. This is
+now fixed.
+
+### Building Blocks Marketplace Integration
+**Audience:** User<br>
+
+#### Description
+We have made a change to the process of adding Building Blocks to improve the consistency of the experience. Now, 
+when you click the "Add Building Block" button on the Building Blocks page within your Tenant, you will be redirected 
+to the Tenant Marketplace tab. This will allow you to easily browse and select the desired Building Blocks, which 
+will streamline your workflow and make the process smoother and more efficient.
+
+### Building Block Costs in the Service Management Area
+**Audience:** User, Customer<br>
+
+#### Description
+(Please note that this is only relevant for environments where the Service
+Management Area is activated. This allows you to manage Platform Services from a
+Workspace. Reach out to [support@meshcloud.io](mailto:support@meshcloud.io) to
+have it activated in your environment.)
+In addition to the overview of your Platform's usage in the Service Management
+area, we have added a new section that provides financial reports for your
+Building Blocks. This enhancement allows you to easily track the number of
+bookings for your Building Blocks and provides valuable insights into your
+revenue generation.
+
+### Deleted Tenant Management in Service Management Area
+**Audience:** Partner, Operator<br>
+
+#### Description
+(Please note that this is only relevant for environments where the Service Management Area is activated. This allows
+you to manage Platform Services from a Workspace. Reach out to support@meshcloud.io to have it activated in your environment.)
+You can now view and approve/decline tenant deletions for platforms that you own in your Service Management Area. This
+works exactly like you are used to in the Admin Area, the only difference being that you only see tenants from
+platforms owned by your workspace.
+
+#### How to use
+In the Service Management Area you will find the section "Deleted Tenants" under "Platforms" in the sidebar. In this
+screen you will be able to view all deleted tenants and approve or decline tenants awaiting deletion confirmation.
+