diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml
index 9e051730ec..207d89764c 100644
--- a/deployment/octavia/octavia-api-container-puppet.yaml
+++ b/deployment/octavia/octavia-api-container-puppet.yaml
@@ -229,6 +229,9 @@ outputs:
           list_join:
             - "\n"
             - - "include tripleo::profile::base::octavia::api"
+              - if:
+                - {get_param: OctaviaEnableDriverAgent}
+                - "include octavia::driver_agent"
               - {get_attr: [OctaviaProviderConfig, role_data, step_config]}
               - {get_attr: [MySQLClient, role_data, step_config]}
         config_image: {get_param: ContainerOctaviaConfigImage}
diff --git a/deployment/octavia/providers/ovn-provider-config.yaml b/deployment/octavia/providers/ovn-provider-config.yaml
index c1514ced71..b2eed4b978 100644
--- a/deployment/octavia/providers/ovn-provider-config.yaml
+++ b/deployment/octavia/providers/ovn-provider-config.yaml
@@ -67,6 +67,9 @@ outputs:
     value:
       config_settings:
         map_merge:
+          - if:
+              - is_ovn_in_neutron_mechanism_driver
+              - octavia::driver_agent::enabled_provider_agents: 'ovn'
           - if:
               - octavia_provider_ovn_protocol_set
               - tripleo::profile::base::octavia::provider::ovn::protocol: {get_param: OctaviaOvnProviderProtocol}