diff --git a/hosts b/hosts
index 25fbd1e..1d9a4bd 100644
--- a/hosts
+++ b/hosts
@@ -97,11 +97,16 @@ pc125.mbr-bln.netz
 pc126.mbr-bln.netz
 pc127.mbr-bln.netz
 pc128.mbr-bln.netz
+pc130.mbr-bln.netz
 pc131.mbr-bln.netz
 pc132.mbr-bln.netz
 pc133.mbr-bln.netz
 pc134.mbr-bln.netz
 pc135.mbr-bln.netz
+pc136.mbr-bln.netz
+pc137.mbr-bln.netz
+pc138.mbr-bln.netz
+192.168.112.162
 
 [mbr_server]
 file-mbr.mbr-bln.netz ansible_user=root
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 662a533..d5df914 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -207,10 +207,10 @@
 
 # tags supported inside mount_samba_shares.yml:
 #
-- import_tasks: mount_samba_shares.yml
-  when: "groups['client_pc']|string is search(inventory_hostname)"
-  tags:
-    - samba-shares
+#- import_tasks: mount_samba_shares.yml
+#  when: "groups['client_pc']|string is search(inventory_hostname)"
+#  tags:
+#    - samba-shares
 
 
 # Tasks: Configure VNC (x11vnc) for Ubuntu systems
diff --git a/roles/common/tasks/mount_samba_shares.yml b/roles/common/tasks/mount_samba_shares.yml
index ba71c0a..c432534 100644
--- a/roles/common/tasks/mount_samba_shares.yml
+++ b/roles/common/tasks/mount_samba_shares.yml
@@ -23,6 +23,6 @@
 #    state: directory
 #  with_subelements: 
 #    - "{{ samba_shares }}"
-#    # - user
+#    - user
 #  loop_control:
 #    label: '{{ item.1 }} share: {{ item.0.name }}'
diff --git a/roles/common/tasks/nis-install-client.yml b/roles/common/tasks/nis-install-client.yml
index 6276cc0..8741b0d 100644
--- a/roles/common/tasks/nis-install-client.yml
+++ b/roles/common/tasks/nis-install-client.yml
@@ -306,7 +306,3 @@
     - nis-install
     - nis-install-client
 
-
-# TODO:
-# /etc/systemd/system/systemd-logind.service.d/nis_allow_network.conf
-# /etc/systemd/system/rpcbind.socket.d/override.conf
diff --git a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml
index bcdc239..8d97abf 100644
--- a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml
+++ b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml
@@ -52,7 +52,7 @@
 
   - name: "(ubuntu-x11vnc-2004-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service"
     template:
-      src: lib/systemd/system/x11vnc-gdm3.service-ALT.j2
+      src: lib/systemd/system/x11vnc-gdm3.service.j2
       dest: /lib/systemd/system/x11vnc.service
 
   - name: "(ubuntu-x11vnc-2004-amd64.yml) Enable service"