diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5d05deb44..90caf8169 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,7 +20,12 @@ repos:
   rev: v4.5.0
   hooks:
   - id: trailing-whitespace
+    exclude: |
+     (?x)(
+         .*\.patch$
+     )
   - id: check-yaml
+    args: [--allow-multiple-documents]
   - id: check-symlinks
   - id: pretty-format-json
   - id: check-added-large-files
diff --git a/build.json b/build.json
index c337325f2..8ead4ad34 100644
--- a/build.json
+++ b/build.json
@@ -6,43 +6,43 @@
       "linux/s390x",
       "linux/ppc64le"
     ],
-    "ol": [
-       "linux/amd64",
-       "linux/arm64"
-     ],
-    "ubuntu": [
-      "linux/amd64",
-      "linux/arm/v7",
-      "linux/arm64",
-      "linux/s390x"
-    ],
     "centos": [
       "linux/amd64",
       "linux/arm64",
       "linux/ppc64le"
     ],
+    "ol": [
+      "linux/amd64",
+      "linux/arm64"
+    ],
     "rhel": [
       "X64",
       "ARM64"
+    ],
+    "ubuntu": [
+      "linux/amd64",
+      "linux/arm/v7",
+      "linux/arm64",
+      "linux/s390x"
     ]
   },
   "os-windows": {
-   "windows-2022": "ltsc2022",
-   "windows-2019": "ltsc2019"
+    "windows-2019": "ltsc2019",
+    "windows-2022": "ltsc2022"
   },
   "components": {
-    "agent": { "base" : "build-mysql", "rhel" : true },
-    "agent2": { "base" : "build-mysql", "rhel" : true },
-    "java-gateway": { "base" : "build-mysql", "rhel" : true },
-    "proxy-mysql": { "base" : "build-mysql", "rhel" : true },
-    "proxy-sqlite3": { "base" : "build-sqlite3", "rhel" : true },
-    "server-mysql": { "base" : "build-mysql", "rhel" : true },
-    "server-pgsql": { "base" : "build-pgsql", "rhel" : false },
-    "snmptraps": { "base" : "", "rhel" : true },
-    "web-apache-mysql": { "base" : "build-mysql", "rhel" : false },
-    "web-apache-pgsql": { "base" : "build-pgsql", "rhel" : false },
-    "web-nginx-mysql": { "base" : "build-mysql", "rhel" : true },
-    "web-nginx-pgsql": { "base" : "build-mysql", "rhel" : false },
-    "web-service": { "base" : "build-mysql", "rhel" : true }
+    "agent": { "base": "build-mysql", "rhel": true },
+    "agent2": { "base": "build-mysql", "rhel": true },
+    "java-gateway": { "base": "build-mysql", "rhel": true },
+    "proxy-mysql": { "base": "build-mysql", "rhel": true },
+    "proxy-sqlite3": { "base": "build-sqlite3", "rhel": true },
+    "server-mysql": { "base": "build-mysql", "rhel": true },
+    "server-pgsql": { "base": "build-pgsql", "rhel": false },
+    "snmptraps": { "base": "", "rhel": true },
+    "web-apache-mysql": { "base": "build-mysql", "rhel": false },
+    "web-apache-pgsql": { "base": "build-pgsql", "rhel": false },
+    "web-nginx-mysql": { "base": "build-mysql", "rhel": true },
+    "web-nginx-pgsql": { "base": "build-mysql", "rhel": false },
+    "web-service": { "base": "build-mysql", "rhel": true }
   }
 }