diff --git a/.gitmodules b/.gitmodules
index 49e8b84..bbc323a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "roles/workstation_packages"]
 	path = roles/workstation_packages
 	url = https://github.com/chaos-bodensee/role_install_workstaton_packages.git
-[submodule "roles/i3wm"]
-	path = roles/i3wm
-	url = https://github.com/roles-ansible/ansible-role-i3wm.git
+[submodule "roles/do1jlr.i3wm"]
+	path = roles/do1jlr.i3wm
+	url = https://github.com/roles-ansible/ansible_role_i3wm.git
 [submodule "roles/dotfiles"]
 	path = roles/dotfiles
 	url = https://github.com/chaos-bodensee/role_dotfiles.git
diff --git a/roles/i3wm b/roles/i3wm
deleted file mode 160000
index 6fbf3f2..0000000
--- a/roles/i3wm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6fbf3f2efc331abb3a81c08d81e5973d43f9b706
diff --git a/roles/networkmanager/tasks/main.yml b/roles/networkmanager/tasks/main.yml
index 580c14d..fec5330 100644
--- a/roles/networkmanager/tasks/main.yml
+++ b/roles/networkmanager/tasks/main.yml
@@ -4,7 +4,7 @@
 
 - name: install needed packages on arch
   become: yes
-  pacman:
+  community.general.pacman:
     name:
      - wireless_tools
      - iw 
@@ -17,21 +17,21 @@
 
 - name: install Networkmanager
   become: yes
-  dnf:
+  ansible.builtin.dnf:
     name: NetworkManager
     state: present
   when: ansible_distribution == 'Fedora'
 
 - name: install NetworkManager
   become: yes
-  apt:
+  ansible.builtin.apt:
     name: networkmanager
     state: present
   when: ansible_os_family == 'Debian'
 
 - name: install needed packages for NetworkManager
   become: yes
-  package:
+  ansible.builtin.package:
     name:
      - dialog
      - wpa_supplicant
@@ -41,6 +41,6 @@
 
 - name: enable networkmanager
   become: yes
-  systemd:
+  ansible.builtin.systemd:
     name: NetworkManager.service
     enabled: yes
diff --git a/setup_t460p.yml b/setup_t460p.yml
index 81d1a49..d41a82c 100644
--- a/setup_t460p.yml
+++ b/setup_t460p.yml
@@ -21,7 +21,7 @@
   hosts: t460p.local
   roles:
     - {role: akku-warning, tags: akku}
-    - {role: pulseaudio, tags: [pulse, audio, pulseaudio]}
+#    - {role: pulseaudio, tags: [pulse, audio, pulseaudio]}
     - {role: networkmanager, tags: networkmanager, when: ansible_os_family == 'Archlinux'}
     - {role: openvpn, tags: ovpn}
     - {role: nextcloud, tags: nextcloud, when: ansible_os_family == 'Archlinux'}
@@ -32,7 +32,7 @@
     - {role: ntp, tags: ntp}
     - {role: xrandr, tags: xrandr}
     - {role: arch-fonts, tags: fonts}
-    - {role: winehq, tags: wine}
+    # - {role: winehq, tags: wine}
     - {role: no-sleep, tags: sleep}
     - {role: do1jlr.avahi_daemon, tags: [avahi_daemon, avahi]}
     - {role: do1jlr.avahi_client, tags: [avahi_client, mdns]}