diff --git a/main.tsp b/main.tsp
index f4a537d..941c257 100644
--- a/main.tsp
+++ b/main.tsp
@@ -20,7 +20,7 @@ using OpenAPI;
  *
  */
 @service(#{ title: "HyperFleet API" })
-@info(#{ version: "1.0.4", contact: #{ name: "HyperFleet Team" }, license: #{ name: "Apache 2.0" ,url: "https://www.apache.org/licenses/LICENSE-2.0"} })
+@info(#{ version: "1.0.5", contact: #{ name: "HyperFleet Team" }, license: #{ name: "Apache 2.0" ,url: "https://www.apache.org/licenses/LICENSE-2.0"} })
 @server("https://hyperfleet.redhat.com", "Production")
 @route("/api/hyperfleet/v1")
 namespace HyperFleet;
diff --git a/models-core/cluster/example_cluster.tsp b/models-core/cluster/example_cluster.tsp
index b7034ee..7b62692 100644
--- a/models-core/cluster/example_cluster.tsp
+++ b/models-core/cluster/example_cluster.tsp
@@ -4,8 +4,8 @@ import "../../models/common/model.tsp";
 
 const exampleCluster: Cluster = #{
   kind: "Cluster",
-  id: "cluster-123",
-  href: "https://api.hyperfleet.com/v1/clusters/cluster-123",
+  id: "019466a0-8f8e-7abc-9def-0123456789ab",
+  href: "https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab",
   name: "cluster-123",
   labels: #{ environment: "production", team: "platform" },
   spec: #{},
diff --git a/models-core/nodepool/example_nodepool.tsp b/models-core/nodepool/example_nodepool.tsp
index 349a518..b0e3dcc 100644
--- a/models-core/nodepool/example_nodepool.tsp
+++ b/models-core/nodepool/example_nodepool.tsp
@@ -4,8 +4,8 @@ import "../../models/common/model.tsp";
 
 const exampleNodePool: NodePool = #{
   kind: "NodePool",
-  id: "nodepool-123",
-  href: "https://api.hyperfleet.com/v1/nodepools/nodepool-123",
+  id: "019466a1-2b3c-7def-8abc-456789abcdef",
+  href: "https://api.hyperfleet.com/v1/nodepools/019466a1-2b3c-7def-8abc-456789abcdef",
   name: "worker-pool-1",
   labels: #{ environment: "production", pooltype: "worker" },
   spec: #{},
@@ -15,9 +15,9 @@ const exampleNodePool: NodePool = #{
   created_by: "user-123@example.com",
   updated_by: "user-123@example.com",
   owner_references: #{
-    id: "cluster-123",
+    id: "019466a0-8f8e-7abc-9def-0123456789ab",
     kind: "Cluster",
-    href: "https://api.hyperfleet.com/v1/clusters/cluster-123",
+    href: "https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab",
   },
   status: #{
     conditions: #[
diff --git a/models-gcp/cluster/example_cluster.tsp b/models-gcp/cluster/example_cluster.tsp
index a732e36..9c45050 100644
--- a/models-gcp/cluster/example_cluster.tsp
+++ b/models-gcp/cluster/example_cluster.tsp
@@ -4,8 +4,8 @@ import "../../models/common/model.tsp";
 
 const exampleCluster: Cluster = #{
   kind: "Cluster",
-  id: "cluster-123",
-  href: "https://api.hyperfleet.com/v1/clusters/cluster-123",
+  id: "019466a0-8f8e-7abc-9def-0123456789ab",
+  href: "https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab",
   name: "cluster-123",
   labels: #{ environment: "production", team: "platform" },
   spec: #{
diff --git a/models-gcp/nodepool/example_nodepool.tsp b/models-gcp/nodepool/example_nodepool.tsp
index 3f158fc..57fc7d0 100644
--- a/models-gcp/nodepool/example_nodepool.tsp
+++ b/models-gcp/nodepool/example_nodepool.tsp
@@ -3,8 +3,8 @@ import "../../models/nodepools/model.tsp";
 
 const exampleNodePool: NodePool = #{
   kind: "NodePool",
-  id: "nodepool-123",
-  href: "https://api.hyperfleet.com/v1/nodepools/nodepool-123",
+  id: "019466a1-2b3c-7def-8abc-456789abcdef",
+  href: "https://api.hyperfleet.com/v1/nodepools/019466a1-2b3c-7def-8abc-456789abcdef",
   name: "worker-pool-1",
   labels: #{ environment: "production", pooltype: "worker" },
   generation: 1,
@@ -36,9 +36,9 @@ const exampleNodePool: NodePool = #{
   created_by: "user-123@example.com",
   updated_by: "user-123@example.com",
   owner_references: #{
-    id: "cluster-123",
+    id: "019466a0-8f8e-7abc-9def-0123456789ab",
     kind: "Cluster",
-    href: "https://api.hyperfleet.com/v1/clusters/cluster-123",
+    href: "https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab",
   },
   status: #{
     conditions: #[
diff --git a/models/common/model.tsp b/models/common/model.tsp
index d9356f2..a39278e 100644
--- a/models/common/model.tsp
+++ b/models/common/model.tsp
@@ -3,6 +3,7 @@ import "@typespec/openapi";
 using Http;
 using OpenAPI;
 
+/** Resource identifier in RFC4122 UUID v7 format (time-ordered, e.g., "019466a0-8f8e-7abc-9def-0123456789ab") */
 alias Identifier = string;
 
 alias KindCluster = "Cluster";
diff --git a/schemas/core/openapi.yaml b/schemas/core/openapi.yaml
index 24e44b0..032420e 100644
--- a/schemas/core/openapi.yaml
+++ b/schemas/core/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: HyperFleet API
-  version: 1.0.4
+  version: 1.0.5
   contact:
     name: HyperFleet Team
   license:
@@ -754,8 +754,8 @@ components:
           $ref: '#/components/schemas/ClusterStatus'
       example:
         kind: Cluster
-        id: cluster-123
-        href: https://api.hyperfleet.com/v1/clusters/cluster-123
+        id: 019466a0-8f8e-7abc-9def-0123456789ab
+        href: https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab
         name: cluster-123
         labels:
           environment: production
@@ -1013,8 +1013,8 @@ components:
           $ref: '#/components/schemas/NodePoolStatus'
       example:
         kind: NodePool
-        id: nodepool-123
-        href: https://api.hyperfleet.com/v1/nodepools/nodepool-123
+        id: 019466a1-2b3c-7def-8abc-456789abcdef
+        href: https://api.hyperfleet.com/v1/nodepools/019466a1-2b3c-7def-8abc-456789abcdef
         name: worker-pool-1
         labels:
           environment: production
@@ -1026,9 +1026,9 @@ components:
         created_by: user-123@example.com
         updated_by: user-123@example.com
         owner_references:
-          id: cluster-123
+          id: 019466a0-8f8e-7abc-9def-0123456789ab
           kind: Cluster
-          href: https://api.hyperfleet.com/v1/clusters/cluster-123
+          href: https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab
         status:
           conditions:
             - type: Ready
diff --git a/schemas/core/swagger.yaml b/schemas/core/swagger.yaml
index a4ecca9..b3c0e95 100644
--- a/schemas/core/swagger.yaml
+++ b/schemas/core/swagger.yaml
@@ -16,7 +16,7 @@ info:
     name: Apache 2.0
     url: 'https://www.apache.org/licenses/LICENSE-2.0'
   title: HyperFleet API
-  version: 1.0.4
+  version: 1.0.5
 host: hyperfleet.redhat.com
 basePath: /
 schemes:
@@ -830,8 +830,9 @@ definitions:
       created_by: user-123@example.com
       created_time: '2021-01-01T00:00:00Z'
       generation: 1
-      href: 'https://api.hyperfleet.com/v1/clusters/cluster-123'
-      id: cluster-123
+      href: >-
+        https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab
+      id: 019466a0-8f8e-7abc-9def-0123456789ab
       kind: Cluster
       labels:
         environment: production
@@ -1100,16 +1101,18 @@ definitions:
       created_by: user-123@example.com
       created_time: '2021-01-01T00:00:00Z'
       generation: 1
-      href: 'https://api.hyperfleet.com/v1/nodepools/nodepool-123'
-      id: nodepool-123
+      href: >-
+        https://api.hyperfleet.com/v1/nodepools/019466a1-2b3c-7def-8abc-456789abcdef
+      id: 019466a1-2b3c-7def-8abc-456789abcdef
       kind: NodePool
       labels:
         environment: production
         pooltype: worker
       name: worker-pool-1
       owner_references:
-        href: 'https://api.hyperfleet.com/v1/clusters/cluster-123'
-        id: cluster-123
+        href: >-
+          https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab
+        id: 019466a0-8f8e-7abc-9def-0123456789ab
         kind: Cluster
       spec: {}
       status:
diff --git a/schemas/gcp/openapi.yaml b/schemas/gcp/openapi.yaml
index 2e9b451..172f1b0 100644
--- a/schemas/gcp/openapi.yaml
+++ b/schemas/gcp/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: HyperFleet API
-  version: 1.0.4
+  version: 1.0.5
   contact:
     name: HyperFleet Team
   license:
@@ -633,8 +633,8 @@ components:
           $ref: '#/components/schemas/ClusterStatus'
       example:
         kind: Cluster
-        id: cluster-123
-        href: https://api.hyperfleet.com/v1/clusters/cluster-123
+        id: 019466a0-8f8e-7abc-9def-0123456789ab
+        href: https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab
         name: cluster-123
         labels:
           environment: production
@@ -970,8 +970,8 @@ components:
           $ref: '#/components/schemas/NodePoolStatus'
       example:
         kind: NodePool
-        id: nodepool-123
-        href: https://api.hyperfleet.com/v1/nodepools/nodepool-123
+        id: 019466a1-2b3c-7def-8abc-456789abcdef
+        href: https://api.hyperfleet.com/v1/nodepools/019466a1-2b3c-7def-8abc-456789abcdef
         name: worker-pool-1
         labels:
           environment: production
@@ -1002,9 +1002,9 @@ components:
         created_by: user-123@example.com
         updated_by: user-123@example.com
         owner_references:
-          id: cluster-123
+          id: 019466a0-8f8e-7abc-9def-0123456789ab
           kind: Cluster
-          href: https://api.hyperfleet.com/v1/clusters/cluster-123
+          href: https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab
         status:
           conditions:
             - type: Ready
diff --git a/schemas/gcp/swagger.yaml b/schemas/gcp/swagger.yaml
index 1f0c7a2..3404318 100644
--- a/schemas/gcp/swagger.yaml
+++ b/schemas/gcp/swagger.yaml
@@ -16,7 +16,7 @@ info:
     name: Apache 2.0
     url: 'https://www.apache.org/licenses/LICENSE-2.0'
   title: HyperFleet API
-  version: 1.0.4
+  version: 1.0.5
 host: hyperfleet.redhat.com
 basePath: /
 schemes:
@@ -698,8 +698,9 @@ definitions:
       created_by: user-123@example.com
       created_time: '2021-01-01T00:00:00Z'
       generation: 1
-      href: 'https://api.hyperfleet.com/v1/clusters/cluster-123'
-      id: cluster-123
+      href: >-
+        https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab
+      id: 019466a0-8f8e-7abc-9def-0123456789ab
       kind: Cluster
       labels:
         environment: production
@@ -1044,16 +1045,18 @@ definitions:
       created_by: user-123@example.com
       created_time: '2021-01-01T00:00:00Z'
       generation: 1
-      href: 'https://api.hyperfleet.com/v1/nodepools/nodepool-123'
-      id: nodepool-123
+      href: >-
+        https://api.hyperfleet.com/v1/nodepools/019466a1-2b3c-7def-8abc-456789abcdef
+      id: 019466a1-2b3c-7def-8abc-456789abcdef
       kind: NodePool
       labels:
         environment: production
         pooltype: worker
       name: worker-pool-1
       owner_references:
-        href: 'https://api.hyperfleet.com/v1/clusters/cluster-123'
-        id: cluster-123
+        href: >-
+          https://api.hyperfleet.com/v1/clusters/019466a0-8f8e-7abc-9def-0123456789ab
+        id: 019466a0-8f8e-7abc-9def-0123456789ab
         kind: Cluster
       spec:
         autoscaling: