diff --git a/Resources/Private/Schema/Settings.Neos.Fusion.schema.yaml b/Resources/Private/Schema/Settings.Neos.Fusion.schema.yaml
new file mode 100644
index 00000000..d5b52594
--- /dev/null
+++ b/Resources/Private/Schema/Settings.Neos.Fusion.schema.yaml
@@ -0,0 +1,36 @@
+type: dictionary
+additionalProperties: false
+properties:
+  rendering:
+    type: dictionary
+    additionalProperties: false
+    properties:
+      exceptionHandler:
+        type: string
+        format: class-name
+      innerExceptionHandler:
+        type: string
+        format: class-name
+  debugMode:
+    type: boolean
+  enableObjectTreeCache:
+    type: boolean
+  enableContentCache:
+    type: boolean
+  defaultContext:
+    type: dictionary
+    additionalProperties:
+      type:
+        - type: string
+          format: class-name
+        - type: string
+          pattern: '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff\\]*::[a-zA-Z_\x7f-\xff]*$/u'
+  dsl:
+    type: dictionary
+    additionalProperties:
+      type: string
+      format: class-name
+  Afx:
+    type: dictionary
+  Form:
+    type: dictionary
diff --git a/Resources/Private/Schema/Settings.schema.yaml b/Resources/Private/Schema/Settings.schema.yaml
deleted file mode 100644
index 964c36c0..00000000
--- a/Resources/Private/Schema/Settings.schema.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-type: dictionary
-properties:
-  Neos:
-    type: dictionary
-    properties:
-      Fusion:
-        type: dictionary
-        additionalProperties: false
-        properties:
-          rendering:
-            type: dictionary
-            additionalProperties: false
-            properties:
-              exceptionHandler:
-                type: string
-                format: class-name
-              innerExceptionHandler:
-                type: string
-                format: class-name
-          debugMode:
-            type: boolean
-          enableObjectTreeCache:
-            type: boolean
-          enableContentCache:
-            type: boolean
-          defaultContext:
-            type: dictionary
-            additionalProperties:
-              type:
-                - type: string
-                  format: class-name
-                - type: string
-                  pattern: '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff\\]*::[a-zA-Z_\x7f-\xff]*$/u'
-          dsl:
-            type: dictionary
-            additionalProperties:
-              type: string
-              format: class-name
-          Afx:
-            type: dictionary
-