diff --git a/.kitchen.yml b/.kitchen.yml
index a618ad3..97abb23 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,5 +1,4 @@
 ---
-
 # Installer:
 # #!/bin/bash
 # apt-get update
@@ -93,7 +92,7 @@ platforms:
     provisioner:
       attributes:
         extra_vars:
-          vnc_testvar: "testz"
+          vnc_testvar: testz
 #  - name: tightvnc-gnome
 #    attributes:
 #      extra_vars:
@@ -125,7 +124,7 @@ suites:
         vnc_desktop: mate
         vnc_server: tigervnc
         default_vnc_users:
-          - username: 'ec2-user'
+          - username: ec2-user
             # usergroup: 'admin'
             # port 5901 is 1
             vnc_num: 1
diff --git a/defaults/main.yml b/defaults/main.yml
index 8810d26..ecca662 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -35,12 +35,12 @@ vnc_desktop: gnome
 # vnc_server: tigervnc
 
 # Used with older vnc servers.
-vnc_server_options: "-geometry 1920x1200 -localhost"
+vnc_server_options: -geometry 1920x1200 -localhost
 
 # Used by this role on newer tiger vnc servers.
 vnc_config_options:
-  - "geometry=1920x1200"
-  - "localhost"
+  - geometry=1920x1200
+  - localhost
 
 ### Should the role generate and enable per-user systemd services for VNC desktops?
 ### This variable refers to a previous implementation of per-user systemd, before the newer TigerVNC update, where standard systemd is used.
diff --git a/handlers/main.yml b/handlers/main.yml
index 101ebec..570a17e 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,7 +4,7 @@
     msg:
       - "***********************"
       - " "
-      - "You should reboot this server {{ inventory_hostname }}, as a one-time action, if it hasn't ever been rebooted."
+      - You should reboot this server {{ inventory_hostname }}, as a one-time action, if it hasn't ever been rebooted.
       - " "
       - "***********************"
   when:
@@ -12,6 +12,7 @@
 
 - name: Reboot once
   ansible.builtin.shell: reboot  # noqa command-instead-of-shell
+  changed_when: true
   args:
     chdir: /
   when:
diff --git a/tasks/autostart-perusersystemd.yml b/tasks/autostart-perusersystemd.yml
index 0930974..1d09e96 100644
--- a/tasks/autostart-perusersystemd.yml
+++ b/tasks/autostart-perusersystemd.yml
@@ -1,15 +1,15 @@
 ---
 - name: Checking existence of per-user basic scripts to start vnc
   ansible.builtin.stat:
-    path: "/home/{{ item.username }}/vncstart.sh"
+    path: /home/{{ item.username }}/vncstart.sh
   register: checkvncstart
   with_items: "{{ vnc_users }}"
 
 - name: Update per-user basic scripts to start vnc
   ansible.builtin.template:
     src: "{{ vncstarttemplate }}"
-    dest: "/home/{{ item.item.username }}/vncstart.sh"
-    mode: 0755
+    dest: /home/{{ item.item.username }}/vncstart.sh
+    mode: "0755"
     owner: "{{ item.item.username }}"
     group: "{{ item.item.usergroup | default(item.item.username) }}"
   when:
@@ -18,27 +18,26 @@
 
 - name: Checking existence of per-user basic scripts to stop vnc
   ansible.builtin.stat:
-    path: "/home/{{ item.username }}/vncstop.sh"
+    path: /home/{{ item.username }}/vncstop.sh
   register: checkvncstop
   with_items: "{{ vnc_users }}"
 
 - name: Update per-user basic scripts to stop vnc
   ansible.builtin.template:
     src: "{{ vncstoptemplate }}"
-    dest: "/home/{{ item.item.username }}/vncstop.sh"
-    mode: 0755
+    dest: /home/{{ item.item.username }}/vncstop.sh
+    mode: "0755"
     owner: "{{ item.item.username }}"
     group: "{{ item.item.usergroup | default(item.item.username) }}"
   when:
     - vnc_ansible_managed_startup_scripts or not item.stat.exists
   with_items: "{{ checkvncstop.results }}"
 
-
 - name: Create ansible folder, if not already there. For next steps.
   ansible.builtin.file:
     path: /etc/ansible
     state: directory
-    mode: 0755
+    mode: "0755"
     owner: root
     group: root
 
@@ -57,24 +56,24 @@
 
 - name: Create systemd directories
   ansible.builtin.file:
-    path: "/home/{{ item.username }}/.config/systemd/user"
+    path: /home/{{ item.username }}/.config/systemd/user
     state: directory
-    mode: 0755
+    mode: "0755"
     owner: "{{ item.username }}"
     group: "{{ item.usergroup | default(item.username) }}"
   with_items: "{{ vnc_users }}"
 
 - name: Checking existence of per-user systemd service files
   ansible.builtin.stat:
-    path: "/home/{{ item.username }}/.config/systemd/user/vncserver.service"
+    path: /home/{{ item.username }}/.config/systemd/user/vncserver.service
   register: checksystemd
   with_items: "{{ vnc_users }}"
 
 - name: Update per-user systemd service files
   ansible.builtin.template:
     src: vncserver.j2
-    dest: "/home/{{ item.item.username }}/.config/systemd/user/vncserver.service"
-    mode: 0644
+    dest: /home/{{ item.item.username }}/.config/systemd/user/vncserver.service
+    mode: "0644"
     owner: "{{ item.item.username }}"
     group: "{{ item.item.usergroup | default(item.item.username) }}"
   when:
diff --git a/tasks/autostart-standard.yml b/tasks/autostart-standard.yml
index ffe3350..8f3c9e8 100644
--- a/tasks/autostart-standard.yml
+++ b/tasks/autostart-standard.yml
@@ -1,15 +1,15 @@
 ---
 - name: Checking existence of per-user basic scripts to start vnc
   ansible.builtin.stat:
-    path: "/home/{{ item.username }}/vncstart.sh"
+    path: /home/{{ item.username }}/vncstart.sh
   register: checkvncstart
   with_items: "{{ vnc_users }}"
 
 - name: Update per-user basic scripts to start vnc
   ansible.builtin.template:
     src: "{{ vncstarttemplate }}"
-    dest: "/home/{{ item.item.username }}/vncstart.sh"
-    mode: 0755
+    dest: /home/{{ item.item.username }}/vncstart.sh
+    mode: "0755"
     owner: "{{ item.item.username }}"
     group: "{{ item.item.usergroup | default(item.item.username) }}"
   when:
@@ -18,15 +18,15 @@
 
 - name: Checking existence of per-user basic scripts to stop vnc
   ansible.builtin.stat:
-    path: "/home/{{ item.username }}/vncstop.sh"
+    path: /home/{{ item.username }}/vncstop.sh
   register: checkvncstop
   with_items: "{{ vnc_users }}"
 
 - name: Update per-user basic scripts to stop vnc
   ansible.builtin.template:
     src: "{{ vncstoptemplate }}"
-    dest: "/home/{{ item.item.username }}/vncstop.sh"
-    mode: 0755
+    dest: /home/{{ item.item.username }}/vncstop.sh
+    mode: "0755"
     owner: "{{ item.item.username }}"
     group: "{{ item.item.usergroup | default(item.item.username) }}"
   when:
@@ -36,16 +36,16 @@
 # Nautilus error. Unable to create a required folder.
 - name: Create .config directories.
   ansible.builtin.file:
-    path: "/home/{{ item.username }}/.config"
+    path: /home/{{ item.username }}/.config
     state: directory
-    mode: 0700
+    mode: "0700"
     owner: "{{ item.username }}"
     group: "{{ item.usergroup | default(item.username) }}"
   with_items: "{{ vnc_users }}"
 
 - name: Add vncstart.sh to .bashrc for each user
   ansible.builtin.lineinfile:
-    path: "/home/{{ item.username }}/.bashrc"
+    path: /home/{{ item.username }}/.bashrc
     line: /home/{{ item.username }}/vncstart.sh 2> /dev/null
   when:
     - vnc_bashrc_startup
diff --git a/tasks/main.yml b/tasks/main.yml
index 6fd1ee9..d21595b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -13,8 +13,7 @@
   when:
     - item is match("^default_")
     - vars[item[8:]] is not defined
-  with_items:
-    "{{ vars | list }}"
+  with_items: "{{ vars | list }}"
 
 ##########
 
@@ -23,14 +22,14 @@
 
 - name: Debug info
   ansible.builtin.debug:
-    msg: "desktop is {{ vnc_desktop }} and server is {{ vnc_server }}"
+    msg: desktop is {{ vnc_desktop }} and server is {{ vnc_server }}
 
 - name: Fix test-kitchen
   ansible.builtin.file:
     path: /tmp/kitchen
     state: directory
     recurse: true
-    mode: 0775
+    mode: "0775"
 
 - name: Fix Ubuntu 17.10 bug, 1
   ansible.builtin.package:
@@ -73,8 +72,9 @@
   with_items: "{{ vnc_general_packages }}"
 
 - name: Install amazon-linux-extras packages
-  ansible.builtin.command: "amazon-linux-extras install -y {{ item }}"
+  ansible.builtin.command: amazon-linux-extras install -y {{ item }}
   with_items: "{{ vnc_amazon_linux_extras[vnc_desktop] }}"
+  changed_when: true
   when:
     - ansible_distribution == "Amazon"
     - vnc_amazon_linux_extras is defined
@@ -97,15 +97,15 @@
 # Tigervnc must be downloaded for Ubuntu 16
 - name: Create downloads dir
   ansible.builtin.file:
-    path: "/opt/downloads"
+    path: /opt/downloads
     state: directory
-    mode: 0755
+    mode: "0755"
 
 - name: Download tigervnc
   ansible.builtin.get_url:
     url: "{{ vnc_tiger_url }}"
-    dest: "/opt/downloads/"
-    mode: 0755
+    dest: /opt/downloads/
+    mode: "0755"
   when:
     - ansible_distribution == "Ubuntu"
     - vnc_server == "tigervnc"
@@ -138,9 +138,9 @@
 
 - name: Create .vnc dirs
   ansible.builtin.file:
-    path: "/home/{{ item.username }}/.vnc"
+    path: /home/{{ item.username }}/.vnc
     state: directory
-    mode: 0755
+    mode: "0755"
     owner: "{{ item.username }}"
     group: "{{ item.usergroup | default(item.username) }}"
   with_items: "{{ vnc_users }}"
@@ -150,8 +150,8 @@
     set -o pipefail
     echo {{ item.vnc_default_password }} | vncpasswd -f > /home/{{ item.username }}/.vnc/passwd
   args:
-    chdir: "/home/{{ item.username }}/.vnc"
-    creates: "/home/{{ item.username }}/.vnc/passwd"
+    chdir: /home/{{ item.username }}/.vnc
+    creates: /home/{{ item.username }}/.vnc/passwd
     executable: /bin/bash
   with_items: "{{ vnc_users }}"
   when: vnc_server == "tightvnc"
@@ -161,18 +161,18 @@
     set -o pipefail
     printf "{{ item.vnc_default_password }}\n{{ item.vnc_default_password }}\n\n" | vncpasswd /home/{{ item.username }}/.vnc/passwd
   args:
-    chdir: "/home/{{ item.username }}/.vnc"
-    creates: "/home/{{ item.username }}/.vnc/passwd"
+    chdir: /home/{{ item.username }}/.vnc
+    creates: /home/{{ item.username }}/.vnc/passwd
     executable: /bin/bash
   with_items: "{{ vnc_users }}"
   when: vnc_server == "vnc4server" or vnc_server == "tigervnc"
 
 - name: Set perms on vnc passwords
   ansible.builtin.file:
-    path: "/home/{{ item.username }}/.vnc/passwd"
+    path: /home/{{ item.username }}/.vnc/passwd
     owner: "{{ item.username }}"
     group: "{{ item.usergroup | default(item.username) }}"
-    mode: 0700
+    mode: "0700"
   with_items: "{{ vnc_users }}"
 
 ####################################################################################
@@ -197,11 +197,11 @@
 
 - name: Set fact, type of install 1
   ansible.builtin.set_fact:
-    vnc_paradigm: "version1"
+    vnc_paradigm: version1
 
 - name: Set fact, type of install 2
   ansible.builtin.set_fact:
-    vnc_paradigm: "version2"
+    vnc_paradigm: version2
   when:
     - tiger_ver_installed is defined
     - tiger_ver_installed is version('1.11.0', '>=')
@@ -222,15 +222,15 @@
   block:
     - name: Checking existence of xstartup files
       ansible.builtin.stat:
-        path: "/home/{{ item.username }}/.vnc/xstartup"
+        path: /home/{{ item.username }}/.vnc/xstartup
       register: checkxstartup
       with_items: "{{ vnc_users }}"
 
     - name: Update "xstartup" file
       ansible.builtin.template:
         src: xstartup.j2
-        dest: "/home/{{ item.item.username }}/.vnc/xstartup"
-        mode: 0755
+        dest: /home/{{ item.item.username }}/.vnc/xstartup
+        mode: "0755"
         owner: "{{ item.item.username }}"
         group: "{{ item.item.usergroup | default(item.item.username) }}"
       when:
@@ -240,15 +240,15 @@
     # the file .dmrc is currently for Redhat/Centos
     - name: Checking existence of .dmrc files
       ansible.builtin.stat:
-        path: "/home/{{ item.username }}/.dmrc"
+        path: /home/{{ item.username }}/.dmrc
       register: checkdmrc
       with_items: "{{ vnc_users }}"
 
     - name: Update .dmrc file
       ansible.builtin.template:
         src: dmrc.j2
-        dest: "/home/{{ item.item.username }}/.dmrc"
-        mode: 0755
+        dest: /home/{{ item.item.username }}/.dmrc
+        mode: "0755"
         owner: "{{ item.item.username }}"
         group: "{{ item.item.usergroup | default(item.item.username) }}"
       when:
@@ -258,7 +258,7 @@
     - name: Create /etc/sysconfig dir
       ansible.builtin.file:
         path: /etc/sysconfig
-        mode: 0755
+        mode: "0755"
         owner: root
         group: root
         state: directory
@@ -269,7 +269,7 @@
       ansible.builtin.template:
         src: matedesktop.j2
         dest: /etc/sysconfig/desktop
-        mode: 0644
+        mode: "0644"
         owner: root
         group: root
       when:
@@ -317,28 +317,27 @@
       ansible.builtin.template:
         src: vncserver.users.j2
         dest: /etc/tigervnc/vncserver.users
-        mode: 0644
+        mode: "0644"
         owner: root
         group: root
 
     - name: Checking existence of per-user .vnc/config
       ansible.builtin.stat:
-        path: "/home/{{ item.username }}/vnc/config"
+        path: /home/{{ item.username }}/vnc/config
       register: checkvncconfig
       with_items: "{{ vnc_users }}"
 
     - name: Update per-user .vnc/config
       ansible.builtin.template:
         src: config.j2
-        dest: "/home/{{ item.item.username }}/.vnc/config"
-        mode: 0755
+        dest: /home/{{ item.item.username }}/.vnc/config
+        mode: "0755"
         owner: "{{ item.item.username }}"
         group: "{{ item.item.usergroup | default(item.item.username) }}"
       when:
         - vnc_ansible_managed_config or not item.stat.exists
       with_items: "{{ checkvncconfig.results }}"
 
-
     - name: Enable vnc systemd service for each user
       ansible.builtin.systemd:
         name: "{{ vnc_systemd_service_name }}@:{{ item.vnc_num }}.service"
@@ -347,12 +346,12 @@
 
     - name: Allow users to start their vnc session with sudo
       ansible.builtin.lineinfile:
-        path: "/etc/sudoers.d/{{ item.username }}"
+        path: /etc/sudoers.d/{{ item.username }}
         # yamllint disable-line rule:line-length
         line: "{{ item.username }} ALL = NOPASSWD: /bin/systemctl start tigervncserver@\\:{{ item.vnc_num }}.service, /bin/systemctl stop tigervncserver@\\:{{ item.vnc_num }}.service, /bin/systemctl status tigervncserver@\\:{{ item.vnc_num }}.service"
         owner: root
         group: root
-        mode: '0440'
+        mode: "0440"
         create: true
       with_items: "{{ vnc_users }}"
 
diff --git a/tasks/xfce-rh.yml b/tasks/xfce-rh.yml
index 7215623..2834624 100644
--- a/tasks/xfce-rh.yml
+++ b/tasks/xfce-rh.yml
@@ -1,5 +1,4 @@
 ---
-
 # This is a temporary workaround from https://sauronlenoir.be/index.php/en/xxx to enable Xfce on RH family
 #
 # Because RHEL itself doesn't have the PowerTools repo, and so the gtk-doc package doesn't install, this fix only works for CentOS. Not for RedHat.
diff --git a/vars/Amazon-2.yml b/vars/Amazon-2.yml
index 9d56f23..ca9ced6 100644
--- a/vars/Amazon-2.yml
+++ b/vars/Amazon-2.yml
@@ -4,12 +4,12 @@ default_vnc_general_packages:
   - net-tools
 
 default_vnc_users:
-  - username: 'ec2-user'
-    usergroup: 'ec2-user'
+  - username: ec2-user
+    usergroup: ec2-user
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
-    vnc_server_options_per_user: "-localhost"
+    vnc_server_options_per_user: -localhost
 
 default_vnc_desktop_packages:
   gnome:
diff --git a/vars/CentOS-7.yml b/vars/CentOS-7.yml
index c0d5801..75686b4 100644
--- a/vars/CentOS-7.yml
+++ b/vars/CentOS-7.yml
@@ -1,7 +1,7 @@
 ---
 default_vnc_users:
-  - username: 'centos'
-    usergroup: 'centos'
+  - username: centos
+    usergroup: centos
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
diff --git a/vars/CentOS-8.yml b/vars/CentOS-8.yml
index 087d181..4fc21fa 100644
--- a/vars/CentOS-8.yml
+++ b/vars/CentOS-8.yml
@@ -6,8 +6,8 @@ default_vnc_general_packages:
   - net-tools
 
 default_vnc_users:
-  - username: 'centos'
-    usergroup: 'centos'
+  - username: centos
+    usergroup: centos
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
diff --git a/vars/Debian-10.yml b/vars/Debian-10.yml
index 299f5fe..b80fc39 100644
--- a/vars/Debian-10.yml
+++ b/vars/Debian-10.yml
@@ -1,7 +1,7 @@
 ---
 default_vnc_users:
-  - username: 'admin'
-    usergroup: 'admin'
+  - username: admin
+    usergroup: admin
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
@@ -33,4 +33,4 @@ default_vnc_server_packages:
   tightvnc:
     - tightvncserver
 
-default_xstartup_additional_command1: "dbus-update-activation-environment --systemd --all"
+default_xstartup_additional_command1: dbus-update-activation-environment --systemd --all
diff --git a/vars/Debian-11.yml b/vars/Debian-11.yml
index 299f5fe..b80fc39 100644
--- a/vars/Debian-11.yml
+++ b/vars/Debian-11.yml
@@ -1,7 +1,7 @@
 ---
 default_vnc_users:
-  - username: 'admin'
-    usergroup: 'admin'
+  - username: admin
+    usergroup: admin
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
@@ -33,4 +33,4 @@ default_vnc_server_packages:
   tightvnc:
     - tightvncserver
 
-default_xstartup_additional_command1: "dbus-update-activation-environment --systemd --all"
+default_xstartup_additional_command1: dbus-update-activation-environment --systemd --all
diff --git a/vars/Debian-9.yml b/vars/Debian-9.yml
index d92f69c..dc0be63 100644
--- a/vars/Debian-9.yml
+++ b/vars/Debian-9.yml
@@ -1,7 +1,7 @@
 ---
 default_vnc_users:
-  - username: 'admin'
-    usergroup: 'admin'
+  - username: admin
+    usergroup: admin
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
diff --git a/vars/Debian-family.yml b/vars/Debian-family.yml
index 83bf127..b0e178a 100644
--- a/vars/Debian-family.yml
+++ b/vars/Debian-family.yml
@@ -36,12 +36,12 @@ default_vnc_server_packages:
 
 # default_vnc_tiger_url: "https://bintray.com/tigervnc/stable/download_file?file_path=ubuntu-16.04LTS%2Famd64%2Ftigervncserver_1.8.0-1ubuntu1_amd64.deb"
 # default_vnc_tiger_file: "tigervncserver_1.8.0-1ubuntu1_amd64.deb"
-default_vnc_tiger_url: "https://downloads.sourceforge.net/project/tigervnc/stable/1.10.1/ubuntu-16.04LTS/amd64/tigervncserver_1.10.1-1ubuntu1_amd64.deb"
-default_vnc_tiger_file: "tigervncserver_1.10.1-1ubuntu1_amd64.deb"
+default_vnc_tiger_url: https://downloads.sourceforge.net/project/tigervnc/stable/1.10.1/ubuntu-16.04LTS/amd64/tigervncserver_1.10.1-1ubuntu1_amd64.deb
+default_vnc_tiger_file: tigervncserver_1.10.1-1ubuntu1_amd64.deb
 
 default_vnc_install_systemd_services: true
 default_vnc_ansible_managed_startup_scripts: false
 
 default_xstartup_additional_command1: ""
 
-default_vnc_systemd_service_name: "tigervncserver"
+default_vnc_systemd_service_name: tigervncserver
diff --git a/vars/RedHat-family.yml b/vars/RedHat-family.yml
index 35b8b93..f90ea47 100644
--- a/vars/RedHat-family.yml
+++ b/vars/RedHat-family.yml
@@ -39,4 +39,4 @@ default_vnc_ansible_managed_startup_scripts: false
 
 default_xstartup_additional_command1: ""
 
-default_vnc_systemd_service_name: "vncserver"
+default_vnc_systemd_service_name: vncserver
diff --git a/vars/Rocky-8.yml b/vars/Rocky-8.yml
index 6a4f1ec..c2baa29 100644
--- a/vars/Rocky-8.yml
+++ b/vars/Rocky-8.yml
@@ -6,8 +6,8 @@ default_vnc_general_packages:
   - net-tools
 
 default_vnc_users:
-  - username: 'rocky'
-    usergroup: 'rocky'
+  - username: rocky
+    usergroup: rocky
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
diff --git a/vars/Ubuntu-16.yml b/vars/Ubuntu-16.yml
index e345023..6b89a0f 100644
--- a/vars/Ubuntu-16.yml
+++ b/vars/Ubuntu-16.yml
@@ -2,8 +2,8 @@
 default_vnc_server: tigervnc
 
 default_vnc_users:
-  - username: 'ubuntu'
-    usergroup: 'ubuntu'
+  - username: ubuntu
+    usergroup: ubuntu
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
diff --git a/vars/Ubuntu-17.yml b/vars/Ubuntu-17.yml
index b45450d..ce2aa1e 100644
--- a/vars/Ubuntu-17.yml
+++ b/vars/Ubuntu-17.yml
@@ -2,8 +2,8 @@
 default_vnc_server: vnc4server
 
 default_vnc_users:
-  - username: 'ubuntu'
-    usergroup: 'ubuntu'
+  - username: ubuntu
+    usergroup: ubuntu
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
diff --git a/vars/Ubuntu-18.yml b/vars/Ubuntu-18.yml
index 14ebdc8..d4c900a 100644
--- a/vars/Ubuntu-18.yml
+++ b/vars/Ubuntu-18.yml
@@ -2,8 +2,8 @@
 default_vnc_server: tigervnc
 
 default_vnc_users:
-  - username: 'ubuntu'
-    usergroup: 'ubuntu'
+  - username: ubuntu
+    usergroup: ubuntu
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
@@ -34,4 +34,4 @@ default_vnc_server_packages:
   tightvnc:
     - tightvncserver
 
-default_xstartup_additional_command1: "dbus-update-activation-environment --systemd --all"
+default_xstartup_additional_command1: dbus-update-activation-environment --systemd --all
diff --git a/vars/Ubuntu-19.yml b/vars/Ubuntu-19.yml
index 14ebdc8..d4c900a 100644
--- a/vars/Ubuntu-19.yml
+++ b/vars/Ubuntu-19.yml
@@ -2,8 +2,8 @@
 default_vnc_server: tigervnc
 
 default_vnc_users:
-  - username: 'ubuntu'
-    usergroup: 'ubuntu'
+  - username: ubuntu
+    usergroup: ubuntu
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
@@ -34,4 +34,4 @@ default_vnc_server_packages:
   tightvnc:
     - tightvncserver
 
-default_xstartup_additional_command1: "dbus-update-activation-environment --systemd --all"
+default_xstartup_additional_command1: dbus-update-activation-environment --systemd --all
diff --git a/vars/Ubuntu-20.yml b/vars/Ubuntu-20.yml
index 14ebdc8..d4c900a 100644
--- a/vars/Ubuntu-20.yml
+++ b/vars/Ubuntu-20.yml
@@ -2,8 +2,8 @@
 default_vnc_server: tigervnc
 
 default_vnc_users:
-  - username: 'ubuntu'
-    usergroup: 'ubuntu'
+  - username: ubuntu
+    usergroup: ubuntu
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
@@ -34,4 +34,4 @@ default_vnc_server_packages:
   tightvnc:
     - tightvncserver
 
-default_xstartup_additional_command1: "dbus-update-activation-environment --systemd --all"
+default_xstartup_additional_command1: dbus-update-activation-environment --systemd --all
diff --git a/vars/Ubuntu-21.yml b/vars/Ubuntu-21.yml
index 14ebdc8..d4c900a 100644
--- a/vars/Ubuntu-21.yml
+++ b/vars/Ubuntu-21.yml
@@ -2,8 +2,8 @@
 default_vnc_server: tigervnc
 
 default_vnc_users:
-  - username: 'ubuntu'
-    usergroup: 'ubuntu'
+  - username: ubuntu
+    usergroup: ubuntu
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
@@ -34,4 +34,4 @@ default_vnc_server_packages:
   tightvnc:
     - tightvncserver
 
-default_xstartup_additional_command1: "dbus-update-activation-environment --systemd --all"
+default_xstartup_additional_command1: dbus-update-activation-environment --systemd --all
diff --git a/vars/Ubuntu-22.yml b/vars/Ubuntu-22.yml
index 112da7f..0d27bbd 100644
--- a/vars/Ubuntu-22.yml
+++ b/vars/Ubuntu-22.yml
@@ -2,8 +2,8 @@
 default_vnc_server: tigervnc
 
 default_vnc_users:
-  - username: 'ubuntu'
-    usergroup: 'ubuntu'
+  - username: ubuntu
+    usergroup: ubuntu
     # port 5901 is 1
     vnc_num: 1
     vnc_default_password: mypassword
@@ -34,7 +34,7 @@ default_vnc_server_packages:
   tightvnc:
     - tightvncserver
 
-default_xstartup_additional_command1: "dbus-update-activation-environment --systemd --all"
+default_xstartup_additional_command1: dbus-update-activation-environment --systemd --all
 
 # use /usr/share/xsessions/ubuntu.desktop
 default_vnc_desktop_gnome_override: ubuntu