diff --git a/types/schema/Metadata.ts b/types/schema/Metadata.ts
index 7c91c091..47b1813a 100644
--- a/types/schema/Metadata.ts
+++ b/types/schema/Metadata.ts
@@ -1,14 +1,14 @@
 import {DateTime, URL, UUID} from './../utils';
 
-/**
- * @id #DigitalPlanningMetadata
- * @description Details of the digital planning service which sent the application
- */
 export interface Metadata {
+  /**
+   * @id #DigitalPlanningMetadata
+   * @description Details of the digital planning service which sent the application
+   */
   service: {
-    flowId: UUID;
+    flowId: UUID | string; // @todo temp fix for failing UUID validation, sort out and tighten
     name: string;
-    organisation: string;
+    owner: string;
     url: URL;
   };
   session: {
@@ -16,7 +16,7 @@ export interface Metadata {
      * @default PlanX
      */
     source: 'PlanX';
-    id: UUID;
+    id: UUID | string;
     createdAt: DateTime;
     submittedAt?: DateTime;
   };
diff --git a/types/schema/Responses.ts b/types/schema/Responses.ts
index 0ef5ed61..dfaa426a 100644
--- a/types/schema/Responses.ts
+++ b/types/schema/Responses.ts
@@ -1,4 +1,4 @@
-import { URL } from './../utils';
+import {URL} from './../utils';
 
 /**
  * @id #Responses