diff --git a/main.tsp b/main.tsp
index 61d493c..151ab70 100644
--- a/main.tsp
+++ b/main.tsp
@@ -33,7 +33,7 @@ using OpenAPI;
  */
 @service(#{ title: "HyperFleet API" })
 @info(#{
-  version: "1.0.25",
+  version: "1.0.26",
   contact: #{
     name: "HyperFleet Team",
     url: "https://github.com/openshift-hyperfleet",
diff --git a/package-lock.json b/package-lock.json
index cb01745..d3120eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
       "name": "hyperfleet-template-api-spec",
       "version": "1.0.15",
       "dependencies": {
-        "hyperfleet": "github:openshift-hyperfleet/hyperfleet-api-spec#v1.0.24"
+        "hyperfleet": "github:openshift-hyperfleet/hyperfleet-api-spec#v1.0.25"
       },
       "devDependencies": {
         "@stoplight/spectral-cli": "6.15.1",
@@ -3906,8 +3906,8 @@
       "license": "MIT"
     },
     "node_modules/hyperfleet": {
-      "version": "1.0.24",
-      "resolved": "git+ssh://git@github.com/openshift-hyperfleet/hyperfleet-api-spec.git#e527445ac7261e1a6acccd36e51936b68b23e00e"
+      "version": "1.0.25",
+      "resolved": "git+ssh://git@github.com/openshift-hyperfleet/hyperfleet-api-spec.git#01cb3a2eabad1666c38f1cdc295eca36103c09da"
     },
     "node_modules/iconv-lite": {
       "version": "0.7.2",
diff --git a/package.json b/package.json
index 626be63..4d84370 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "build": "./build-schema.sh"
   },
   "dependencies": {
-    "hyperfleet": "github:openshift-hyperfleet/hyperfleet-api-spec#v1.0.24"
+    "hyperfleet": "github:openshift-hyperfleet/hyperfleet-api-spec#v1.0.25"
   },
   "devDependencies": {
     "@stoplight/spectral-cli": "6.15.1",
diff --git a/schemas/template/openapi.yaml b/schemas/template/openapi.yaml
index 1542f65..46cb155 100644
--- a/schemas/template/openapi.yaml
+++ b/schemas/template/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.0
 info:
   title: HyperFleet API
-  version: 1.0.25
+  version: 1.0.26
   contact:
     name: HyperFleet Team
     url: https://github.com/openshift-hyperfleet
@@ -1501,11 +1501,9 @@ components:
           description: Timestamp when the resource was last updated
         created_by:
           type: string
-          format: email
           description: Identity that created the resource
         updated_by:
           type: string
-          format: email
           description: Identity that last updated the resource
         deleted_time:
           type: string
@@ -1513,7 +1511,6 @@ components:
           description: Timestamp when deletion was requested; omitted if not marked for deletion
         deleted_by:
           type: string
-          format: email
           description: Identity that requested deletion; omitted if not marked for deletion
         generation:
           type: integer
@@ -1669,11 +1666,9 @@ components:
           description: Timestamp when the resource was last updated
         created_by:
           type: string
-          format: email
           description: Identity that created the resource
         updated_by:
           type: string
-          format: email
           description: Identity that last updated the resource
         deleted_time:
           type: string
@@ -1681,7 +1676,6 @@ components:
           description: Timestamp when deletion was requested; omitted if not marked for deletion
         deleted_by:
           type: string
-          format: email
           description: Identity that requested deletion; omitted if not marked for deletion
         generation:
           type: integer
@@ -2035,11 +2029,9 @@ components:
           description: Timestamp when the resource was last updated
         created_by:
           type: string
-          format: email
           description: Identity that created the resource
         updated_by:
           type: string
-          format: email
           description: Identity that last updated the resource
         deleted_time:
           type: string
@@ -2047,7 +2039,6 @@ components:
           description: Timestamp when deletion was requested; omitted if not marked for deletion
         deleted_by:
           type: string
-          format: email
           description: Identity that requested deletion; omitted if not marked for deletion
         generation:
           type: integer
@@ -2230,11 +2221,9 @@ components:
           description: Timestamp when the resource was last updated
         created_by:
           type: string
-          format: email
           description: Identity that created the resource
         updated_by:
           type: string
-          format: email
           description: Identity that last updated the resource
         deleted_time:
           type: string
@@ -2242,7 +2231,6 @@ components:
           description: Timestamp when deletion was requested; omitted if not marked for deletion
         deleted_by:
           type: string
-          format: email
           description: Identity that requested deletion; omitted if not marked for deletion
         generation:
           type: integer
@@ -2639,11 +2627,9 @@ components:
           description: Timestamp when the resource was last updated
         created_by:
           type: string
-          format: email
           description: Identity that created the resource
         updated_by:
           type: string
-          format: email
           description: Identity that last updated the resource
         deleted_time:
           type: string
@@ -2651,7 +2637,6 @@ components:
           description: Timestamp when deletion was requested; omitted if not marked for deletion
         deleted_by:
           type: string
-          format: email
           description: Identity that requested deletion; omitted if not marked for deletion
         generation:
           type: integer
@@ -2827,11 +2812,9 @@ components:
           description: Timestamp when the resource was last updated
         created_by:
           type: string
-          format: email
           description: Identity that created the resource
         updated_by:
           type: string
-          format: email
           description: Identity that last updated the resource
         deleted_time:
           type: string
@@ -2839,7 +2822,6 @@ components:
           description: Timestamp when deletion was requested; omitted if not marked for deletion
         deleted_by:
           type: string
-          format: email
           description: Identity that requested deletion; omitted if not marked for deletion
         generation:
           type: integer
diff --git a/schemas/template/swagger.yaml b/schemas/template/swagger.yaml
index 1db851f..3feebdf 100644
--- a/schemas/template/swagger.yaml
+++ b/schemas/template/swagger.yaml
@@ -17,7 +17,7 @@ info:
     name: Apache 2.0
     url: 'https://www.apache.org/licenses/LICENSE-2.0'
   title: HyperFleet API
-  version: 1.0.25
+  version: 1.0.26
 host: hyperfleet.redhat.com
 basePath: /
 schemes:
@@ -1491,7 +1491,6 @@ definitions:
     properties:
       created_by:
         description: Identity that created the resource
-        format: email
         type: string
       created_time:
         description: Timestamp when the resource was created
@@ -1499,7 +1498,6 @@ definitions:
         type: string
       deleted_by:
         description: Identity that requested deletion; omitted if not marked for deletion
-        format: email
         type: string
       deleted_time:
         description: >-
@@ -1536,7 +1534,6 @@ definitions:
         $ref: '#/definitions/ResourceStatus'
       updated_by:
         description: Identity that last updated the resource
-        format: email
         type: string
       updated_time:
         description: Timestamp when the resource was last updated
@@ -1715,7 +1712,6 @@ definitions:
     properties:
       created_by:
         description: Identity that created the resource
-        format: email
         type: string
       created_time:
         description: Timestamp when the resource was created
@@ -1723,7 +1719,6 @@ definitions:
         type: string
       deleted_by:
         description: Identity that requested deletion; omitted if not marked for deletion
-        format: email
         type: string
       deleted_time:
         description: >-
@@ -1764,7 +1759,6 @@ definitions:
         $ref: '#/definitions/ClusterStatus'
       updated_by:
         description: Identity that last updated the resource
-        format: email
         type: string
       updated_time:
         description: Timestamp when the resource was last updated
@@ -2106,7 +2100,6 @@ definitions:
     properties:
       created_by:
         description: Identity that created the resource
-        format: email
         type: string
       created_time:
         description: Timestamp when the resource was created
@@ -2114,7 +2107,6 @@ definitions:
         type: string
       deleted_by:
         description: Identity that requested deletion; omitted if not marked for deletion
-        format: email
         type: string
       deleted_time:
         description: >-
@@ -2157,7 +2149,6 @@ definitions:
         $ref: '#/definitions/NodePoolStatus'
       updated_by:
         description: Identity that last updated the resource
-        format: email
         type: string
       updated_time:
         description: Timestamp when the resource was last updated
@@ -2234,7 +2225,6 @@ definitions:
     properties:
       created_by:
         description: Identity that created the resource
-        format: email
         type: string
       created_time:
         description: Timestamp when the resource was created
@@ -2242,7 +2232,6 @@ definitions:
         type: string
       deleted_by:
         description: Identity that requested deletion; omitted if not marked for deletion
-        format: email
         type: string
       deleted_time:
         description: >-
@@ -2285,7 +2274,6 @@ definitions:
         $ref: '#/definitions/NodePoolStatus'
       updated_by:
         description: Identity that last updated the resource
-        format: email
         type: string
       updated_time:
         description: Timestamp when the resource was last updated
@@ -2689,7 +2677,6 @@ definitions:
     properties:
       created_by:
         description: Identity that created the resource
-        format: email
         type: string
       created_time:
         description: Timestamp when the resource was created
@@ -2697,7 +2684,6 @@ definitions:
         type: string
       deleted_by:
         description: Identity that requested deletion; omitted if not marked for deletion
-        format: email
         type: string
       deleted_time:
         description: >-
@@ -2735,7 +2721,6 @@ definitions:
         $ref: '#/definitions/ResourceStatus'
       updated_by:
         description: Identity that last updated the resource
-        format: email
         type: string
       updated_time:
         description: Timestamp when the resource was last updated
@@ -2874,7 +2859,6 @@ definitions:
     properties:
       created_by:
         description: Identity that created the resource
-        format: email
         type: string
       created_time:
         description: Timestamp when the resource was created
@@ -2882,7 +2866,6 @@ definitions:
         type: string
       deleted_by:
         description: Identity that requested deletion; omitted if not marked for deletion
-        format: email
         type: string
       deleted_time:
         description: >-
@@ -2919,7 +2902,6 @@ definitions:
         $ref: '#/definitions/ResourceStatus'
       updated_by:
         description: Identity that last updated the resource
-        format: email
         type: string
       updated_time:
         description: Timestamp when the resource was last updated