diff --git a/tasks/insights-client.yml b/tasks/insights-client.yml
index 717e38f..657678c 100644
--- a/tasks/insights-client.yml
+++ b/tasks/insights-client.yml
@@ -36,26 +36,51 @@
     insertafter: "#auto_update"
     line: auto_update={{ rhc_insights.autoupdate | d(true) | bool }}
 
-- name: Configure ansible host
+- name: Check ansible host in insights-client config
+  when:
+    - rhc_insights.ansible_host is defined
+    - not rhc_insights.ansible_host is none
+    - rhc_insights.ansible_host != omit
   lineinfile:
     path: "{{ __rhc_insights_conf }}"
-    regexp: "^ansible_host"
-    insertafter: "#ansible_host"
-    line: ansible_host={{ rhc_insights.ansible_host }}
-  register: __insights_ansible_host_configured
+    regexp: "^ansible_host="
+    state: "{{ 'present' if rhc_insights.ansible_host != __rhc_state_absent else 'absent' }}"
+    line: "{{ ('ansible_host='+rhc_insights.ansible_host) if rhc_insights.ansible_host != __rhc_state_absent }}"
+  check_mode: true
+  register: __insights_ansible_host_exists
+
+- name: Configure ansible host
   when:
     - rhc_insights.ansible_host is defined
     - not rhc_insights.ansible_host is none
     - rhc_insights.ansible_host != omit
+    - __insights_ansible_host_exists.changed
+  block:
+    - name: Update ansible host in insights-client config
+      lineinfile:
+        path: "{{ __rhc_insights_conf }}"
+        regexp: "^ansible_host"
+        insertafter: "#ansible_host"
+        line: ansible_host={{ rhc_insights.ansible_host }}
+    - name: Update ansible host in inventory
+      shell: insights-client --ansible-host={{ rhc_insights.ansible_host }} & wait
+      when: 
+        - rhc_insights.ansible_host != __rhc_state_absent
 
 - name: Remove ansible host
-  lineinfile:
-    path: "{{ __rhc_insights_conf }}"
-    regexp: "^ansible_host="
-    state: absent
   when:
     - rhc_insights.ansible_host is defined
     - rhc_insights.ansible_host == __rhc_state_absent
+    - __insights_ansible_host_exists.changed
+  block:
+    - name: Remove ansible host from insights-client config
+      lineinfile:
+        path: "{{ __rhc_insights_conf }}"
+        regexp: "^ansible_host="
+        state: absent
+    - name: Remove ansible host in inventory
+      shell: insights-client --ansible-host= & wait
+      register: __insights_ansible_host_removed
 
 - name: Register insights-client
   shell: insights-client --register & wait
@@ -76,7 +101,6 @@
     - >-
       __insights_tags_added is changed
       or __insights_tags_removed is changed
-      or __insights_ansible_host_configured is changed
   changed_when: true
 
 - name: Configure remediation