diff --git a/environments/services-docker/octavia.yaml b/environments/services-docker/octavia.yaml
index 64f2ccb3fd..fb4ad60ab4 100644
--- a/environments/services-docker/octavia.yaml
+++ b/environments/services-docker/octavia.yaml
@@ -6,7 +6,7 @@ resource_registry:
   OS::TripleO::Services::OctaviaDeploymentConfig: ../../docker/services/octavia/octavia-deployment-config.yaml
 
 parameter_defaults:
-    NeutronServicePlugins: "qos,router,trunk,lbaasv2"
+    NeutronServicePlugins: "qos,router,trunk"
     NeutronEnableForceMetadata: true
 
     # This flag enables internal generation of certificates for communication
diff --git a/environments/services/octavia.yaml b/environments/services/octavia.yaml
index 24c57b8c3c..720154acad 100644
--- a/environments/services/octavia.yaml
+++ b/environments/services/octavia.yaml
@@ -5,5 +5,5 @@ resource_registry:
   OS::TripleO::Services::OctaviaWorker: ../../puppet/services/octavia-worker.yaml
 
 parameter_defaults:
-    NeutronServicePlugins: "qos,router,trunk,lbaasv2"
+    NeutronServicePlugins: "qos,router,trunk"
     NeutronEnableForceMetadata: true
diff --git a/puppet/services/octavia-api.yaml b/puppet/services/octavia-api.yaml
index 0a5b1206d7..ad59566e20 100644
--- a/puppet/services/octavia-api.yaml
+++ b/puppet/services/octavia-api.yaml
@@ -117,5 +117,3 @@ outputs:
           octavia::db::mysql::allowed_hosts:
             - '%'
             - "%{hiera('mysql_bind_host')}"
-        neutron_api:
-          neutron::server::service_providers: ['LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default']
diff --git a/releasenotes/notes/remove-octavia-service-plugin-from-neutron-config-b923cca547d9dd52.yaml b/releasenotes/notes/remove-octavia-service-plugin-from-neutron-config-b923cca547d9dd52.yaml
new file mode 100644
index 0000000000..cec69adfcb
--- /dev/null
+++ b/releasenotes/notes/remove-octavia-service-plugin-from-neutron-config-b923cca547d9dd52.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Neutron no longer accesses octavia through a neutron service plugin.