diff --git a/playbooks/tasks/server/ipaddress.yaml b/playbooks/tasks/server/ipaddress.yaml
index a40543a..50349a3 100644
--- a/playbooks/tasks/server/ipaddress.yaml
+++ b/playbooks/tasks/server/ipaddress.yaml
@@ -18,6 +18,12 @@
         SET
           lastSeen = '{{ scan_address.ipaddress.lastSeen }}'
 
+            {% if scan_address.ipaddress.hostname | default('') != '' %},
+
+            hostname = '{{ scan_address.ipaddress.hostname }}'
+
+            {% endif %}
+
           {% if scan_address.ipaddress.mac | default('') != '' %},
 
             mac = '{{ scan_address.ipaddress.mac }}'
@@ -36,6 +42,7 @@
             subnetId,
             ip_addr,
             description,
+            {% if scan_address.ipaddress.hostname | default('') != '' %}hostname,{% endif %}
             {% if scan_address.ipaddress.mac | default('') != '' %}mac,{% endif %}
             note,
             lastSeen
@@ -46,6 +53,12 @@
             '{{ scan_address.ipaddress.ip | ip2ipam }}',
             '-- autodiscovered --',
 
+            {% if scan_address.ipaddress.hostname | default('') != '' %}
+
+              '{{ scan_address.ipaddress.hostname }}'
+
+            {% endif %}
+
             {% if scan_address.ipaddress.mac | default('') != '' %}
 
               '{{ scan_address.ipaddress.mac }}',