diff --git a/op-mode-definitions/show-arp.xml b/op-mode-definitions/show-arp.xml
index 7256bef61..92c231c6f 100644
--- a/op-mode-definitions/show-arp.xml
+++ b/op-mode-definitions/show-arp.xml
@@ -1,27 +1,25 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
     <node name="arp">
       <properties>
         <help>Show Address Resolution Protocol (ARP) information</help>
       </properties>
       <command>/usr/sbin/arp -e -n</command>
       <children>
         <tagNode name="interface">
           <properties>
             <help>Show Address Resolution Protocol (ARP) cache for specified interface</help>
             <completionHelp>
-              <script>${vyatta_sbindir}/vyatta-interfaces.pl --show ethernet</script>
-              <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bridge</script>
-              <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bonding</script>
+              <script>${vyos_completion_dir}/list_interfaces.py -b</script>
             </completionHelp>
           </properties>
           <command>/usr/sbin/arp -e -n -i '$4'</command>
         </tagNode>
       </children>
     </node>
 
     </children>
   </node>
 </interfaceDefinition>
diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml
index 0d80de86e..a3241951a 100644
--- a/op-mode-definitions/show-bridge.xml
+++ b/op-mode-definitions/show-bridge.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="show">
     <children>
       <leafNode name="bridge">
         <properties>
           <help>Show bridging information</help>
         </properties>
         <command>/sbin/brctl show</command>
       </leafNode>
       <tagNode name="bridge">
         <properties>
           <help>Show bridge information for a given bridge interface</help>
           <completionHelp>
-            <script>${vyatta_sbindir}/vyatta-interfaces.pl --show bridge</script>
+            <script>${vyos_completion_dir}/list_interfaces.py --type bridge</script>
           </completionHelp>
         </properties>
         <command>/sbin/brctl show '$3'</command>
         <children>
           <leafNode name="macs">
             <properties>
               <help>Show bridge Media Access Control (MAC) address table</help>
             </properties>
             <command>/sbin/brctl showmacs '$3'</command>
           </leafNode>
           <leafNode name="spanning-tree">
             <properties>
               <help>Show bridge spanning tree information</help>
             </properties>
             <command>/sbin/brctl showstp '$3'</command>
           </leafNode>
         </children>
     </tagNode>
 
     </children>
   </node>
 </interfaceDefinition>