diff --git a/bundles/icinga2/files/icinga2/hosts_template.conf b/bundles/icinga2/files/icinga2/hosts_template.conf
index c28d8e4..ac56ef2 100644
--- a/bundles/icinga2/files/icinga2/hosts_template.conf
+++ b/bundles/icinga2/files/icinga2/hosts_template.conf
@@ -23,16 +23,16 @@ object Host "${rnode.name}" {
     vars.notification.mail = true
 }
 
-% if rnode._attributes.get('ipmi'):
-object Host "IPMI ${rnode.name}" {
+% if rnode.ipmi_hostname:
+object Host "${rnode.name} IPMI" {
     import "generic-host"
 
-    address = "${rnode._attributes['ipmi']['hostname']}"
+    address = "${rnode.ipmi_hostname}"
 
     vars.location = "${rnode.metadata.get('location', 'unknown')}"
     vars.os = "ipmi"
 
-    vars.pretty_name = "IPMI ${rnode.metadata.get('icinga_options/pretty_name', rnode.metadata.get('hostname'))}"
+    vars.pretty_name = "${rnode.metadata.get('icinga_options/pretty_name', rnode.metadata.get('hostname'))} IPMI"
     vars.show_on_statuspage = false
 
     vars.period = "${rnode.metadata.get('icinga_options/period', '24x7')}"