diff --git a/tasks/RedHat-register.yml b/tasks/RedHat-register.yml
index 51299d7..1770a8f 100644
--- a/tasks/RedHat-register.yml
+++ b/tasks/RedHat-register.yml
@@ -1,5 +1,27 @@
-- name: Register with CheckMK Update Server
-  shell: |
-    cmk-update-agent register -H $(hostname -s) --user {{ cmk_username }} \
-    --secret {{ cmk_secret }}
-  changed_when: false
+- block:
+    - name: Register with CheckMK Update Server
+      shell: |
+        cmk-update-agent register -H $(hostname -s) --user {{ cmk_username }} \
+        --secret {{ cmk_secret }}
+      changed_when: false
+  rescue:
+    - name: Gather facts of packages
+      package_facts:
+        manager: "auto"
+        
+    - name: Ensure check_mk_agent installed (again)
+      package:
+        name: "{{ cmk_rpm_agent }}{{ cmk_auth }}"
+        state: latest
+        disable_gpg_check: true
+      notify:
+        - restart xinetd
+        - ensure firewall open
+      when: "'check-mk-agent' not in ansible_facts.packages"
+    
+    - name: Register with CheckMK Update Server (retry)
+      shell: |
+        cmk-update-agent register -H $(hostname -s) --user {{ cmk_username }} \
+        --secret {{ cmk_secret }}
+      changed_when: false
+      when: "'check-mk-agent' in ansible_facts.packages"