diff --git a/manifests/profile/base/neutron/linuxbridge.pp b/manifests/profile/base/neutron/linuxbridge.pp
new file mode 100644
index 000000000..9f4899ad3
--- /dev/null
+++ b/manifests/profile/base/neutron/linuxbridge.pp
@@ -0,0 +1,20 @@
+# == Class: tripleo::profile::base::neutron::linuxbridge
+#
+# Neutron linuxbridge agent profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templatee
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::neutron::linuxbridge(
+    $step           = hiera('step'),
+) {
+    include ::tripleo::profile::base::neutron
+
+    if $step >= 5 {
+        include ::neutron::agents::ml2::linuxbridge
+    }
+}