diff --git a/neutron/map.jinja b/neutron/map.jinja
index 9b6b38a..e8becfc 100644
--- a/neutron/map.jinja
+++ b/neutron/map.jinja
@@ -105,7 +105,7 @@
         'pkgs_bgpvpn': ['python-networking-bgpvpn'],
         'pkgs_bagpipe': ['python-networking-bagpipe'],
         'services': ['neutron-server'],
-        'services_ovn': ['ovn-central'],
+        'services_ovn': ['openvswitch-switch', 'ovn-central'],
         'notification': {},
         'dpdk': false,
         'cors': {},
@@ -130,7 +130,7 @@
         'pkgs_bgpvpn': ['python-networking-bgpvpn'],
         'pkgs_bagpipe': ['python-networking-bagpipe'],
         'services': ['neutron-server'],
-        'services_ovn': ['ovn-central'],
+        'services_ovn': ['openvswitch', 'ovn-central'],
         'notification': {},
         'dpdk': false,
         'cors': {},
diff --git a/neutron/server.sls b/neutron/server.sls
index fa115d2..13f8e3e 100644
--- a/neutron/server.sls
+++ b/neutron/server.sls
@@ -227,11 +227,6 @@
 
 {%- if not grains.get('noservices', False) %}
 
-remote_ovsdb_access:
-  cmd.run:
-  - name: "ovs-appctl -t ovsdb-server ovsdb-server/add-remote
-  ptcp:6640:{{ server.controller_vip }}"
-
 open_ovs_port:
   iptables.append:
     - table: filter
@@ -251,6 +246,11 @@
   - require:
     - pkg: ovn_packages
 
+remote_ovsdb_access:
+  cmd.run:
+  - name: "ovs-appctl -t ovsdb-server ovsdb-server/add-remote
+  ptcp:6640:{{ server.controller_vip }}"
+
 {%- if grains.os_family == 'Debian' %}
 /etc/default/ovn-central:
   file.managed: