diff --git a/ansible-5/playbooks/update_hosts.yaml b/ansible-5/playbooks/update_hosts.yaml
index a194810..d81170e 100644
--- a/ansible-5/playbooks/update_hosts.yaml
+++ b/ansible-5/playbooks/update_hosts.yaml
@@ -27,43 +27,43 @@
       become: true
     - role: rsyslog
       become: true
-    - role: datadog.datadog
-      become: true
-      when: ansible_architecture != 'armv7l'
-      datadog_checks:
-        reboot_required:
-          init_config:
-          instances:
-            -
-        oom_kill:
-          init_config:
-          instances:
-            -
-        systemd:
-          - unit_names:
-              - cron.service
-              - k3s.service
-              - named.service
-              - ssh.servce
-              - apt-daily-upgrade.timer
+#    - role: datadog.datadog
+#      become: true
+#      when: ansible_architecture != 'armv7l'
+#      datadog_checks:
+#        reboot_required:
+#          init_config:
+#          instances:
+#            -
+#        oom_kill:
+#          init_config:
+#          instances:
+#            -
+#        systemd:
+#          - unit_names:
+#              - cron.service
+#              - k3s.service
+#              - named.service
+#              - ssh.servce
+#              - apt-daily-upgrade.timer
+#
+#        bind9:
+#          init_config:
+#          instances:
+#            - url: "http://ns01:8053/"
+#            - url: "http://ns02:8053/"
+#
+#      datadog_integration:
+#        datadog-reboot_required:
+#          action: install
+#          version: 1.0.0
+#          third_party: true
+#        datadog-bind9:
+#          action: install
+#          version: 1.0.0
+#          third_party: true
 
-        bind9:
-          init_config:
-          instances:
-            - url: "http://ns01:8053/"
-            - url: "http://ns02:8053/"
-
-      datadog_integration:
-        datadog-reboot_required:
-          action: install
-          version: 1.0.0
-          third_party: true
-        datadog-bind9:
-          action: install
-          version: 1.0.0
-          third_party: true
-
-    - role: datadog.datadog
-      become: true
-      datadog_agent_flavor: datadog-iot-agent
-      when: ansible_architecture == 'armv7l'
+#    - role: datadog.datadog
+#      become: true
+#      datadog_agent_flavor: datadog-iot-agent
+#      when: ansible_architecture == 'armv7l'
diff --git a/ansible-5/roles/common/defaults/main.yaml b/ansible-5/roles/common/defaults/main.yaml
index d721b73..ac20804 100644
--- a/ansible-5/roles/common/defaults/main.yaml
+++ b/ansible-5/roles/common/defaults/main.yaml
@@ -16,8 +16,15 @@ machines:
 
       remove: []
 
+  cubox-m:
+    fstab:
+      add: []
+
+      remove: []
+
   home:
     fstab:
       add: []
 
       remove: []
+
diff --git a/ansible-5/roles/common/tasks/apply_updates.yml b/ansible-5/roles/common/tasks/apply_updates.yml
index 045f7a6..b4e8887 100644
--- a/ansible-5/roles/common/tasks/apply_updates.yml
+++ b/ansible-5/roles/common/tasks/apply_updates.yml
@@ -6,6 +6,7 @@
     upgrade: dist
     update_cache: yes
     cache_valid_time: 3600
+    autoremove: yes
   when: ansible_os_family == "Debian"
 
 - name: check for reboot required
diff --git a/ansible-5/roles/common/tasks/install_tools.yml b/ansible-5/roles/common/tasks/install_tools.yml
index c174a04..d28c668 100644
--- a/ansible-5/roles/common/tasks/install_tools.yml
+++ b/ansible-5/roles/common/tasks/install_tools.yml
@@ -1,14 +1,18 @@
 ---
+- name: update apt cache
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
 
 - name: Install required packages
   apt:
     name: "{{ item }}"
-    update_cache: yes
-    cache_valid_time: 3600
     state: latest
   with_items:
     - htop
     - attr
     - python3-psutil
     - acl
+    - bind9-dnsutils
+    - iputils-ping
   when: ansible_os_family == "Debian"
diff --git a/ansible-5/roles/common/tasks/main.yml b/ansible-5/roles/common/tasks/main.yml
index 046cbb0..70c2aed 100644
--- a/ansible-5/roles/common/tasks/main.yml
+++ b/ansible-5/roles/common/tasks/main.yml
@@ -1,12 +1,16 @@
 ---
 
+
+- include_tasks: set_hostname.yml
+
 - include_tasks: install_tools.yml
 
 # update packages to latest
 - include_tasks: apply_updates.yml
 
-- name: update login screen
-  include_tasks: motd.yml
+#- name: update login screen
+#  include_tasks: motd.yml
 
 - name: update fstab
   include_tasks: update_fstab.yml
+
diff --git a/ansible-5/roles/common/tasks/set_hostname.yml b/ansible-5/roles/common/tasks/set_hostname.yml
new file mode 100644
index 0000000..bfc44bd
--- /dev/null
+++ b/ansible-5/roles/common/tasks/set_hostname.yml
@@ -0,0 +1,14 @@
+---
+#Try and setup correct hostnames
+
+- name: Set hostname to {{inventory_hostname}}
+  ansible.builtin.hostname:
+    name: "{{inventory_hostname}}"
+
+- name: Template a file to /etc/file.conf
+  ansible.builtin.template:
+    src: hosts.j2
+    dest: /etc/hosts
+    owner: root
+    group: root
+    mode: '0644'
diff --git a/ansible-5/roles/common/templates/hosts.j2 b/ansible-5/roles/common/templates/hosts.j2
new file mode 100644
index 0000000..10b279e
--- /dev/null
+++ b/ansible-5/roles/common/templates/hosts.j2
@@ -0,0 +1,9 @@
+127.0.0.1       localhost
+127.0.1.1       {{inventory_hostname}}
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+#fe00::0 ip6-localnet  #missing on debian?
+#ff00::0 ip6-mcastprefix #missing on debian?
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters