diff --git a/roles/monitoring_engine/tasks/main.yml b/roles/monitoring_engine/tasks/main.yml
index e0f5ba21f2fe41af0c6ea247c88db63bfb08e6b2..7bd61b905127f19f94d5b400f29b9d716fa559f6 100644
--- a/roles/monitoring_engine/tasks/main.yml
+++ b/roles/monitoring_engine/tasks/main.yml
@@ -14,6 +14,11 @@
   yum: name={{ item.name }} state=latest enablerepo={{ item.repo }}
   with_items: nagios_plugins
   
+- name: Install Nagios UMD plugins
+  yum: name={{ item.name }} state=latest
+  with_items: nagios_plugins_umd
+  when: nagios_plugins_umd is defined
+
 - name: Copy nagios.cfg file
   template: src=nagios.cfg.j2
             dest=/etc/nagios/nagios.cfg
diff --git a/roles/monitoring_engine/templates/ncg.conf.j2 b/roles/monitoring_engine/templates/ncg.conf.j2
index 19652d0eeb3c92c98de83f1096afe31ea2814fb0..b5674e45757117b1a9d4e63a0555ad27c3c51ca3 100644
--- a/roles/monitoring_engine/templates/ncg.conf.j2
+++ b/roles/monitoring_engine/templates/ncg.conf.j2
@@ -37,7 +37,7 @@ BACKUP_INSTANCE = {{ backup_instance }}
     INCLUDE_EMPTY_HOSTS = {{ include_empty_hosts }}
     ENABLE_NOTIFICATIONS = {{ enable_notifications }}
     CHECK_HOSTS = {{ check_hosts }}
-    TENANT = {{ tenant }}
+    TENANT = {{ tenant_name }}
   </Nagios>
 </NCG::ConfigGen>