diff --git a/interface-definitions/service_config-sync.xml.in b/interface-definitions/service_config-sync.xml.in
index 17f59340d..cb51a33b1 100644
--- a/interface-definitions/service_config-sync.xml.in
+++ b/interface-definitions/service_config-sync.xml.in
@@ -1,456 +1,518 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interfaceDefinition>
   <node name="service">
     <children>
       <node name="config-sync" owner="${vyos_conf_scripts_dir}/service_config-sync.py">
         <properties>
           <help>Configuration synchronization</help>
         </properties>
         <children>
           <node name="secondary">
             <properties>
               <help>Secondary server parameters</help>
             </properties>
             <children>
               <leafNode name="address">
                 <properties>
                   <help>IP address</help>
                   <valueHelp>
                     <format>ipv4</format>
                     <description>IPv4 address to match</description>
                   </valueHelp>
                   <valueHelp>
                     <format>ipv6</format>
                     <description>IPv6 address to match</description>
                   </valueHelp>
                   <valueHelp>
                     <format>hostname</format>
                     <description>FQDN address to match</description>
                   </valueHelp>
                   <constraint>
                     <validator name="ipv4-address"/>
                     <validator name="ipv6-address"/>
                     <validator name="fqdn"/>
                   </constraint>
                 </properties>
               </leafNode>
               <leafNode name="timeout">
                 <properties>
                   <help>Connection API timeout</help>
                   <valueHelp>
                     <format>u32:1-3600</format>
                     <description>Connection API timeout</description>
                   </valueHelp>
                   <constraint>
                     <validator name="numeric" argument="--range 1-3600"/>
                   </constraint>
                 </properties>
                 <defaultValue>60</defaultValue>
               </leafNode>
               <leafNode name="key">
                 <properties>
                   <help>HTTP API key</help>
                 </properties>
               </leafNode>
             </children>
           </node>
           <leafNode name="mode">
             <properties>
               <help>Synchronization mode</help>
               <completionHelp>
                 <list>load set</list>
               </completionHelp>
               <valueHelp>
                 <format>load</format>
                 <description>Load and replace configuration section</description>
               </valueHelp>
               <valueHelp>
                 <format>set</format>
                 <description>Set configuration section</description>
               </valueHelp>
               <constraint>
                 <regex>(load|set)</regex>
               </constraint>
             </properties>
           </leafNode>
           <node name="section">
             <properties>
               <help>Section for synchronization</help>
             </properties>
             <children>
               <leafNode name="firewall">
                 <properties>
                   <help>Firewall</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <node name="interfaces">
                 <properties>
                   <help>Interfaces</help>
                 </properties>
                 <children>
                   <leafNode name="bonding">
                     <properties>
                       <help>Bonding interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="bridge">
                     <properties>
                       <help>Bridge interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="dummy">
                     <properties>
                       <help>Dummy interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="ethernet">
                     <properties>
                       <help>Ethernet interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="geneve">
                     <properties>
                       <help>GENEVE interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="input">
                     <properties>
                       <help>Input interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="l2tpv3">
                     <properties>
                       <help>L2TPv3 interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="loopback">
                     <properties>
                       <help>Loopback interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="macsec">
                     <properties>
                       <help>MACsec interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="openvpn">
                     <properties>
                       <help>OpenVPN interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="pppoe">
                     <properties>
                       <help>PPPoE interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="pseudo-ethernet">
                     <properties>
                       <help>Pseudo-Ethernet interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="sstpc">
                     <properties>
                       <help>SSTP client interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="tunnel">
                     <properties>
                       <help>Tunnel interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="virtual-ethernet">
                     <properties>
                       <help>Virtual Ethernet interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="vti">
                     <properties>
                       <help>Virtual tunnel interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="vxlan">
                     <properties>
                       <help>VXLAN interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="wireguard">
                     <properties>
                       <help>Wireguard interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="wireless">
                     <properties>
                       <help>Wireless interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="wwan">
                     <properties>
                       <help>WWAN interface</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                 </children>
               </node>
               <leafNode name="nat">
                 <properties>
                   <help>NAT</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="nat66">
                 <properties>
                   <help>NAT66</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="pki">
                 <properties>
                   <help>Public key infrastructure (PKI)</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="policy">
                 <properties>
                   <help>Routing policy</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <node name="protocols">
                 <properties>
                   <help>Routing protocols</help>
                 </properties>
                 <children>
                   <leafNode name="babel">
                     <properties>
                       <help>Babel Routing Protocol</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="bfd">
                     <properties>
                       <help>Bidirectional Forwarding Detection (BFD)</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="bgp">
                     <properties>
                       <help>Border Gateway Protocol (BGP)</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="failover">
                     <properties>
                       <help>Failover route</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="igmp-proxy">
                     <properties>
                       <help>Internet Group Management Protocol (IGMP) proxy</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="isis">
                     <properties>
                       <help>Intermediate System to Intermediate System (IS-IS)</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="mpls">
                     <properties>
                       <help>Multiprotocol Label Switching (MPLS)</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="nhrp">
                     <properties>
                       <help>Next Hop Resolution Protocol (NHRP) parameters</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="ospf">
                     <properties>
                       <help>Open Shortest Path First (OSPF)</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="ospfv3">
                     <properties>
                       <help>Open Shortest Path First (OSPF) for IPv6</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="pim">
                     <properties>
                       <help>Protocol Independent Multicast (PIM) and IGMP</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="pim6">
                     <properties>
                       <help>Protocol Independent Multicast for IPv6 (PIMv6) and MLD</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="rip">
                     <properties>
                       <help>Routing Information Protocol (RIP) parameters</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="ripng">
                     <properties>
                       <help>Routing Information Protocol (RIPng) parameters</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="rpki">
                     <properties>
                       <help>Resource Public Key Infrastructure (RPKI)</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="segment-routing">
                     <properties>
                       <help>Segment Routing</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="static">
                     <properties>
                       <help>Static Routing</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                 </children>
               </node>
+              <node name="qos">
+                <properties>
+                  <help>Quality of Service (QoS)</help>
+                </properties>
+                <children>
+                  <leafNode name="interface">
+                    <properties>
+                      <help>Interface to apply QoS policy</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="policy">
+                    <properties>
+                      <help>Service Policy definitions</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
               <node name="service">
                 <properties>
                   <help>System services</help>
                 </properties>
                 <children>
                   <leafNode name="console-server">
                     <properties>
                       <help>Serial Console Server</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="dhcp-relay">
                     <properties>
                       <help>Host Configuration Protocol (DHCP) relay agent</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="dhcp-server">
                     <properties>
                       <help>Dynamic Host Configuration Protocol (DHCP) for DHCP server</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="dhcpv6-relay">
                     <properties>
                       <help>DHCPv6 Relay Agent parameters</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="dhcpv6-server">
                     <properties>
                       <help>DHCP for IPv6 (DHCPv6) server</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="dns">
                     <properties>
                       <help>Domain Name System (DNS) related services</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="lldp">
                     <properties>
                       <help>LLDP settings</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="mdns">
                     <properties>
                       <help>Multicast DNS (mDNS) parameters</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="monitoring">
                     <properties>
                       <help>Monitoring services</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="ndp-proxy">
                     <properties>
                       <help>Neighbor Discovery Protocol (NDP) Proxy</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="ntp">
                     <properties>
                       <help>Network Time Protocol (NTP) configuration</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="snmp">
                     <properties>
                       <help>Simple Network Management Protocol (SNMP)</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="tftp-server">
                     <properties>
                       <help>Trivial File Transfer Protocol (TFTP) server</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                   <leafNode name="webproxy">
                     <properties>
                       <help>Webproxy service settings</help>
                       <valueless/>
                     </properties>
                   </leafNode>
                 </children>
               </node>
+              <node name="system">
+                <properties>
+                  <help>System parameters</help>
+                </properties>
+                <children>
+                  <leafNode name="conntrack">
+                    <properties>
+                      <help>Connection Tracking</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="flow-accounting">
+                    <properties>
+                      <help>Flow accounting</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="option">
+                    <properties>
+                      <help>System Options</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="sflow">
+                    <properties>
+                      <help>sFlow</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="static-host-mapping">
+                    <properties>
+                      <help>Map host names to addresses</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="sysctl">
+                    <properties>
+                      <help>Configure kernel parameters at runtime</help>
+                      <valueless/>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
               <leafNode name="vpn">
                 <properties>
                   <help>Virtual Private Network (VPN)</help>
                   <valueless/>
                 </properties>
               </leafNode>
               <leafNode name="vrf">
                 <properties>
                   <help>Virtual Routing and Forwarding</help>
                   <valueless/>
                 </properties>
               </leafNode>
             </children>
           </node>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>