diff --git a/manifests/profile/base/neutron/agents/lbaas.pp b/manifests/profile/base/neutron/agents/lbaas.pp
new file mode 100644
index 000000000..eb6f1a647
--- /dev/null
+++ b/manifests/profile/base/neutron/agents/lbaas.pp
@@ -0,0 +1,41 @@
+# Copyright 2018 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::base::neutron::lbaas
+#
+# Neutron LBaaS Agent profile for TripleO
+#
+# === Parameters
+#
+# [*manage_haproxy_package*]
+#   (Optional) Whether to manage the haproxy package.
+#   Defaults to hiera('manage_haproxy_package', false)
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::neutron::agents::lbaas(
+  $manage_haproxy_package = hiera('manage_haproxy_package', false),
+  $step                   = Integer(hiera('step')),
+) {
+
+  #LBaaS Driver needs to be run @ $step>=5 as the neutron service needs to already be active which is run @ $step==4
+  if $step >= 5 {
+    class {'::neutron::agents::lbaas':
+      manage_haproxy_package => $manage_haproxy_package
+    }
+  }
+}
diff --git a/manifests/profile/base/neutron/lbaas.pp b/manifests/profile/base/neutron/lbaas.pp
index 8bce0b189..c716e9e8f 100644
--- a/manifests/profile/base/neutron/lbaas.pp
+++ b/manifests/profile/base/neutron/lbaas.pp
@@ -14,31 +14,22 @@
 #
 # == Class: tripleo::profile::base::neutron::lbaas
 #
-# Neutron LBaaS Agent profile for tripleo
+# Neutron LBaaS Service plugin profile for TripleO
 #
 # === Parameters
 #
-# [*manage_haproxy_package*]
-#   (Optional) Whether to manage the haproxy package.
-#   Defaults to hiera('manage_haproxy_package', false)
-#
 # [*step*]
 #   (Optional) The current step in deployment. See tripleo-heat-templates
 #   for more details.
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::lbaas(
-  $manage_haproxy_package = hiera('manage_haproxy_package', false),
   $step                   = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::neutron
 
-  #LBaaS Driver needs to be run @ $step>=5 as the neutron service needs to already be active which is run @ $step==4
-  if $step >= 5 {
+  if $step >= 4 {
     include ::neutron::services::lbaas
-    class {'::neutron::agents::lbaas':
-      manage_haproxy_package => $manage_haproxy_package
-    }
   }
 }
diff --git a/releasenotes/notes/split-up-neutron-lbaas-f0c248220ed872cd.yaml b/releasenotes/notes/split-up-neutron-lbaas-f0c248220ed872cd.yaml
new file mode 100644
index 000000000..3a126475a
--- /dev/null
+++ b/releasenotes/notes/split-up-neutron-lbaas-f0c248220ed872cd.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - Split up neutron-lbaas service plugin and agent
+
+upgrade:
+  - Class tripleo::profile::base::neutron::lbaas will only configure the
+    Neutron LBaaS service plugin from now on. Use class
+    tripleo::profile::base::neutron::agents::lbaas to configure the Neutron
+    LBaaS agent.