diff --git a/cinder_controller/write_conf.sh b/cinder_controller/write_conf.sh
index 925d08a..dd65bba 100755
--- a/cinder_controller/write_conf.sh
+++ b/cinder_controller/write_conf.sh
@@ -37,3 +37,5 @@ volume_driver = cinder.volume.drivers.rbd.RBDDriver
 rbd_ceph_conf = /etc/ceph/ceph.conf
 
 EOF
+
+echo "172.23.59.101        merlin.hpc.rug.nl" >> /etc/hosts
diff --git a/cinder_storage/write_conf.sh b/cinder_storage/write_conf.sh
index a70f3b7..ffb4cd1 100755
--- a/cinder_storage/write_conf.sh
+++ b/cinder_storage/write_conf.sh
@@ -38,3 +38,5 @@ volume_driver = cinder.volume.drivers.rbd.RBDDriver
 rbd_ceph_conf = /etc/ceph/ceph.conf
 
 EOF
+
+echo "172.23.59.101        merlin.hpc.rug.nl" >> /etc/hosts
diff --git a/glance/write_conf.sh b/glance/write_conf.sh
index 345f17b..3506002 100755
--- a/glance/write_conf.sh
+++ b/glance/write_conf.sh
@@ -79,3 +79,6 @@ rabbit_password = $RABBIT_PASSWORD
 flavor = keystone
 
 EOF
+
+echo "172.23.59.101        merlin.hpc.rug.nl" >> /etc/hosts
+
diff --git a/heat/write_conf.sh b/heat/write_conf.sh
index d70ef40..4e877c1 100755
--- a/heat/write_conf.sh
+++ b/heat/write_conf.sh
@@ -33,3 +33,5 @@ password = $HEAT_PASSWORD
 user_domain_name = Default
 
 EOF
+
+echo "172.23.59.101        merlin.hpc.rug.nl" >> /etc/hosts
diff --git a/neutron_controller/write_conf.sh b/neutron_controller/write_conf.sh
index f913fee..91fb726 100755
--- a/neutron_controller/write_conf.sh
+++ b/neutron_controller/write_conf.sh
@@ -98,3 +98,5 @@ interface_driver = linuxbridge
 external_network_bridge =
 
 EOF
+
+echo "172.23.59.101        merlin.hpc.rug.nl" >> /etc/hosts
diff --git a/neutron_controller_ovs/write_conf.sh b/neutron_controller_ovs/write_conf.sh
index f913fee..91fb726 100755
--- a/neutron_controller_ovs/write_conf.sh
+++ b/neutron_controller_ovs/write_conf.sh
@@ -98,3 +98,5 @@ interface_driver = linuxbridge
 external_network_bridge =
 
 EOF
+
+echo "172.23.59.101        merlin.hpc.rug.nl" >> /etc/hosts
diff --git a/nova_compute/write_conf.sh b/nova_compute/write_conf.sh
index 5d52e4c..6a535af 100755
--- a/nova_compute/write_conf.sh
+++ b/nova_compute/write_conf.sh
@@ -315,3 +315,5 @@ interface_driver = linuxbridge
 external_network_bridge =
 
 EOF
+
+echo "172.23.59.101        merlin.hpc.rug.nl" >> /etc/hosts
diff --git a/nova_service/write_conf.sh b/nova_service/write_conf.sh
index 6bb1944..4bbb712 100755
--- a/nova_service/write_conf.sh
+++ b/nova_service/write_conf.sh
@@ -74,3 +74,5 @@ password = $NOVA_PLACEMENT_PASSWORD
 os_region_name = RegionOne
 
 EOF
+
+echo "172.23.59.101        merlin.hpc.rug.nl" >> /etc/hosts