diff --git a/docs/schemas/domaincaps.rng b/docs/schemas/domaincaps.rng
index 7d80693d38def8cd1fcd19b83963a5fcf079bacf..3c42cb80753ac774168914054752cd6a150bf201 100644
--- a/docs/schemas/domaincaps.rng
+++ b/docs/schemas/domaincaps.rng
@@ -142,12 +142,18 @@
 
   <define name='devices'>
     <element name='devices'>
-      <interleave>
+      <optional>
         <ref name='disk'/>
+      </optional>
+      <optional>
         <ref name='graphics'/>
+      </optional>
+      <optional>
         <ref name='video'/>
+      </optional>
+      <optional>
         <ref name='hostdev'/>
-      </interleave>
+      </optional>
     </element>
   </define>
 
@@ -181,12 +187,18 @@
 
   <define name='features'>
     <element name='features'>
-      <interleave>
+      <optional>
         <ref name='gic'/>
+      </optional>
+      <optional>
         <ref name='vmcoreinfo'/>
+      </optional>
+      <optional>
         <ref name='vmgenid'/>
+      </optional>
+      <optional>
         <ref name='sev'/>
-      </interleave>
+      </optional>
     </element>
   </define>