diff --git a/tasks/main.yml b/tasks/main.yml
index 51d81a8a257abbb69972093b24cb0a56eb56b2c5..7dbe11f2478fd1652e47327615e9952daaaf72e6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -24,7 +24,20 @@
       mode='644'
     with_flattened:
       - '{{ admins }}'
-      - '{{ jailusers }}'
+      - '{{ jailusers|default([]) }}'
+
+  - name: "a1"
+    shell: ls ~/.ansible/hostvars
+    become: no
+    register: fact_files
+    failed_when: false
+    changed_when: false
+    ignore_errors: true
+
+  - include: more.yml
+    with_items: '{{ fact_files.stdout_lines|default([]) }}'
+    loop_control:
+      loop_var: inventory_name
 
   - name: 'Remember that this role had been run'
     set_fact: role_commonconnect_completed=true
diff --git a/tasks/more.yml b/tasks/more.yml
new file mode 100644
index 0000000000000000000000000000000000000000..bdd26540bc554313b18b6d9bf3d24202858a3d8f
--- /dev/null
+++ b/tasks/more.yml
@@ -0,0 +1,17 @@
+---
+# file: roles/commonconnect/tasks/more.yml
+
+- name: "Read facts"
+  shell: cat ~/.ansible/hostvars/{{ inventory_name }}
+  become: no
+  register: result_facts
+
+- set_fact: facts="{{ result_facts.stdout | from_json }}"
+
+- name: "Add Hosts to Hostfile"
+  lineinfile:
+    dest='/etc/hosts'
+    regexp='.* {{ item }}$'
+    line='{{ facts[item].static_ipv4 }} {{ item }}'
+    state=present
+  with_items: '{{ facts }}'