diff --git a/releasenotes/notes/fix-stevedore-entrypoints-8002ec7a5166c977.yaml b/releasenotes/notes/fix-stevedore-entrypoints-8002ec7a5166c977.yaml
new file mode 100644
index 00000000..2ebe6320
--- /dev/null
+++ b/releasenotes/notes/fix-stevedore-entrypoints-8002ec7a5166c977.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - os-vif plugins were previously incorrectly registered 
+    in both the setup.py and setup.cfg. All plugin registration
+    have been removed form the setup.py as they were not used
+    and may have blocked registration of out of tree plugins.
diff --git a/setup.py b/setup.py
index 148a23fc..73637574 100644
--- a/setup.py
+++ b/setup.py
@@ -27,17 +27,4 @@ except ImportError:
 
 setuptools.setup(
     setup_requires=['pbr'],
-    entry_points={
-        'os_vif.plugin': [
-            'bridge = os_vif._plugins.linux_bridge:LinuxBridgePlugin',
-            'iovisor = os_vif._plugins.iovisor:IovisorPlugin',
-            'ivs = os_vif._plugins.ivs:IvsPlugin',
-            'ivs_hybrid = os_vif._plugins.ivs_hybrid:IvsHybridPlugin',
-            'ovs = os_vif._plugins.ovs:OvsPlugin',
-            'ovs_hybrid = os_vif._plugins.ovs_hybrid:OvsHybridPlugin',
-            'mlnx = os_vif._plugins.mellanox:MellanoxDirectPlugin',
-            'midonet = os_vif._plugins.midonet:MidonetPlugin',
-            'vhostuser = os_vif._plugins.vhostuser:VhostuserPlugin',
-            'vrouter = os_vif._plugins.vrouter:VrouterPlugin',
-        ]},
     pbr=True)