diff --git a/manifests/neutron.pp b/manifests/neutron.pp
index 426b0e6b0..c6d77cb53 100644
--- a/manifests/neutron.pp
+++ b/manifests/neutron.pp
@@ -123,8 +123,11 @@ class openstack_integration::neutron (
   }
 
   case $driver {
-    'openvswitch', 'ovn': {
-      include openstack_integration::ovs
+    'openvswitch': {
+      require openstack_integration::ovs
+    }
+    'ovn': {
+      require openstack_integration::ovn
     }
     'linuxbridge': {
       exec { 'create_dummy_iface':
diff --git a/manifests/octavia.pp b/manifests/octavia.pp
index 0bd242a15..1c4ba25ce 100644
--- a/manifests/octavia.pp
+++ b/manifests/octavia.pp
@@ -134,6 +134,7 @@ class openstack_integration::octavia (
       ovn_sb_certificate => '/etc/octavia/ovnsb-cert.pem',
       ovn_sb_ca_cert     => '/etc/octavia/switchcacert.pem',
     }
+    require openstack_integration::ovn
   } else{
     $enabled_provider_drivers = undef
     $enabled_provider_agents = undef
diff --git a/manifests/ovn.pp b/manifests/ovn.pp
index 3ce12ee90..0f0421199 100644
--- a/manifests/ovn.pp
+++ b/manifests/ovn.pp
@@ -6,6 +6,8 @@ class openstack_integration::ovn(
   include openstack_integration::config
   include openstack_integration::params
 
+  require openstack_integration::ovs
+
   if $::openstack_integration::config::ssl {
     class { 'vswitch::pki::cacert': }
     vswitch::pki::cert { ['ovnnb', 'ovnsb', 'ovncontroller']: }