diff --git a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml
index c74859c..566cb24 100644
--- a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml
+++ b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml
@@ -11,36 +11,40 @@
   # Source:
   #   - http://c-nergy.be/blog/?p=8984
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Install packages"
+  - name: "(ubuntu-x11vnc-2004-amd64.yml) Install packages"
     apt:
       name: "{{ packages }}"
       update_cache: yes
       state: present
     vars:
       packages:
-      - x11vnc
+        - x11vnc
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Store password"
+  - name: "(ubuntu-x11vnc-2004-amd64.yml) get numeric id for group 'gdm'"
+    shell: echo "$(id -u gdm)"
+    register: grp_id_gdm
+
+  - name: "(ubuntu-x11vnc-2004-amd64.yml) Store password"
     raw: "x11vnc -storepasswd {{ vnc_password }} /etc/x11vnc.pass"
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Set permissions on /etc/x11vnc.pass"
+  - name: "(ubuntu-x11vnc-2004-amd64.yml) Set permissions on /etc/x11vnc.pass"
     file:
      path: "/etc/x11vnc.pass"
      mode: 0644
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service"
+  - name: "(ubuntu-x11vnc-2004-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service"
     template:
-      src: lib/systemd/system/x11vnc.service.j2
+      src: lib/systemd/system/x11vnc-gdm3.service.j2
       dest: /lib/systemd/system/x11vnc.service
 
-  - name: "(ubuntu-x11vnc-1804-amd64.yml) Enable service"
+  - name: "(ubuntu-x11vnc-2004-amd64.yml) Enable service"
     systemd:
       name: x11vnc.service
       daemon_reload: yes
       enabled: yes
       state: restarted
 
-#  - name: "(ubuntu-x11vnc-1804-amd64.yml) Remove whisker menu entry for allusers (except owner and group)"
+#  - name: "(ubuntu-x11vnc-2004-amd64.yml) Remove whisker menu entry for allusers (except owner and group)"
 #    file:
 #      path: "/usr/share/applications/x11vnc.desktop"
 #      mode: 0750