diff --git a/src/etc/inc/plugins.inc.d/core.inc b/src/etc/inc/plugins.inc.d/core.inc
index 4b0a3103a..6f3e1b124 100644
--- a/src/etc/inc/plugins.inc.d/core.inc
+++ b/src/etc/inc/plugins.inc.d/core.inc
@@ -129,7 +129,6 @@ function core_devices()
     $devices[] = array('pattern' => '_stf', 'volatile' => true);
     $devices[] = array('pattern' => '_wlan', 'volatile' => true);
     $devices[] = array('pattern' => 'vlan', 'volatile' => true);
-    $devices[] = array('pattern' => 'vxlan', 'volatile' => true);
 
     return $devices;
 }
diff --git a/src/etc/inc/plugins.inc.d/vxlan.inc b/src/etc/inc/plugins.inc.d/vxlan.inc
index 39642fc29..cc5f35a8e 100644
--- a/src/etc/inc/plugins.inc.d/vxlan.inc
+++ b/src/etc/inc/plugins.inc.d/vxlan.inc
@@ -34,6 +34,14 @@
      );
  }
 
+function vxlan_devices()
+{
+    $devices = array();
+
+    $devices[] = array('pattern' => '^vxlan', 'volatile' => true, 'configurable' => false);
+
+    return $devices;
+}
 
 function vxlan_configure_interface($verbose=false)
 {
@@ -64,7 +72,7 @@ function vxlan_configure_interface($verbose=false)
             // skip when interface address is not assigned (yet)
             continue;
         }
-        $device_name = "vxlan.{$vxlan->deviceId}" ;
+        $device_name = "vxlan{$vxlan->deviceId}";
         $configured_devices[] = $device_name;
         $current_settings = array(
             "vxlanid" => null,