diff --git a/assets/app/schema.json b/assets/app/schema.json
index c64fd4e9..5f971bd1 100755
--- a/assets/app/schema.json
+++ b/assets/app/schema.json
@@ -781,10 +781,12 @@
         },
         "endpoints": {
           "type": "object",
-          "additionalProperties": false,
-          "patternProperties": {
-            "[0-255]": {
-              "type": "object",
+          "propertyNames": {
+            "type": "string",
+            "pattern": "^[0-9]+$"
+          },
+          "additionalProperties": {
+            "type": "object",
               "additionalProperties": false,
               "properties": {
                 "clusters": {
@@ -799,7 +801,6 @@
                     "type": "number"
                   }
                 }
-              }
             }
           }
         },
diff --git a/test/validate-driver-manifest.js b/test/validate-driver-manifest.js
index 40588fca..0f7c7ba8 100644
--- a/test/validate-driver-manifest.js
+++ b/test/validate-driver-manifest.js
@@ -402,9 +402,9 @@ describe('HomeyLib.App#validate() driver manifest', function() {
     });
 
     await assertValidates(app, {
-      debug: /zigbee\.endpoints should NOT have additional properties/i,
-      publish: /zigbee\.endpoints should NOT have additional properties/i,
-      verified: /zigbee\.endpoints should NOT have additional properties/i,
+      debug: /zigbee\.endpoints should match pattern/i,
+      publish: /zigbee\.endpoints should match pattern/i,
+      verified: /zigbee\.endpoints should match pattern/i,
     });
   });