diff --git a/roles/monitoring_engine/defaults/main.yml b/roles/monitoring_engine/defaults/main.yml
index cfd54316af1f939ad8d2d61e4e84a2349f8c2b07..cd618cfc02b84c51410d3c4af34d33c31a8479b9 100644
--- a/roles/monitoring_engine/defaults/main.yml
+++ b/roles/monitoring_engine/defaults/main.yml
@@ -6,7 +6,7 @@ nagios_components:
 
 ## NCG vars ##
 nagios_server: localhost
-nagios_admin_email: contact@nagiosadmin.localhost
+nagios_admin_email: "contact@nagiosadmin.localhost"
 vo: ops
 enable_unicore_probes: "0"
 probes_type: local
diff --git a/roles/monitoring_engine/tasks/main.yml b/roles/monitoring_engine/tasks/main.yml
index 0dd7dedd631f0bc9600947dff48c88e2301010a2..80535a0fd710867199e04ad213e2d70742fbfe3b 100644
--- a/roles/monitoring_engine/tasks/main.yml
+++ b/roles/monitoring_engine/tasks/main.yml
@@ -91,6 +91,33 @@
   when: enable_unicore_probes is defined and enable_unicore_probes == "1"
   tags: config
 
+- name: Copy ucc.config file for unicore
+  template: src=ucc.config.j2
+            dest=/etc/nagios/unicore/ucc.config
+            owner=nagios group=nagios mode=0400
+  when: enable_unicore_probes is defined and enable_unicore_probes == "1"
+  tags: config
+
+- name: Copy scripts for unicore credentials
+  template: src={{ item }}.j2
+            dest=/usr/local/bin/{{ item }} 
+            owner=root group=root mode=0744
+  with_items:
+    - unicore_jks.sh
+    - unicore_ks.sh
+    - unicore_ts.sh
+  when: enable_unicore_probes is defined and enable_unicore_probes == "1"
+  tags: config
+
+- name: Execute scripts for unicore credentials
+  command: /usr/local/bin/{{ item }}
+  with_items:
+    - unicore_jks.sh
+    - unicore_ks.sh
+    - unicore_ts.sh
+  when: enable_unicore_probes is defined and enable_unicore_probes == "1"
+  tags: config
+
 - name: Create vomses dir
   file: path=/etc/vomses 
         state=directory 
diff --git a/roles/monitoring_engine/templates/ucc.config.j2 b/roles/monitoring_engine/templates/ucc.config.j2
new file mode 100644
index 0000000000000000000000000000000000000000..195b99b75ff9f6d37a47483152346e2f4aa0a3bf
--- /dev/null
+++ b/roles/monitoring_engine/templates/ucc.config.j2
@@ -0,0 +1 @@
+{% include "private_files/" + ansible_fqdn + "/templates/ucc.config.j2"  %}
\ No newline at end of file
diff --git a/roles/monitoring_engine/templates/unicore_jks.sh.j2 b/roles/monitoring_engine/templates/unicore_jks.sh.j2
new file mode 100644
index 0000000000000000000000000000000000000000..55dbf659546351a0cedfec696bba2b4c37184a1e
--- /dev/null
+++ b/roles/monitoring_engine/templates/unicore_jks.sh.j2
@@ -0,0 +1 @@
+{% include "private_files/" + ansible_fqdn + "/templates/unicore_jks.sh.j2"  %}
\ No newline at end of file
diff --git a/roles/monitoring_engine/templates/unicore_ks.sh.j2 b/roles/monitoring_engine/templates/unicore_ks.sh.j2
new file mode 100644
index 0000000000000000000000000000000000000000..866df1f198184181e12179d3811f057767960915
--- /dev/null
+++ b/roles/monitoring_engine/templates/unicore_ks.sh.j2
@@ -0,0 +1 @@
+{% include "private_files/" + ansible_fqdn + "/templates/unicore_ks.sh.j2"  %}
\ No newline at end of file
diff --git a/roles/monitoring_engine/templates/unicore_ts.sh.j2 b/roles/monitoring_engine/templates/unicore_ts.sh.j2
new file mode 100644
index 0000000000000000000000000000000000000000..4e2ce0bf7c522b2c6253d1566b57c4cc77b17c4a
--- /dev/null
+++ b/roles/monitoring_engine/templates/unicore_ts.sh.j2
@@ -0,0 +1 @@
+{% include "private_files/" + ansible_fqdn + "/templates/unicore_ts.sh.j2"  %}
\ No newline at end of file