diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 49e2c96..342eb00 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -10,18 +10,21 @@
     msg: "{{ hostvars[inventory_hostname].ansible_default_ipv4.macaddress }}"
   tags:
     - raspi
+    - sw
 
 - name: store MAC address
   set_fact:
     my_macaddr: "{{ hostvars[inventory_hostname].ansible_default_ipv4.macaddress }}"
   tags:
     - raspi
+    - sw
 
 - name: store system configuration
   set_fact:
     myconfig: "{{ macaddrs[my_macaddr] }}"
   tags:
     - raspi
+    - sw
 
 - name: set hostname
   shell: "raspi-config nonint do_hostname {{ myconfig.hostname }}"
diff --git a/roles/common/vars/main.yml b/roles/common/vars/main.yml
index b9e521b..0c19be7 100644
--- a/roles/common/vars/main.yml
+++ b/roles/common/vars/main.yml
@@ -38,7 +38,9 @@ macaddrs:
         enable_onewire: False
         enable_rgpio: False
         extra_software:
-          - w3m
+          - "w3m"
+          - "irssi"
+          - "screen"
 
 ### Users that must be present on the system
 create_users: