diff --git a/de/heat-templates/fragments/SrvInstancesBM.yaml b/de/heat-templates/fragments/SrvInstancesBM.yaml
index ab9fc36..46f8e68 100644
--- a/de/heat-templates/fragments/SrvInstancesBM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBM.yaml
@@ -66,7 +66,7 @@
             $node_metadata: { get_param: metadata }
             $host_interface: { get_param: host_interface }
             $private_floating_interface: { get_param: private_floating_interface }
-            $private_floating_network_cidr: { str_split: ['/', { get_param: private_floating_network_cidr }, 1] }
+            $private_floating_network_cidr: { get_param: private_floating_network_cidr }
             $private_floating_interface_ip: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
             $functions_override: { get_param: functions_override }
 
diff --git a/de/heat-templates/fragments/SrvInstancesVM.yaml b/de/heat-templates/fragments/SrvInstancesVM.yaml
index db06a95..5b1a681 100644
--- a/de/heat-templates/fragments/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVM.yaml
@@ -66,7 +66,7 @@
             $host_interface: { get_param: host_interface }
             $private_floating_interface: { get_param: private_floating_interface }
             $private_floating_interface_ip: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
-            $private_floating_network_cidr: { str_split: ['/', { get_param: private_floating_network_cidr }, 1] }
+            $private_floating_network_cidr: { get_param: private_floating_network_cidr }
             $functions_override: { get_param: functions_override }
 
   server:
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 0901dbe..1836047 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -7,7 +7,8 @@
 HOST_INTERFACE=$host_interface
 PUBLIC_INTERFACE=$private_floating_interface
 PUBLIC_INTERFACE_IP=$private_floating_interface_ip
-PUBLIC_INTERFACE_NETMASK=$private_floating_network_cidr
+PUBLIC_INTERFACE_CIDR=$private_floating_network_cidr
+PUBLIC_INTERFACE_NETMASK=$(echo ${PUBLIC_INTERFACE_CIDR} | cut -d'/' -f2)
 NODE_TYPE=$node_type
 UCP_MASTER_HOST=$ucp_master_host
 NODE_METADATA='$node_metadata'