diff --git a/src/schema-validation.jsonc b/src/schema-validation.jsonc
index de4bb92d48f..dbb2474129b 100644
--- a/src/schema-validation.jsonc
+++ b/src/schema-validation.jsonc
@@ -244,7 +244,6 @@
     "typings.json",
     "typingsrc.json",
     "typo3.json",
-    "ubuntu-server-autoinstall.json",
     "utam-page-object.json",
     "utam-page-object-1.5.0.json",
     "utam-page-object-2.0.3.json",
diff --git a/src/schemas/json/ubuntu-server-autoinstall.json b/src/schemas/json/ubuntu-server-autoinstall.json
index db9274d91eb..a054b703507 100644
--- a/src/schemas/json/ubuntu-server-autoinstall.json
+++ b/src/schemas/json/ubuntu-server-autoinstall.json
@@ -1,7 +1,7 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "https://json.schemastore.org/ubuntu-server-autoinstall.json",
   "description": "Settings file for Ubuntu Autoinstall",
-  "id": "https://json.schemastore.org/ubuntu-server-autoinstall.json",
   "properties": {
     "autoinstall": {
       "type": "object",
@@ -14,10 +14,17 @@
         "early-commands": {
           "type": "array",
           "items": {
-            "type": ["string", "array"],
-            "items": {
-              "type": "string"
-            }
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            ]
           }
         },
         "reporting": {
@@ -36,10 +43,17 @@
         "error-commands": {
           "type": "array",
           "items": {
-            "type": ["string", "array"],
-            "items": {
-              "type": "string"
-            }
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            ]
           }
         },
         "user-data": {
@@ -79,7 +93,14 @@
               "type": "string"
             },
             "toggle": {
-              "type": ["string", "null"]
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ]
             }
           },
           "required": ["layout"],
@@ -222,8 +243,15 @@
           ]
         },
         "proxy": {
-          "type": ["string", "null"],
-          "format": "uri"
+          "anyOf": [
+            {
+              "type": "string",
+              "format": "uri"
+            },
+            {
+              "type": "null"
+            }
+          ]
         },
         "apt": {
           "type": "object",
@@ -303,10 +331,17 @@
         "late-commands": {
           "type": "array",
           "items": {
-            "type": ["string", "array"],
-            "items": {
-              "type": "string"
-            }
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            ]
           }
         }
       },