diff --git a/reclass/storage/system/physical_control_cluster.yml b/reclass/storage/system/physical_control_cluster.yml
index 2d27058..813b0e5 100644
--- a/reclass/storage/system/physical_control_cluster.yml
+++ b/reclass/storage/system/physical_control_cluster.yml
@@ -3,6 +3,19 @@
     infra_compute_node01_hostname: kvm01
     infra_compute_node02_hostname: kvm02
     infra_compute_node03_hostname: kvm03
+
+    infra_compute_node01_deploy_address: ${_param:infra_compute_node01_address}
+    infra_compute_node02_deploy_address: ${_param:infra_compute_node02_address}
+    infra_compute_node03_deploy_address: ${_param:infra_compute_node03_address}
+
+    infra_compute_node01_storage_address: ${_param:infra_compute_node01_address}
+    infra_compute_node02_storage_address: ${_param:infra_compute_node02_address}
+    infra_compute_node03_storage_address: ${_param:infra_compute_node03_address}
+
+    infra_compute_node01_public_address: ${_param:infra_compute_node01_address}
+    infra_compute_node02_public_address: ${_param:infra_compute_node02_address}
+    infra_compute_node03_public_address: ${_param:infra_compute_node03_address}
+
   reclass:
     storage:
       node:
@@ -15,6 +28,9 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node01_address}
+            deploy_address: ${_param:infra_compute_node01_deploy_address}
+            public_address: ${_param:infra_compute_node01_public_address}
+            storage_address: ${_param:infra_compute_node01_storage_address}
         infra_compute_node02:
           name: ${_param:infra_compute_node02_hostname}
           domain: ${_param:cluster_domain}
@@ -24,6 +40,9 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node02_address}
+            deploy_address: ${_param:infra_compute_node02_deploy_address}
+            public_address: ${_param:infra_compute_node02_public_address}
+            storage_address: ${_param:infra_compute_node02_storage_address}
         infra_compute_node03:
           name: ${_param:infra_compute_node03_hostname}
           domain: ${_param:cluster_domain}
@@ -33,3 +52,6 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node03_address}
+            deploy_address: ${_param:infra_compute_node03_deploy_address}
+            public_address: ${_param:infra_compute_node03_public_address}
+            storage_address: ${_param:infra_compute_node03_storage_address}
diff --git a/reclass/storage/system/physical_control_full.yml b/reclass/storage/system/physical_control_full.yml
index d1dc5c8..d3dc46f 100644
--- a/reclass/storage/system/physical_control_full.yml
+++ b/reclass/storage/system/physical_control_full.yml
@@ -9,6 +9,37 @@
     infra_compute_node07_hostname: kvm07
     infra_compute_node08_hostname: kvm08
     infra_compute_node09_hostname: kvm09
+
+    infra_compute_node01_deploy_address: ${_param:infra_compute_node01_address}
+    infra_compute_node02_deploy_address: ${_param:infra_compute_node02_address}
+    infra_compute_node03_deploy_address: ${_param:infra_compute_node03_address}
+    infra_compute_node04_deploy_address: ${_param:infra_compute_node04_address}
+    infra_compute_node05_deploy_address: ${_param:infra_compute_node05_address}
+    infra_compute_node06_deploy_address: ${_param:infra_compute_node06_address}
+    infra_compute_node07_deploy_address: ${_param:infra_compute_node07_address}
+    infra_compute_node08_deploy_address: ${_param:infra_compute_node08_address}
+    infra_compute_node09_deploy_address: ${_param:infra_compute_node09_address}
+
+    infra_compute_node01_storage_address: ${_param:infra_compute_node01_address}
+    infra_compute_node02_storage_address: ${_param:infra_compute_node02_address}
+    infra_compute_node03_storage_address: ${_param:infra_compute_node03_address}
+    infra_compute_node04_storage_address: ${_param:infra_compute_node04_address}
+    infra_compute_node05_storage_address: ${_param:infra_compute_node05_address}
+    infra_compute_node06_storage_address: ${_param:infra_compute_node06_address}
+    infra_compute_node07_storage_address: ${_param:infra_compute_node07_address}
+    infra_compute_node08_storage_address: ${_param:infra_compute_node08_address}
+    infra_compute_node09_storage_address: ${_param:infra_compute_node09_address}
+
+    infra_compute_node01_public_address: ${_param:infra_compute_node01_address}
+    infra_compute_node02_public_address: ${_param:infra_compute_node02_address}
+    infra_compute_node03_public_address: ${_param:infra_compute_node03_address}
+    infra_compute_node04_public_address: ${_param:infra_compute_node04_address}
+    infra_compute_node05_public_address: ${_param:infra_compute_node05_address}
+    infra_compute_node06_public_address: ${_param:infra_compute_node06_address}
+    infra_compute_node07_public_address: ${_param:infra_compute_node07_address}
+    infra_compute_node08_public_address: ${_param:infra_compute_node08_address}
+    infra_compute_node09_public_address: ${_param:infra_compute_node09_address}
+
   reclass:
     storage:
       node:
@@ -22,6 +53,8 @@
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node01_address}
             deploy_address: ${_param:infra_compute_node01_deploy_address}
+            public_address: ${_param:infra_compute_node01_public_address}
+            storage_address: ${_param:infra_compute_node01_storage_address}
         infra_compute_node02:
           name: ${_param:infra_compute_node02_hostname}
           domain: ${_param:cluster_domain}
@@ -32,6 +65,8 @@
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node02_address}
             deploy_address: ${_param:infra_compute_node02_deploy_address}
+            public_address: ${_param:infra_compute_node02_public_address}
+            storage_address: ${_param:infra_compute_node02_storage_address}
         infra_compute_node03:
           name: ${_param:infra_compute_node03_hostname}
           domain: ${_param:cluster_domain}
@@ -42,6 +77,8 @@
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node03_address}
             deploy_address: ${_param:infra_compute_node03_deploy_address}
+            public_address: ${_param:infra_compute_node03_public_address}
+            storage_address: ${_param:infra_compute_node03_storage_address}
         infra_compute_node04:
           name: ${_param:infra_compute_node04_hostname}
           domain: ${_param:cluster_domain}
@@ -52,6 +89,8 @@
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node04_address}
             deploy_address: ${_param:infra_compute_node04_deploy_address}
+            public_address: ${_param:infra_compute_node04_public_address}
+            storage_address: ${_param:infra_compute_node04_storage_address}
         infra_compute_node05:
           name: ${_param:infra_compute_node05_hostname}
           domain: ${_param:cluster_domain}
@@ -62,6 +101,8 @@
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node05_address}
             deploy_address: ${_param:infra_compute_node05_deploy_address}
+            public_address: ${_param:infra_compute_node05_public_address}
+            storage_address: ${_param:infra_compute_node05_storage_address}
         infra_compute_node06:
           name: ${_param:infra_compute_node06_hostname}
           domain: ${_param:cluster_domain}
@@ -72,6 +113,8 @@
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node06_address}
             deploy_address: ${_param:infra_compute_node06_deploy_address}
+            public_address: ${_param:infra_compute_node06_public_address}
+            storage_address: ${_param:infra_compute_node06_storage_address}
         infra_compute_node07:
           name: ${_param:infra_compute_node07_hostname}
           domain: ${_param:cluster_domain}
@@ -82,6 +125,8 @@
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node07_address}
             deploy_address: ${_param:infra_compute_node07_deploy_address}
+            public_address: ${_param:infra_compute_node07_public_address}
+            storage_address: ${_param:infra_compute_node07_storage_address}
         infra_compute_node08:
           name: ${_param:infra_compute_node08_hostname}
           domain: ${_param:cluster_domain}
@@ -92,6 +137,8 @@
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node08_address}
             deploy_address: ${_param:infra_compute_node08_deploy_address}
+            public_address: ${_param:infra_compute_node08_public_address}
+            storage_address: ${_param:infra_compute_node08_storage_address}
         infra_compute_node09:
           name: ${_param:infra_compute_node09_hostname}
           domain: ${_param:cluster_domain}
@@ -102,3 +149,5 @@
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node09_address}
             deploy_address: ${_param:infra_compute_node09_deploy_address}
+            public_address: ${_param:infra_compute_node09_public_address}
+            storage_address: ${_param:infra_compute_node09_storage_address}
\ No newline at end of file
diff --git a/reclass/storage/system/physical_control_single.yml b/reclass/storage/system/physical_control_single.yml
index 4d23169..e4d8f10 100644
--- a/reclass/storage/system/physical_control_single.yml
+++ b/reclass/storage/system/physical_control_single.yml
@@ -1,6 +1,9 @@
 parameters:
   _param:
     infra_compute_node01_hostname: kvm01
+    infra_compute_node01_deploy_address: ${_param:infra_compute_node01_address}
+    infra_compute_node01_storage_address: ${_param:infra_compute_node01_address}
+    infra_compute_node01_public_address: ${_param:infra_compute_node01_address}
   reclass:
     storage:
       node:
@@ -13,4 +16,6 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
             single_address: ${_param:infra_compute_node01_address}
-
+            deploy_address: ${_param:infra_compute_node01_deploy_address}
+            public_address: ${_param:infra_compute_node01_public_address}
+            storage_address: ${_param:infra_compute_node01_storage_address}
\ No newline at end of file