diff --git a/neutron/client/service/octavia/cluster.yml b/neutron/client/service/octavia/cluster.yml
new file mode 100644
index 0000000..09191f2
--- /dev/null
+++ b/neutron/client/service/octavia/cluster.yml
@@ -0,0 +1,33 @@
+classes:
+- system.neutron.client.service.octavia
+
+parameters:
+  neutron:
+    client:
+      server:
+        octavia_identity:
+          endpoint_type: internalURL
+          network:
+            lb-mgmt-net:
+              port:
+                octavia-health-manager-listen-port-gtw01:
+                  fixed_ips:
+                    - ip_address: ${_param:octavia_health_manager_node01_address}
+                  device_owner: Octavia:health-mgr
+                  binding_host_id: ${_param:openstack_gateway_node01_hostname}
+                  security_groups:
+                    - lb-health-mgr-sec-grp
+                octavia-health-manager-listen-port-gtw02:
+                  fixed_ips:
+                    - ip_address: ${_param:octavia_health_manager_node02_address}
+                  device_owner: Octavia:health-mgr
+                  binding_host_id: ${_param:openstack_gateway_node02_hostname}
+                  security_groups:
+                    - lb-health-mgr-sec-grp
+                octavia-health-manager-listen-port-gtw03:
+                  fixed_ips:
+                    - ip_address: ${_param:octavia_health_manager_node03_address}
+                  device_owner: Octavia:health-mgr
+                  binding_host_id: ${_param:openstack_gateway_node03_hostname}
+                  security_groups:
+                    - lb-health-mgr-sec-grp
\ No newline at end of file
diff --git a/neutron/client/service/octavia.yml b/neutron/client/service/octavia/init.yml
similarity index 85%
rename from neutron/client/service/octavia.yml
rename to neutron/client/service/octavia/init.yml
index f9cc934..57b7b65 100644
--- a/neutron/client/service/octavia.yml
+++ b/neutron/client/service/octavia/init.yml
@@ -1,5 +1,3 @@
-classes:
-- service.neutron.client
 parameters:
   neutron:
     client:
@@ -16,14 +14,6 @@
                   allocation_pools:
                     - start: ${_param:octavia_lb_mgmt_allocation_pool_start}
                       end: ${_param:octavia_lb_mgmt_allocation_pool_end}
-              port:
-                octavia-health-manager-listen-port:
-                  fixed_ips:
-                    - ip_address: ${_param:octavia_hm_bind_ip}
-                  device_owner: Octavia:health-mgr
-                  binding_host_id: ${_param:openstack_gateway_node01_hostname}
-                  security_groups:
-                    - lb-health-mgr-sec-grp
           security_group:
             lb-mgmt-sec-grp:
               tenant: service
@@ -86,5 +76,5 @@
             profile: 'octavia_identity'
           list_octavia_hm_ports:
             mine_function: neutronng.list_ports
-            name: 'octavia-health-manager-listen-port'
+            device_owner: 'Octavia:health-mgr'
             profile: 'octavia_identity'
diff --git a/neutron/client/service/octavia/single.yml b/neutron/client/service/octavia/single.yml
new file mode 100644
index 0000000..b5b65ea
--- /dev/null
+++ b/neutron/client/service/octavia/single.yml
@@ -0,0 +1,19 @@
+classes:
+- system.neutron.client.service.octavia
+
+parameters:
+  neutron:
+    client:
+      server:
+        octavia_identity:
+          endpoint_type: internalURL
+          network:
+            lb-mgmt-net:
+              port:
+                octavia-health-manager-listen-port:
+                  fixed_ips:
+                    - ip_address: ${_param:octavia_health_manager_node01_address}
+                  device_owner: Octavia:health-mgr
+                  binding_host_id: ${_param:openstack_gateway_node01_hostname}
+                  security_groups:
+                    - lb-health-mgr-sec-grp