diff --git a/handlers/main.yml b/handlers/main.yml
index 14afa7c..968bdd9 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -15,4 +15,9 @@
     port: 6556/tcp
     state: enabled
     permanent: yes
-    immediate: yes
\ No newline at end of file
+    immediate: yes
+
+- name: remove agent
+  file:
+    path: /tmp/check-mk-agent.rpm
+    state: absent
\ No newline at end of file
diff --git a/tasks/RedHat-register.yml b/tasks/RedHat-register.yml
index c4e0206..c9450d9 100644
--- a/tasks/RedHat-register.yml
+++ b/tasks/RedHat-register.yml
@@ -4,6 +4,7 @@
         cmk-update-agent register -H $(hostname -s) --user {{ cmk_username }} \
         --secret {{ cmk_secret }}
       changed_when: false
+      notify: remove agent
   rescue:
     - name: Gather facts of packages
       package_facts:
@@ -11,7 +12,7 @@
 
     - name: Ensure check_mk_agent installed (again)
       package:
-        name: "{{ cmk_rpm_agent }}{{ cmk_auth }}"
+        name: /tmp/check-mk-agent.rpm
         state: latest
         disable_gpg_check: true
       notify:
@@ -29,3 +30,4 @@
         --secret {{ cmk_secret }}
       changed_when: false
       when: "'check-mk-agent' in ansible_facts.packages"
+      notify: remove agent      
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index b4ad94b..4da799e 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -11,10 +11,18 @@
     manager: "auto"
 
 - name: Install check-mk-agent
-  block:    
+  block:
+
+- name: Install check-mk-agent
+  block:
+    - name: Download the agent from Server
+      get_url:
+        url: "{{ cmk_rpm_agent }}{{ cmk_auth }}"
+        dest: /tmp/check-mk-agent.rpm
+
     - name: Ensure check_mk_agent installed
       package:
-        name: "{{ cmk_rpm_agent }}{{ cmk_auth }}"
+        name: /tmp/check-mk-agent.rpm
         state: latest
         disable_gpg_check: true
       notify: