diff --git a/ansible/roles/win_client/tasks/chocolatey.yml b/ansible/roles/win_client/tasks/chocolatey.yml
index 7388c92..5558cb3 100644
--- a/ansible/roles/win_client/tasks/chocolatey.yml
+++ b/ansible/roles/win_client/tasks/chocolatey.yml
@@ -8,7 +8,7 @@
         package_params: "'/Global'"
         source: "{{ repo_url }}"
 
-    - name: Add new internal Choco source (client machines)
+    - name: Add new internal Choco source
       win_chocolatey_source:
          name: EPCC 
          state: present
@@ -20,7 +20,7 @@
     #    reboot_timeout_sec: 1200
     # ???
 
-    - name: Disable the default public Choco source (client machines)
+    - name: Disable the default public Choco source
       win_chocolatey_source:
           name: chocolatey
           state: disabled
@@ -29,80 +29,85 @@
 - name: Client Packages
   tags: client_packages
   block:      
-    - name: Install Chocolatey GUI (client machines)
+    - name: Install Chocolatey GUI
       win_chocolatey:
         name: ChocolateyGUI
         state: present
         package_params: "'/Global'"
 
-    - name: Install Microsoft office (client machines)
+    - name: Install Microsoft office
       win_chocolatey:
         name: microsoft-office-deployment
         state: present
         package_params: "'/Product:ProPlus2021Volume /LicenseKey:FXYTK-NJJ8C-GB6DW-3DYQT-6F7TH'"
       tags: install_office
 
-    - name: Install Firefox (client machines)
+    - name: Install Firefox
       win_chocolatey:
         name: firefox
         state: present
+      tags: install_firefox
 
-    - name: Install Google Chrome (client machines)
+    - name: Install Google Chrome
       win_chocolatey:
         name: GoogleChrome
         state: present
         ignore_checksums: true # workaround for chrome checksum issues.
+      tags: install_chrome
 
-    - name: Install R (client machines)
+    - name: Install R
       win_chocolatey:
         name: R.Project
         state: present
+      tags: install_r
 
-    #- name: Install Python3.10 (client machines)
-    #  win_chocolatey:
-    #    name: python310
-    #    state: present
-    #  when: inventory_hostname in groups['meta-Tags_client']
+    - name: Install Python3.12
+      win_chocolatey:
+        name: python312
+        state: present
+      tags: install_python
 
-    - name: Install RStudio (client machines)
+    - name: Install RStudio
       win_chocolatey:
         name: r.studio
         state: present
+      tags: install_rstudio
 
-    - name: Install Other Software (client machines)
+    - name: Install vscode
       win_chocolatey:
-        name: "{{ item }}"
+        name: vscode
         state: present
-      loop:
-        #- vscode.install
-        - vscode
-        #- KB4019990
-        - python312
-        - notepadplusplus
-        - windirstat
-        - adobereader
-        - DotNet4.6
-        - dotnet4.7.2
-      # loop control ???
+      tags: install_vscode
 
-    #- name: Install office365proplus (client machines)
-    #  win_chocolatey:
-    #    name: office365proplus
-    #    state: present
-    #    package_params: "'/Global /language:en-GB'"
+    - name: Install notepadplusplus
+      win_chocolatey:
+        name: notepadplusplus
+        state: present
+      tags: install_notepadplusplus
 
+    - name: Install windirstat
+      win_chocolatey:
+        name: windirstat
+        state: present
+      tags: install_windirstat
 
-    #- name: Install veeam-agent (client machines)
-    #  win_chocolatey:
-    #    name: veeam-agent
-    #    state: present
+    - name: Install adobereader
+      win_chocolatey:
+        name: adobereader
+        state: present
+      tags: install_adobereader
 
-    # I think Firefox adds one automatically...
-    #- name: Create Firefox shortcut on the desktop
-    #  community.windows.win_shortcut:
-    #    src: C:\Program Files\Mozilla Firefox\Firefox.exe
-    #    dest: C:\Users\Public\Desktop\Mozilla Firefox.lnk
-    #    icon: C:\Program Files\Mozilla Firefox\Firefox.exe,0
+    - name: Install DotNet4.6
+      win_chocolatey:
+        name: DotNet4.6
+        state: present
+      tags: install_dotnet46
+
+      - name: Install dotnet4.7.2
+      win_chocolatey:
+        name: dotnet4.7.2
+        state: present
+      tags: install_dotnet472
 
     - name: Create RStudio shortcut on the desktop
       community.windows.win_shortcut: