diff --git a/defaults/main.yml b/defaults/main.yml
index 66437e4..cc1e4ee 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -39,3 +39,5 @@ cmk_fresh_install: false
 # CheckMK is already installed. 
 # Breaks idempotence but allows role to be used to force upgrade agents.
 cmk_force_install: false
+
+cmk_guest_ip: "{{ ansible_host }}"
diff --git a/tasks/host-management.yml b/tasks/host-management.yml
index d74370e..2f0b5b1 100644
--- a/tasks/host-management.yml
+++ b/tasks/host-management.yml
@@ -8,7 +8,7 @@
         "attributes": {
         "tag_criticality": "prod",
         "tag_agent": "cmk-agent",
-        "ipaddress": "{{ ansible_host }}"
+        "ipaddress": "{{ cmk_host_ip }}"
       },
       "folder": "{{ cmk_folder | default('Unsorted') }}",
       "hostname": "{{ instance_name | default(inventory_hostname) }}"