diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 6af97df..00ad945 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -11,12 +11,18 @@
     manager: "auto"
 
 - name: Install check-mk-agent
-  block:       
+  block:
+    - name: Check if check-mk-agent is present on server
+      stat:
+        path: /tmp/check-mk-agent.rpm
+      register: cmkrpm
+
     - name: Download the agent from Server
       get_url:
         url: "{{ cmk_rpm_agent }}{{ cmk_auth }}"
         dest: /tmp/check-mk-agent.rpm
         validate_certs: false
+      when: not cmkrpm.stat.exists
         
     - name: Ensure check_mk_agent installed
       command: /usr/bin/yum install --nogpgcheck -y /tmp/check-mk-agent.rpm
diff --git a/tasks/host-management.yml b/tasks/host-management.yml
index 32d9afc..d74370e 100644
--- a/tasks/host-management.yml
+++ b/tasks/host-management.yml
@@ -11,7 +11,7 @@
         "ipaddress": "{{ ansible_host }}"
       },
       "folder": "{{ cmk_folder | default('Unsorted') }}",
-      "hostname": "{{ inventory_hostname }}"
+      "hostname": "{{ instance_name | default(inventory_hostname) }}"
       }
     body_format: raw
     return_content: yes
@@ -33,7 +33,7 @@
   uri:
     method: POST
     url: "{{ cmk_omd_protocol }}://{{ cmk_omd_host }}/{{ cmk_omd_site }}/check_mk/webapi.py?action=discover_services&mode=refresh{{ cmk_auth }}"
-    body: 'request={"hostname":"{{ inventory_hostname }}"}'
+    body: 'request={"hostname":"{{ instance_name | default(inventory_hostname) }}"}'
     body_format: raw
     status_code: 200
     validate_certs: no