diff --git a/installbox.yml b/installbox.yml
index 50718ec..27aeb82 100644
--- a/installbox.yml
+++ b/installbox.yml
@@ -8,7 +8,7 @@
   vars:
     if_lan: ""           #  ← interface name here, like:  ens3 or enp2s0"
     if_wan: "{{ ansible_default_ipv4.interface }}"
-    hostname: "{{ ansible_hostname }}"
+    hostname: "{{ ansible_hostname }}" # change this to not use the DNS-provided name
     ipaddr_lan: 192.168.0.10
     dhcp_range: 192.168.0.50,192.168.0.150,2h
     dhcp_list: "{{ lookup('sequence', 'start=50 end=150 format=192.168.0.%d', wantlist=True) }}"
@@ -34,3 +34,20 @@
     - tftp-netboot-installer
     - preseed-installer
 #    - installbox2kiosk    #  enable this to install kiosk automatically
+
+  post_tasks:
+    - name: make sure hostname is set correctly in /etc/hosts
+      replace:
+        path: /etc/hosts
+        regexp: '(127.0.1.1\s+){{ ansible_hostname }}(\s+.*)?$'
+        replace: '\1{{ hostname }}\2'
+
+    - name: make sure hostname is set correctly in /etc/hostname
+      replace:
+        path: /etc/hostname
+        regexp: '{{ ansible_hostname }}'
+        replace: '{{ hostname }}'
+
+    - name: set hostname
+      hostname:
+        name: "{{ hostname }}"
diff --git a/roles/preseed-installer/tasks/main.yml b/roles/preseed-installer/tasks/main.yml
index f5c12cf..72e1de6 100644
--- a/roles/preseed-installer/tasks/main.yml
+++ b/roles/preseed-installer/tasks/main.yml
@@ -10,10 +10,10 @@
     force: no
 
 - name: make the hostname resolvable from the LAN
-  replace:
-    dest: /etc/hosts
-    regexp: '(127.0.1.1\s+){{ hostname }}'
-    replace: '\1localhost\n{{ ipaddr_lan }}	{{ hostname }}'
+  lineinfile:
+    path: /etc/hosts
+    insertafter: '^127.0.1.1'
+    line: '{{ ipaddr_lan }}	{{ hostname }}'
 
 - name: add auto pxe boot entry to di-netboot-assistant
   blockinfile:
diff --git a/roles/up2date-debian/tasks/main.yml b/roles/up2date-debian/tasks/main.yml
index 85b734b..8cb8dcc 100644
--- a/roles/up2date-debian/tasks/main.yml
+++ b/roles/up2date-debian/tasks/main.yml
@@ -9,11 +9,9 @@
   apt:
     upgrade: dist
     autoremove: yes
+    autoclean: yes
 
-- name: install some packages
+- name: install etckeeper
   apt:
     name: etckeeper
     state: latest
-
-#- name: clean apt package cache
-#  command: apt clean