diff --git a/roles/thinlinc_server/files/tl-setup.local.sh b/roles/thinlinc_server/files/tl-setup.local.sh
index c657426..118350e 100755
--- a/roles/thinlinc_server/files/tl-setup.local.sh
+++ b/roles/thinlinc_server/files/tl-setup.local.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -eu
+
 cat <<EOF > /root/tl-setup.answer
 install-pygtk=yes
 email-address=adm@foo.sh
diff --git a/roles/thinlinc_server/tasks/main.yml b/roles/thinlinc_server/tasks/main.yml
index 554e527..76a2b43 100644
--- a/roles/thinlinc_server/tasks/main.yml
+++ b/roles/thinlinc_server/tasks/main.yml
@@ -5,6 +5,7 @@
     state: installed
   with_items:
     - gtk3
+    - librsvg2
     - polkit
     - python3
     - python3-gobject
@@ -19,16 +20,8 @@
 
 - name: Install packages
   ansible.builtin.package:
-    name: "{{ item }}"
+    name: "thinlinc-server"
     state: installed
-  with_items:
-    - thinlinc-tladm
-    - thinlinc-tlmisc
-    - thinlinc-tlmisc-libs
-    - thinlinc-tlprinter
-    - thinlinc-vnc-server
-    - thinlinc-vsm
-    - thinlinc-webaccess
 
 - name: Run ThinLinc setup
   ansible.builtin.script: