diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 38aac73..00c79bf 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -14,6 +14,7 @@
   - import_tasks: software/packages_utilities.yml
 
   # Perform remaining tasks:
+  - import_tasks; system_setup/hosts.yml
   - import_tasks: system_setup/clock.yml
   # - import_tasks: system_setup/cron.yml
   - import_tasks: system_setup/locale.yml
diff --git a/roles/base/tasks/system_setup/hosts.yml b/roles/base/tasks/system_setup/hosts.yml
new file mode 100644
index 0000000..b24b0d3
--- /dev/null
+++ b/roles/base/tasks/system_setup/hosts.yml
@@ -0,0 +1,9 @@
+- name: system setup | /etc/hosts | populate
+  lineinfile:
+    path: "/etc/hosts"
+    line: "{{ item.ip }}  {{ item.fqdn }}"
+    mode: '0644'
+    owner: 'root'
+    group: 'root'
+  loop:
+    - { ip: '192.168.1.240', fqdn: 'gitlab.social.my-wan.de'}
\ No newline at end of file