diff --git a/interface-definitions/interfaces-virtual-ethernet.xml.in b/interface-definitions/interfaces-virtual-ethernet.xml.in
index 3b78b3637..d52e9ef80 100644
--- a/interface-definitions/interfaces-virtual-ethernet.xml.in
+++ b/interface-definitions/interfaces-virtual-ethernet.xml.in
@@ -1,36 +1,43 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <node name="interfaces">
     <children>
       <tagNode name="virtual-ethernet" owner="${vyos_conf_scripts_dir}/interfaces-virtual-ethernet.py">
         <properties>
-          <help>Virtual Ethernet Interface (veth)</help>
+          <help>Virtual Ethernet (veth) Interface</help>
           <priority>300</priority>
           <constraint>
             <regex>veth[0-9]+</regex>
           </constraint>
           <constraintErrorMessage>Virutal Ethernet interface must be named vethN</constraintErrorMessage>
           <valueHelp>
             <format>vethN</format>
             <description>Virtual Ethernet interface name</description>
           </valueHelp>
         </properties>
         <children>
           #include <include/interface/address-ipv4-ipv6-dhcp.xml.i>
           #include <include/interface/description.xml.i>
           #include <include/interface/disable.xml.i>
           #include <include/interface/vrf.xml.i>
           <leafNode name="peer-name">
             <properties>
               <help>Virtual ethernet peer interface name</help>
+              <completionHelp>
+                <path>interfaces virtual-ethernet</path>
+              </completionHelp>
+              <valueHelp>
+                <format>txt</format>
+                <description>Name of peer interface</description>
+              </valueHelp>
               <constraint>
                 <regex>veth[0-9]+</regex>
               </constraint>
               <constraintErrorMessage>Virutal Ethernet interface must be named vethN</constraintErrorMessage>
             </properties>
           </leafNode>
         </children>
       </tagNode>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/src/conf_mode/interfaces-virtual-ethernet.py b/src/conf_mode/interfaces-virtual-ethernet.py
index 91609ded9..b1819233c 100755
--- a/src/conf_mode/interfaces-virtual-ethernet.py
+++ b/src/conf_mode/interfaces-virtual-ethernet.py
@@ -1,97 +1,98 @@
 #!/usr/bin/env python3
 #
 # Copyright (C) 2022 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from sys import exit
 
 from netifaces import interfaces
 from vyos import ConfigError
 from vyos import airbag
 from vyos.config import Config
 from vyos.configdict import get_interface_dict
 from vyos.configverify import verify_address
 from vyos.configverify import verify_bridge_delete
 from vyos.configverify import verify_vrf
 from vyos.ifconfig import VethIf
 
 airbag.enable()
 
-
 def get_config(config=None):
     """
     Retrive CLI config as dictionary. Dictionary can never be empty, as at
     least the interface name will be added or a deleted flag
     """
     if config:
         conf = config
     else:
         conf = Config()
     base = ['interfaces', 'virtual-ethernet']
     ifname, veth = get_interface_dict(conf, base)
 
-    veth_dict = conf.get_config_dict(base, key_mangling=('-', '_'),
-                                     get_first_key=True,
-                                     no_tag_node_value_mangle=True)
-    veth['config_dict'] = veth_dict
+    # We need to know all other veth related interfaces as veth requires a 1:1
+    # mapping for the peer-names. The Linux kernel automatically creates both
+    # interfaces, the local one and the peer-name, but VyOS also needs a peer
+    # interfaces configrued on the CLI so we can assign proper IP addresses etc.
+    veth['other_interfaces'] = conf.get_config_dict(base, key_mangling=('-', '_'),
+                                     get_first_key=True, no_tag_node_value_mangle=True)
 
     return veth
 
 
 def verify(veth):
     if 'deleted' in veth:
         verify_bridge_delete(veth)
         return None
 
     verify_vrf(veth)
     verify_address(veth)
 
     if 'peer_name' not in veth:
-        raise ConfigError(
-            f'Remote peer name must be set for \"{veth["ifname"]}\"!')
+        raise ConfigError(f'Remote peer name must be set for "{veth["ifname"]}"!')
 
-    if veth['peer_name'] not in veth['config_dict'].keys():
-        raise ConfigError(
-            f'Interface \"{veth["peer_name"]}\" is not configured!')
+    if veth['peer_name'] not in veth['other_interfaces']:
+        peer_name = veth['peer_name']
+        ifname = veth['ifname']
+        raise ConfigError(f'Used peer-name "{peer_name}" on interface "{ifname}" ' \
+                          'is not configured!')
 
     return None
 
 
 def generate(peth):
     return None
 
-
 def apply(veth):
     # Check if the Veth interface already exists
     if 'rebuild_required' in veth or 'deleted' in veth:
         if veth['ifname'] in interfaces():
             p = VethIf(veth['ifname'])
             p.remove()
 
     if 'deleted' not in veth:
         p = VethIf(**veth)
         p.update(veth)
 
     return None
 
 
 if __name__ == '__main__':
     try:
         c = get_config()
         verify(c)
         generate(c)
         apply(c)
     except ConfigError as e:
         print(e)
         exit(1)