diff --git a/.puppet/hieradata/common.yaml b/.puppet/hieradata/common.yaml
index 675ec581..78700b12 100644
--- a/.puppet/hieradata/common.yaml
+++ b/.puppet/hieradata/common.yaml
@@ -1,17 +1,19 @@
 ---
-icinga::icingaweb2::listen_ip:          "%{ipaddress_eth1}"
+# node::ipaddress is specified in `node/{::fqdn}.yaml`
+#
+icinga::icingaweb2::listen_ip:          "%{lookup('node::ipaddress')}"
 icinga::icingaweb2::fqdn:               "%{fqdn}"
 icinga::icinga2::node_name:             "%{fqdn}"
 
-graphite::carbon::listen_ip:            "%{ipaddress_eth1}"
+graphite::carbon::listen_ip:            "%{lookup('node::ipaddress')}"
 graphite::carbon::listen_port:          "2003"
-graphite::web::listen_ip:               "%{ipaddress_eth1}"
+graphite::web::listen_ip:               "%{lookup('node::ipaddress')}"
 graphite::web::listen_port:             "8003"
 
-influxdb::server::listen_ip:            "%{ipaddress_eth1}"
+influxdb::server::listen_ip:            "%{lookup('node::ipaddress')}"
 influxdb::server::listen_port:          "8086"
 
-grafana::server::listen_ip:             "%{ipaddress_eth1}"
+grafana::server::listen_ip:             "%{lookup('node::ipaddress')}"
 grafana::server::listen_port:           "8004"
 
 elastic::elasticsearch::listen_ip:      "localhost"
@@ -19,12 +21,12 @@ elastic::elasticsearch::listen_port:    "9200"
 elastic::kibana::listen_ip:             "localhost"
 elastic::kibana::listen_port:           "5601"
 
-graylog::gelf::listen_ip:               "%{ipaddress_eth1}"
+graylog::gelf::listen_ip:               "%{lookup('node::ipaddress')}"
 graylog::gelf::listen_port:             "12201"
-graylog::web::listen_ip:                "%{ipaddress_eth1}"
-graylog::web::listen_port:               "9000"
+graylog::web::listen_ip:                "%{lookup('node::ipaddress')}"
+graylog::web::listen_port:              "9000"
 
-#dashing::server::listen_ip:             "%{::ipaddress_eth1}"
+#dashing::server::listen_ip:             "%{lookup('node::ipaddress')}"
 #dashing::server::listen_port:           "8005"
 
 # Repos
diff --git a/.puppet/hieradata/node/icinga2-elastic.vagrant.demo.icinga.com.yaml b/.puppet/hieradata/node/icinga2-elastic.vagrant.demo.icinga.com.yaml
new file mode 100644
index 00000000..901d2d66
--- /dev/null
+++ b/.puppet/hieradata/node/icinga2-elastic.vagrant.demo.icinga.com.yaml
@@ -0,0 +1,2 @@
+node::ipaddress:        "192.168.33.7"
+
diff --git a/.puppet/hieradata/node/icinga2-graylog.vagrant.demo.icinga.com.yaml b/.puppet/hieradata/node/icinga2-graylog.vagrant.demo.icinga.com.yaml
new file mode 100644
index 00000000..71595244
--- /dev/null
+++ b/.puppet/hieradata/node/icinga2-graylog.vagrant.demo.icinga.com.yaml
@@ -0,0 +1 @@
+node::ipaddress:        "192.168.33.6"
diff --git a/.puppet/hieradata/node/icinga2-influxdb.vagrant.demo.icinga.com.yaml b/.puppet/hieradata/node/icinga2-influxdb.vagrant.demo.icinga.com.yaml
new file mode 100644
index 00000000..1a1735d3
--- /dev/null
+++ b/.puppet/hieradata/node/icinga2-influxdb.vagrant.demo.icinga.com.yaml
@@ -0,0 +1 @@
+node::ipaddress:        "192.168.33.8"
diff --git a/.puppet/hieradata/node/icinga2-master1.vagrant.demo.icinga.com.yaml b/.puppet/hieradata/node/icinga2-master1.vagrant.demo.icinga.com.yaml
index d6540ad0..30709a99 100644
--- a/.puppet/hieradata/node/icinga2-master1.vagrant.demo.icinga.com.yaml
+++ b/.puppet/hieradata/node/icinga2-master1.vagrant.demo.icinga.com.yaml
@@ -1,3 +1,5 @@
+node::ipaddress:        "192.168.33.101"
+
 icinga::icinga2::zone_name:             "master"
 icinga::icinga2::zones:
   master:
diff --git a/.puppet/hieradata/node/icinga2-satellite1.vagrant.demo.icinga.com.yaml b/.puppet/hieradata/node/icinga2-satellite1.vagrant.demo.icinga.com.yaml
index 551b9c39..c83f0504 100644
--- a/.puppet/hieradata/node/icinga2-satellite1.vagrant.demo.icinga.com.yaml
+++ b/.puppet/hieradata/node/icinga2-satellite1.vagrant.demo.icinga.com.yaml
@@ -1,3 +1,5 @@
+node::ipaddress:        "192.168.33.102"
+
 icinga::icinga2::zone_name:             "satellite"
 icinga::icinga2::zones:
   master:
diff --git a/.puppet/hieradata/node/icinga2.vagrant.demo.icinga.com.yaml b/.puppet/hieradata/node/icinga2.vagrant.demo.icinga.com.yaml
new file mode 100644
index 00000000..8e3b2b3e
--- /dev/null
+++ b/.puppet/hieradata/node/icinga2.vagrant.demo.icinga.com.yaml
@@ -0,0 +1 @@
+node::ipaddress:        "192.168.33.5"
diff --git a/distributed/Vagrantfile.nodes b/distributed/Vagrantfile.nodes
index 361cb00f..e9024e63 100644
--- a/distributed/Vagrantfile.nodes
+++ b/distributed/Vagrantfile.nodes
@@ -17,7 +17,7 @@ nodes = {
     :box_libvirt    => 'centos/7',
     :mac            => '020027001000',
     :net            => 'vagrant.demo.icinga.com',
-    :hostonly       => '192.168.33.101',
+    :hostonly       => '192.168.33.101', # keep in sync with hieradata
     :memory         => '1024',
     :cpus           => '2',
     :forwarded	    => {
@@ -32,7 +32,7 @@ nodes = {
     :box_libvirt    => 'centos/7',
     :mac            => '020027002000',
     :net            => 'vagrant.demo.icinga.com',
-    :hostonly       => '192.168.33.102',
+    :hostonly       => '192.168.33.102', # keep in sync with hieradata
     :memory         => '1024',
     :cpus           => '2',
     :forwarded	    => {
diff --git a/elastic/Vagrantfile.nodes b/elastic/Vagrantfile.nodes
index ac1fbdd8..e882453a 100644
--- a/elastic/Vagrantfile.nodes
+++ b/elastic/Vagrantfile.nodes
@@ -13,7 +13,7 @@ nodes = {
     :box_parallels  => 'bento/centos-7.4',
     :box_libvirt    => 'centos/7',
     :net            => 'vagrant.demo.icinga.com',
-    :hostonly       => '192.168.33.7',
+    :hostonly       => '192.168.33.7', # keep in sync with hieradata
     :memory         => '2048',
     :cpus           => '2',
     :mac            => '020027000900',
diff --git a/graylog/Vagrantfile.nodes b/graylog/Vagrantfile.nodes
index 8d17095b..fe9611b4 100644
--- a/graylog/Vagrantfile.nodes
+++ b/graylog/Vagrantfile.nodes
@@ -13,7 +13,7 @@ nodes = {
     :box_parallels  => 'bento/centos-7.4',
     :box_libvirt    => 'centos/7',
     :net            => 'vagrant.demo.icinga.com',
-    :hostonly       => '192.168.33.6',
+    :hostonly       => '192.168.33.6', # keep in sync with hieradata
     :memory         => '2048',
     :cpus           => '2',
     :mac            => '020027000600',
diff --git a/influxdb/Vagrantfile.nodes b/influxdb/Vagrantfile.nodes
index b044b1e8..cd43c868 100644
--- a/influxdb/Vagrantfile.nodes
+++ b/influxdb/Vagrantfile.nodes
@@ -13,7 +13,7 @@ nodes = {
     :box_parallels  => 'bento/centos-7.4',
     :box_libvirt    => 'centos/7',
     :net            => 'vagrant.demo.icinga.com',
-    :hostonly       => '192.168.33.8',
+    :hostonly       => '192.168.33.8', # keep in sync with hieradata
     :memory         => '2048',
     :cpus           => '2',
     :mac            => '020027000199',
diff --git a/standalone/Vagrantfile.nodes b/standalone/Vagrantfile.nodes
index daec146e..67039a67 100644
--- a/standalone/Vagrantfile.nodes
+++ b/standalone/Vagrantfile.nodes
@@ -13,7 +13,7 @@ nodes = {
     :box_parallels  => 'bento/centos-7.4',
     :box_libvirt    => 'centos/7',
     :net            => 'vagrant.demo.icinga.com',
-    :hostonly       => '192.168.33.5',
+    :hostonly       => '192.168.33.5', # keep in sync with hieradata
     :memory         => '2048',
     :cpus           => '2',
     :mac            => '020027000500',