diff --git a/schemas/2024-09/feature.schema.json b/schemas/2024-09/feature.schema.json
index 5d21aab..3f53896 100644
--- a/schemas/2024-09/feature.schema.json
+++ b/schemas/2024-09/feature.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/content/draft/2024-09/feature.schema.json",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/content/draft/2024-09/feature.schema.json",
     "title": "Feature",
     "description": "",
     "type": "object",
diff --git a/schemas/2024-09/features.schema.json b/schemas/2024-09/features.schema.json
index c62b5b2..4cc7eeb 100644
--- a/schemas/2024-09/features.schema.json
+++ b/schemas/2024-09/features.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/content/draft/2024-09/features.schema.json",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/content/draft/2024-09/features.schema.json",
     "title": "Features",
     "description": "",
     "type": "object",
@@ -15,7 +15,7 @@
         "featureList": {
             "type": "array",
             "items": {
-                "$ref": "https://schemas.cerberauth.com/content/draft/2024-09/feature.schema.json"
+                "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/content/draft/2024-09/feature.schema.json"
             }
         }
     }
diff --git a/schemas/2024-09/image.schema.json b/schemas/2024-09/image.schema.json
index b742ea0..e8dc142 100644
--- a/schemas/2024-09/image.schema.json
+++ b/schemas/2024-09/image.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/content/draft/2024-09/image.schema.json",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/content/draft/2024-09/image.schema.json",
     "title": "Image",
     "description": "https://schema.org/ImageObject",
     "type": "object",
diff --git a/schemas/openid/draft/2024-09/provider.schema.json b/schemas/openid/draft/2024-09/provider.schema.json
index 838a5cd..265aad8 100644
--- a/schemas/openid/draft/2024-09/provider.schema.json
+++ b/schemas/openid/draft/2024-09/provider.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/openid/draft/2024-09/provider.schema.json",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/openid/draft/2024-09/provider.schema.json",
     "title": "OpenID Connect Provider",
     "description": "",
     "type": "object",
@@ -28,7 +28,7 @@
             "format": "uri"
         },
         "icon": {
-            "$ref": "https://schemas.cerberauth.com/content/draft/2024-09/image.schema.json"
+            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/content/draft/2024-09/image.schema.json"
         },
         "license": {
             "type": "string"
@@ -39,7 +39,7 @@
         "featureList": {
             "type": "array",
             "items": {
-                "$ref": "https://schemas.cerberauth.com/content/draft/2024-09/feature.schema.json"
+                "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/content/draft/2024-09/feature.schema.json"
             }
         }
     }
diff --git a/schemas/templates/draft/2024-09/application.schema.json b/schemas/templates/draft/2024-09/application.schema.json
index a390b98..33c0002 100644
--- a/schemas/templates/draft/2024-09/application.schema.json
+++ b/schemas/templates/draft/2024-09/application.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/templates/draft/2024-09/application.schema.json",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/templates/draft/2024-09/application.schema.json",
     "title": "Application",
     "description": "",
     "type": "object",
@@ -47,13 +47,13 @@
             }
         },
         "icon": {
-            "$ref": "https://schemas.cerberauth.com/content/draft/2024-09/image.schema.json"
+            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/content/draft/2024-09/image.schema.json"
         },
         "client": {
-            "$ref": "https://schemas.cerberauth.com/templates/draft/2024-09/client.schema.json"
+            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/templates/draft/2024-09/client.schema.json"
         },
         "example": {
-            "$ref": "https://schemas.cerberauth.com/templates/draft/2024-09/example.schema.json"
+            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/templates/draft/2024-09/example.schema.json"
         }
     }
 }
\ No newline at end of file
diff --git a/schemas/templates/draft/2024-09/client.schema.json b/schemas/templates/draft/2024-09/client.schema.json
index 35d01b6..80275fe 100644
--- a/schemas/templates/draft/2024-09/client.schema.json
+++ b/schemas/templates/draft/2024-09/client.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/templates/draft/2024-09/client.schema.json",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/templates/draft/2024-09/client.schema.json",
     "title": "Client Template",
     "description": "",
     "type": "object",
diff --git a/schemas/templates/draft/2024-09/example.schema.json b/schemas/templates/draft/2024-09/example.schema.json
index 262837e..8fcabcf 100644
--- a/schemas/templates/draft/2024-09/example.schema.json
+++ b/schemas/templates/draft/2024-09/example.schema.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/templates/draft/2024-09/example.schema.json",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/templates/draft/2024-09/example.schema.json",
     "title": "Example",
     "description": "",
     "type": "object",
diff --git a/schemas/vulnapi/draft/2024-10/curl-report.schema.json b/schemas/vulnapi/draft/2024-10/curl-report.schema.json
new file mode 100644
index 0000000..e017237
--- /dev/null
+++ b/schemas/vulnapi/draft/2024-10/curl-report.schema.json
@@ -0,0 +1,40 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/curl-report.schema.json",
+    "title": "cURL Report",
+    "description": "",
+    "type": "object",
+    "required": [],
+    "properties": {
+        "method": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "data": {
+            "type": "object"
+        },
+        "headers": {
+            "type": "object"
+        },
+        "cookies": {
+            "type": "array",
+            "items": {
+                "type": "object"
+            }
+        },
+        "securitySchemes": {
+            "type": "array",
+            "items": {
+                "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/security-scheme-report.schema.json"
+            }
+        },
+        "issues": {
+            "type": "array",
+            "items": {
+                "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/issue-report.schema.json"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/schemas/vulnapi/draft/2024-10/graphql-report.schema.json b/schemas/vulnapi/draft/2024-10/graphql-report.schema.json
new file mode 100644
index 0000000..7fa27ff
--- /dev/null
+++ b/schemas/vulnapi/draft/2024-10/graphql-report.schema.json
@@ -0,0 +1,23 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/graphql-report.schema.json",
+    "title": "GraphQL Report",
+    "description": "",
+    "type": "object",
+    "required": [
+        "url",
+        "queries",
+        "mutations"
+    ],
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "queries": {
+            "type": "object"
+        },
+        "mutations": {
+            "type": "object"
+        }
+    }
+}
\ No newline at end of file
diff --git a/schemas/vulnapi/draft/2024-10/vulnerability.schema.json b/schemas/vulnapi/draft/2024-10/issue-report.schema.json
similarity index 90%
rename from schemas/vulnapi/draft/2024-10/vulnerability.schema.json
rename to schemas/vulnapi/draft/2024-10/issue-report.schema.json
index 8625fc3..de80810 100644
--- a/schemas/vulnapi/draft/2024-10/vulnerability.schema.json
+++ b/schemas/vulnapi/draft/2024-10/issue-report.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/vulnapi/draft/2024-10/vulnerability.schema.json",
-    "title": "Vulnerability",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/issue-report.schema.json",
+    "title": "Issue",
     "description": "",
     "type": "object",
     "required": [
diff --git a/schemas/vulnapi/draft/2024-10/openapi-operation-report.schema.json b/schemas/vulnapi/draft/2024-10/openapi-operation-report.schema.json
new file mode 100644
index 0000000..a3d325f
--- /dev/null
+++ b/schemas/vulnapi/draft/2024-10/openapi-operation-report.schema.json
@@ -0,0 +1,35 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/openapi-operation-report.schema.json",
+    "title": "OpenAPI Operation Report",
+    "description": "",
+    "type": "object",
+    "required": [
+        "operationId",
+        "securitySchemes",
+        "issues"
+    ],
+    "properties": {
+        "operationId": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "securitySchemes": {
+            "type": "array",
+            "items": {
+                "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/security-scheme-report.schema.json"
+            }
+        },
+        "issues": {
+            "type": "array",
+            "items": {
+                "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/issue-report.schema.json"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/schemas/vulnapi/draft/2024-10/openapi-report.schema.json b/schemas/vulnapi/draft/2024-10/openapi-report.schema.json
new file mode 100644
index 0000000..b6e9faf
--- /dev/null
+++ b/schemas/vulnapi/draft/2024-10/openapi-report.schema.json
@@ -0,0 +1,25 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/openapi-report.schema.json",
+    "title": "OpenAPI Report",
+    "description": "",
+    "type": "object",
+    "required": [],
+    "properties": {
+        "paths": {
+            "title": "Map<string, PathItem object>",
+            "type": "object",
+            "patternProperties": {
+                "^.*$": {
+                    "title": "Map<string, Operation object>",
+                    "type": "object",
+                    "patternProperties": {
+                        "^.*$": {
+                            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/openapi-operation-report.schema.json"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/schemas/vulnapi/draft/2024-10/operation.schema.json b/schemas/vulnapi/draft/2024-10/operation-report.schema.json
similarity index 74%
rename from schemas/vulnapi/draft/2024-10/operation.schema.json
rename to schemas/vulnapi/draft/2024-10/operation-report.schema.json
index d3367aa..d95cd26 100644
--- a/schemas/vulnapi/draft/2024-10/operation.schema.json
+++ b/schemas/vulnapi/draft/2024-10/operation-report.schema.json
@@ -1,12 +1,11 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/vulnapi/draft/2024-10/operation.schema.json",
-    "title": "Report Operation",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/operation-report.schema.json",
+    "title": "Operation Report",
     "description": "",
     "type": "object",
     "required": [
         "id",
-        "tags",
         "method",
         "url",
         "securitySchemes"
@@ -42,7 +41,7 @@
         "securitySchemes": {
             "type": "array",
             "items": {
-                "$ref": "https://schemas.cerberauth.com/vulnapi/draft/2024-10/security-scheme.schema.json"
+                "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/security-scheme-report.schema.json"
             }
         }
     }
diff --git a/schemas/vulnapi/draft/2024-10/report.schema.json b/schemas/vulnapi/draft/2024-10/report.schema.json
index a887170..6ad5b8d 100644
--- a/schemas/vulnapi/draft/2024-10/report.schema.json
+++ b/schemas/vulnapi/draft/2024-10/report.schema.json
@@ -1,50 +1,68 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/vulnapi/report/draft/2024-10/report.schema.json",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/report.schema.json",
     "title": "Report",
     "description": "",
-    "type": "array",
-    "items": {
-        "type": "object",
-        "required": [
-            "id",
-            "name",
-            "startTime",
-            "operation",
-            "scans",
-            "vulnerabilities"
-        ],
-        "properties": {
-            "id": {
-                "type": "string"
-            },
-            "name": {
-                "type": "string"
-            },
-            "startTime": {
-                "type": "string",
-                "format": "date-time"
-            },
-            "endTime": {
-                "type": "string",
-                "format": "date-time"
-            },
-            "operation": {
-                "$ref": "https://schemas.cerberauth.com/vulnapi/draft/2024-10/operation.schema.json"
-            },
-            "data": {
-                "type": "object"
-            },
-            "scans": {
-                "type": "array",
-                "items": {
-                    "$ref": "https://schemas.cerberauth.com/vulnapi/draft/2024-10/scan.schema.json"
-                }
-            },
-            "vulnerabilities": {
-                "type": "array",
-                "items": {
-                    "$ref": "https://schemas.cerberauth.com/vulnapi/draft/2024-10/vulnerability.schema.json"
+    "type": "object",
+    "required": ["options", "reports"],
+    "properties": {
+        "options": {
+            "type": "object"
+        },
+        "curl": {
+            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/curl-report.schema.json"
+        },
+        "openapi": {
+            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/openapi-report.schema.json"
+        },
+        "graphql": {
+            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/graphql-report.schema.json"
+        },
+        "reports": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "required": [
+                    "id",
+                    "name",
+                    "startTime",
+                    "operation",
+                    "scans",
+                    "issues"
+                ],
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "startTime": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "endTime": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "operation": {
+                        "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/operation-report.schema.json"
+                    },
+                    "data": {
+                        "type": "object"
+                    },
+                    "scans": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/scan-report.schema.json"
+                        }
+                    },
+                    "issues": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/issue-report.schema.json"
+                        }
+                    }
                 }
             }
         }
diff --git a/schemas/vulnapi/draft/2024-10/scan.schema.json b/schemas/vulnapi/draft/2024-10/scan-report.schema.json
similarity index 91%
rename from schemas/vulnapi/draft/2024-10/scan.schema.json
rename to schemas/vulnapi/draft/2024-10/scan-report.schema.json
index 4d0c61c..ff464ec 100644
--- a/schemas/vulnapi/draft/2024-10/scan.schema.json
+++ b/schemas/vulnapi/draft/2024-10/scan-report.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/vulnapi/draft/2024-10/scan.schema.json",
-    "title": "Report Scan",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/scan-report.schema.json",
+    "title": "Scan Report",
     "description": "",
     "type": "object",
     "required": [],
diff --git a/schemas/vulnapi/draft/2024-10/security-scheme.schema.json b/schemas/vulnapi/draft/2024-10/security-scheme-report.schema.json
similarity index 83%
rename from schemas/vulnapi/draft/2024-10/security-scheme.schema.json
rename to schemas/vulnapi/draft/2024-10/security-scheme-report.schema.json
index 7c6e986..4205912 100644
--- a/schemas/vulnapi/draft/2024-10/security-scheme.schema.json
+++ b/schemas/vulnapi/draft/2024-10/security-scheme-report.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json-schema.org/draft/2020-12/schema",
-    "$id": "https://schemas.cerberauth.com/vulnapi/draft/2024-10/security-scheme.schema.json",
-    "title": "Reporty Operation Security Scheme",
+    "$id": "https://refactor-report-schemas.cerberauth-schemas.pages.dev/vulnapi/draft/2024-10/security-scheme-report.schema.json",
+    "title": "Operation Security Scheme Report",
     "description": "",
     "type": "object",
     "required": [