diff --git a/common/files/keys/lars@aurora.pub b/common/files/keys/lars@aurora.pub
new file mode 100644
index 0000000000000000000000000000000000000000..38a18f55581f94d8a89137a00598fac79c9ab6c0
--- /dev/null
+++ b/common/files/keys/lars@aurora.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEwG9nY4C3knP7ABJMsyqu9ij+tH+sL/ekGFlydugE5/ lars@aurora
diff --git a/common/handlers/main.yml b/common/handlers/main.yml
index eb3211063d1ee1d0ccb305b670dec446aaeb1330..d4c2e73b9a1ddd686eedbbdc2346e924f8e2c32f 100644
--- a/common/handlers/main.yml
+++ b/common/handlers/main.yml
@@ -18,3 +18,6 @@
 
 - name: update initramfs
   command: update-initramfs -u
+
+- name: update timezone
+  command: dpkg-reconfigure --frontend noninteractive tzdata
diff --git a/common/tasks/filesystem.yml b/common/tasks/filesystem.yml
index 10fd8e3780abe70a8e49606e714c3c87fe3a2ecb..36988c60c9ff8801ba77d055ead462c3a0b491af 100644
--- a/common/tasks/filesystem.yml
+++ b/common/tasks/filesystem.yml
@@ -2,7 +2,7 @@
 # file: roles/common/tasks/filesystem.yml
 
 - name: ensure /tmp is a tmpfs
-  mount: name=/tmp src=tmpfs fstype=tmpfs opts=nosuid,rw
+  mount: name=/tmp src=tmpfs fstype=tmpfs opts=nosuid,rw state=mounted
   tags:
     - config
     - mount
diff --git a/common/tasks/ntpd.yml b/common/tasks/ntpd.yml
index 16039fa430684ad93e82d85592d7effcc4e74313..389884040562656f9886038624a0657a8c8febba 100644
--- a/common/tasks/ntpd.yml
+++ b/common/tasks/ntpd.yml
@@ -1,6 +1,14 @@
 ---
 # file: roles/common/tasks/ntp.yml
 
+- name: ensure correct timezone setting
+  copy: src=timezone dest=/etc/timezone owner=root group=root mode=0644
+  notify:
+    - update timezone
+  tags:
+    - config
+    - ntpd
+
 - name: ensure ntpd is installed
   apt:  name=ntp state=latest
   tags: