diff --git a/roles/thinlinc_server/files/tl-setup.local.sh b/roles/thinlinc_server/files/tl-setup.local.sh
index 118350e..acd3b39 100755
--- a/roles/thinlinc_server/files/tl-setup.local.sh
+++ b/roles/thinlinc_server/files/tl-setup.local.sh
@@ -3,22 +3,24 @@
 set -eu
 
 cat <<EOF > /root/tl-setup.answer
-install-pygtk=yes
-email-address=adm@foo.sh
-setup-selinux=yes
-setup-nearest=no
-server-type=master
-setup-firewall=no
-install-python-ldap=no
-setup-apparmor=no
-missing-answer=ask
-install-nfs=no
-setup-thinlocal=no
-install-sshd=no
-tlwebadm-password=$(dd if=/dev/urandom count=1 2> /dev/null | base64 | tail -n 1 | cut -c 1-20)
 accept-eula=yes
+server-type=master
 migrate-conf=old
 install-required-libs=yes
+install-nfs=no
+install-sshd=no
+install-gtk=yes
+install-python-ldap=no
+agent-hostname-choice=manual
+manual-agent-hostname=$(hostname -f)
+email-address=adm@foo.sh
+tlwebadm-password=$(dd if=/dev/urandom count=1 2> /dev/null | base64 | tail -n 1 | cut -c 1-20)
+setup-thinlocal=no
+setup-nearest=no
+setup-firewall=no
+setup-selinux=yes
+setup-apparmor=no
+missing-answer=abort
 EOF
 
 /opt/thinlinc/sbin/tl-setup -a /root/tl-setup.answer
diff --git a/roles/thinlinc_server/tasks/main.yml b/roles/thinlinc_server/tasks/main.yml
index 6455425..19eca7e 100644
--- a/roles/thinlinc_server/tasks/main.yml
+++ b/roles/thinlinc_server/tasks/main.yml
@@ -48,13 +48,6 @@
     regexp: "^show_intro=.*"
     line: show_intro=false
 
-- name: Configure vsmagent hostname
-  ansible.builtin.lineinfile:
-    path: /opt/thinlinc/etc/conf.d/vsmagent.hconf
-    regexp: "^agent_hostname=.*"
-    line: "agent_hostname={{ inventory_hostname }}"
-  notify: Restart vsmagent
-
 - name: Copy private key
   ansible.builtin.copy:
     dest: /opt/thinlinc/etc/tlwebaccess/server.key