diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 7747a01558..c7e72c6f39 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -409,10 +409,7 @@
       </optional>
       <optional>
         <attribute name="deprecated">
-          <choice>
-            <value>yes</value>
-            <value>no</value>
-          </choice>
+          <ref name="virYesNo"/>
         </attribute>
       </optional>
       <text/>
diff --git a/docs/schemas/domainbackup.rng b/docs/schemas/domainbackup.rng
index 05cc28ab00..1ac9da62c1 100644
--- a/docs/schemas/domainbackup.rng
+++ b/docs/schemas/domainbackup.rng
@@ -60,10 +60,7 @@
               <element name="server">
                 <optional>
                   <attribute name="tls">
-                    <choice>
-                      <value>yes</value>
-                      <value>no</value>
-                    </choice>
+                    <ref name="virYesNo"/>
                   </attribute>
                 </optional>
                 <choice>
diff --git a/docs/schemas/domaincaps.rng b/docs/schemas/domaincaps.rng
index b40ee0f35a..9cbc2467ab 100644
--- a/docs/schemas/domaincaps.rng
+++ b/docs/schemas/domaincaps.rng
@@ -156,10 +156,7 @@
           </attribute>
           <optional>
             <attribute name="deprecated">
-              <choice>
-                <value>yes</value>
-                <value>no</value>
-              </choice>
+              <ref name="virYesNo"/>
             </attribute>
           </optional>
           <text/>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 7fa5c2b8b5..169b8d8dee 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -300,18 +300,12 @@
           <element name="loader">
             <optional>
               <attribute name="readonly">
-                <choice>
-                  <value>yes</value>
-                  <value>no</value>
-                </choice>
+                <ref name="virYesNo"/>
               </attribute>
             </optional>
             <optional>
               <attribute name="secure">
-                <choice>
-                  <value>yes</value>
-                  <value>no</value>
-                </choice>
+                <ref name="virYesNo"/>
               </attribute>
             </optional>
             <optional>
@@ -5331,11 +5325,8 @@
           <ref name="tpm-backend-emulator-active-pcr-banks"/>
           <optional>
             <attribute name="persistent_state">
-              <choice>
-                <value>yes</value>
-                <value>no</value>
-              </choice>
-           </attribute>
+              <ref name="virYesNo"/>
+            </attribute>
           </optional>
         </group>
       </choice>