diff --git a/interface-definitions/system_config-management.xml.in b/interface-definitions/system_config-management.xml.in
index 7ae347955..e666633b7 100644
--- a/interface-definitions/system_config-management.xml.in
+++ b/interface-definitions/system_config-management.xml.in
@@ -1,82 +1,74 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="system">
     <children>
       <node name="config-management" owner="${vyos_conf_scripts_dir}/system_config-management.py">
         <properties>
           <help>Configuration management settings</help>
           <priority>400</priority>
         </properties>
         <children>
           <node name="commit-archive">
             <properties>
               <help>Commit archive settings</help>
             </properties>
             <children>
               <leafNode name="location">
                 <properties>
                   <help>Commit archive location</help>
                   <valueHelp>
                     <format>http://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
                     <description/>
                   </valueHelp>
                   <valueHelp>
                     <format>https://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
                     <description/>
                   </valueHelp>
                   <valueHelp>
                     <format>ftp://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
                     <description/>
                   </valueHelp>
                   <valueHelp>
                     <format>sftp://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
                     <description/>
                   </valueHelp>
                   <valueHelp>
                     <format>scp://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
                     <description/>
                   </valueHelp>
                   <valueHelp>
                     <format>tftp://&lt;host&gt;/&lt;path&gt;</format>
                     <description/>
                   </valueHelp>
                   <valueHelp>
                     <format>git+https://&lt;user&gt;:&lt;passwd&gt;@&lt;host&gt;/&lt;path&gt;</format>
                     <description/>
                   </valueHelp>
                   <constraint>
                     <validator name="url --file-transport"/>
                     <regex>(ssh|git|git\+(\w+)):\/\/.*</regex>
                   </constraint>
                   <multi/>
                 </properties>
               </leafNode>
-              <leafNode name="source-address">
-                <properties>
-                  <help>Source address or interface for archive server connections</help>
-                  <constraint>
-                    <validator name="ip-address"/>
-                    #include <include/constraint/interface-name.xml.i>
-                  </constraint>
-                </properties>
-              </leafNode>
+              #include <include/source-address-ipv4-ipv6.xml.i>
             </children>
           </node>
           <leafNode name="commit-revisions">
             <properties>
               <help>Commit revisions</help>
               <valueHelp>
                 <format>u32:1-65535</format>
                 <description>Number of config backups to keep</description>
               </valueHelp>
               <constraint>
                 <validator name="numeric" argument="--range 1-65535"/>
               </constraint>
               <constraintErrorMessage>Number of revisions must be between 0 and 65535</constraintErrorMessage>
             </properties>
           </leafNode>
         </children>
       </node>
     </children>
   </node>
 </interfaceDefinition>