diff --git a/interface-definitions/include/static/static-route-blackhole.xml.i b/interface-definitions/include/static/static-route-blackhole.xml.i
index f2ad23e69..487f775f5 100644
--- a/interface-definitions/include/static/static-route-blackhole.xml.i
+++ b/interface-definitions/include/static/static-route-blackhole.xml.i
@@ -1,10 +1,11 @@
 <!-- include start from static/static-route-blackhole.xml.i -->
 <node name="blackhole">
   <properties>
-    <help>Silently discard packets when matched</help>
+    <help>Silently discard pkts when matched</help>
   </properties>
   <children>
     #include <include/static/static-route-distance.xml.i>
+    #include <include/static/static-route-tag.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/static/static-route-tag.xml.i b/interface-definitions/include/static/static-route-tag.xml.i
new file mode 100644
index 000000000..24bfa732e
--- /dev/null
+++ b/interface-definitions/include/static/static-route-tag.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from static/static-route-tag.xml.i -->
+<leafNode name="tag">
+  <properties>
+    <help>Tag value for this route</help>
+    <valueHelp>
+      <format>u32:1-4294967295</format>
+      <description>Tag value for this route</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 1-4294967295"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i
index 903915066..8433703a5 100644
--- a/interface-definitions/include/static/static-route.xml.i
+++ b/interface-definitions/include/static/static-route.xml.i
@@ -1,76 +1,57 @@
 <!-- include start from static/static-route.xml.i -->
 <tagNode name="route">
   <properties>
     <help>Static IPv4 route</help>
     <valueHelp>
       <format>ipv4net</format>
       <description>IPv4 static route</description>
     </valueHelp>
     <constraint>
       <validator name="ipv4-prefix"/>
     </constraint>
   </properties>
   <children>
-    <node name="blackhole">
-      <properties>
-        <help>Silently discard pkts when matched</help>
-      </properties>
-      <children>
-        #include <include/static/static-route-distance.xml.i>
-        <leafNode name="tag">
-          <properties>
-            <help>Tag value for this route</help>
-            <valueHelp>
-              <format>u32:1-4294967295</format>
-              <description>Tag value for this route</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-4294967295"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
+    #include <include/static/static-route-blackhole.xml.i>
     #include <include/dhcp-interface.xml.i>
     <tagNode name="interface">
       <properties>
         <help>Next-hop IPv4 router interface</help>
         <completionHelp>
           <script>${vyos_completion_dir}/list_interfaces.py</script>
         </completionHelp>
         <valueHelp>
           <format>txt</format>
           <description>Gateway interface name</description>
         </valueHelp>
         <constraint>
           <validator name="interface-name"/>
         </constraint>
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static/static-route-distance.xml.i>
         #include <include/static/static-route-vrf.xml.i>
       </children>
     </tagNode>
     <tagNode name="next-hop">
       <properties>
         <help>Next-hop IPv4 router address</help>
         <valueHelp>
           <format>ipv4</format>
           <description>Next-hop router address</description>
         </valueHelp>
         <constraint>
           <validator name="ipv4-address"/>
         </constraint>
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static/static-route-distance.xml.i>
         #include <include/static/static-route-interface.xml.i>
         #include <include/static/static-route-vrf.xml.i>
       </children>
     </tagNode>
   </children>
 </tagNode>
 <!-- include end -->
 
diff --git a/interface-definitions/include/static/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i
index e705c45fa..124b2b062 100644
--- a/interface-definitions/include/static/static-route6.xml.i
+++ b/interface-definitions/include/static/static-route6.xml.i
@@ -1,75 +1,56 @@
 <!-- include start from static/static-route6.xml.i -->
 <tagNode name="route6">
   <properties>
     <help>Static IPv6 route</help>
     <valueHelp>
       <format>ipv6net</format>
       <description>IPv6 static route</description>
     </valueHelp>
     <constraint>
       <validator name="ipv6-prefix"/>
     </constraint>
   </properties>
   <children>
-    <node name="blackhole">
-      <properties>
-        <help>Silently discard pkts when matched</help>
-      </properties>
-      <children>
-        #include <include/static/static-route-distance.xml.i>
-        <leafNode name="tag">
-          <properties>
-            <help>Tag value for this route</help>
-            <valueHelp>
-              <format>u32:1-4294967295</format>
-              <description>Tag value for this route</description>
-            </valueHelp>
-            <constraint>
-              <validator name="numeric" argument="--range 1-4294967295"/>
-            </constraint>
-          </properties>
-        </leafNode>
-      </children>
-    </node>
+    #include <include/static/static-route-blackhole.xml.i>
     <tagNode name="interface">
       <properties>
         <help>IPv6 gateway interface name</help>
         <completionHelp>
           <script>${vyos_completion_dir}/list_interfaces.py</script>
         </completionHelp>
         <valueHelp>
           <format>txt</format>
           <description>Gateway interface name</description>
         </valueHelp>
         <constraint>
           <validator name="interface-name"/>
         </constraint>
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static/static-route-distance.xml.i>
         #include <include/static/static-route-vrf.xml.i>
       </children>
     </tagNode>
     <tagNode name="next-hop">
       <properties>
         <help>IPv6 gateway address</help>
         <valueHelp>
           <format>ipv6</format>
           <description>Next-hop IPv6 router</description>
         </valueHelp>
         <constraint>
           <validator name="ipv6-address"/>
         </constraint>
       </properties>
       <children>
         #include <include/generic-disable-node.xml.i>
         #include <include/static/static-route-distance.xml.i>
         #include <include/static/static-route-interface.xml.i>
         #include <include/static/static-route-vrf.xml.i>
       </children>
     </tagNode>
   </children>
 </tagNode>
 <!-- include end -->