diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 110795c..7d69096 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -2,10 +2,11 @@
 ---
 ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPd/4fQV7CL8/KVwbo/phiV5UdXFBIDlkZ+ps8C7FeRf
 
+hostname: pi
+timezone: Europe/Copenhagen
+
 hdd_name: storage
 hdd_mount_point: "/opt/{{ hdd_name }}"
 
 ssd_name: pi-ssd
 ssd_mount_point: "/opt/{{ ssd_name }}"
-
-timezone: Europe/Copenhagen
diff --git a/roles/os_config/tasks/pkgs.yml b/roles/os_config/tasks/base.yml
similarity index 62%
rename from roles/os_config/tasks/pkgs.yml
rename to roles/os_config/tasks/base.yml
index c790d92..0289fb1 100644
--- a/roles/os_config/tasks/pkgs.yml
+++ b/roles/os_config/tasks/base.yml
@@ -1,5 +1,13 @@
 # vim: ft=yaml.ansible
 ---
+- name: Set hostname
+  hostname:
+    name: "{{ hostname }}"
+
+- name: Set timezone
+  timezone:
+    name: "{{ timezone }}"
+
 - name: Upgrade system packages
   apt:
     update_cache: true
@@ -12,7 +20,10 @@
   vars:
     pkgs:
       - apparmor
+      - curl
+      - git
       - haveged
       - needrestart
       - python3-pip
       - ufw
+      - unattended-upgrades
diff --git a/roles/os_config/tasks/main.yml b/roles/os_config/tasks/main.yml
index bc8a97f..bcfcda4 100644
--- a/roles/os_config/tasks/main.yml
+++ b/roles/os_config/tasks/main.yml
@@ -1,7 +1,7 @@
 # vim: ft=yaml.ansible
 ---
-- name: Configure system packages
-  import_tasks: pkgs.yml
+- name: Configure system base
+  import_tasks: base.yml
 
 - name: Configure updates
   import_tasks: updates.yml