diff --git a/go.mod b/go.mod
index 16857d6..7327441 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,3 @@
-module github.com/openshift-hyperfleet/hyperfleet-api-spec
+module github.com/rh-amarin/hyperfleet-api-spec
 
 go 1.25.0
diff --git a/main.tsp b/main.tsp
index 8ef0c8d..bf1c9a3 100644
--- a/main.tsp
+++ b/main.tsp
@@ -30,7 +30,7 @@ using OpenAPI;
  */
 @service(#{ title: "HyperFleet API" })
 @info(#{
-  version: "1.0.23",
+  version: "1.0.24",
   contact: #{
     name: "HyperFleet Team",
     url: "https://github.com/openshift-hyperfleet",
diff --git a/package-lock.json b/package-lock.json
index f0ebe93..e3b7d33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "hyperfleet",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "hyperfleet",
-      "version": "1.0.23",
+      "version": "1.0.24",
       "devDependencies": {
         "@stoplight/spectral-cli": "6.15.1",
         "@typespec/compiler": "^1.6.0",
diff --git a/package.json b/package.json
index 9ca0f9f..7df66f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hyperfleet",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "type": "module",
   "exports": {
     "./*": "./*"
diff --git a/schemas/core/openapi.yaml b/schemas/core/openapi.yaml
index 0077cd0..e2b2dc0 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.23
+  version: 1.0.24
   contact:
     name: HyperFleet Team
     url: https://github.com/openshift-hyperfleet
@@ -1808,11 +1808,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
@@ -1820,7 +1818,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
@@ -2088,11 +2085,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
@@ -2100,7 +2095,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
@@ -2245,11 +2239,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
@@ -2257,7 +2249,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
@@ -2478,11 +2469,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
@@ -2490,7 +2479,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
       example:
         kind: MyResource
diff --git a/shared/models/common/model.tsp b/shared/models/common/model.tsp
index 852cc26..9b16ac2 100644
--- a/shared/models/common/model.tsp
+++ b/shared/models/common/model.tsp
@@ -156,16 +156,16 @@ model APIMetadata {
     @format("date-time") updated_time: string;
 
     @doc("Identity that created the resource")
-    @format("email") created_by: string;
+    created_by: string;
 
     @doc("Identity that last updated the resource")
-    @format("email") updated_by: string;
+    updated_by: string;
 
     @doc("Timestamp when deletion was requested; omitted if not marked for deletion")
     @format("date-time") deleted_time?: string;
 
     @doc("Identity that requested deletion; omitted if not marked for deletion")
-    @format("email") deleted_by?: string;
+    deleted_by?: string;
 }
 
 model Page<Kind> {