diff --git a/tasks/workstation/linux/software/nodejs.yml b/tasks/workstation/linux/software/nodejs.yml
index e1f3202..00a00b7 100644
--- a/tasks/workstation/linux/software/nodejs.yml
+++ b/tasks/workstation/linux/software/nodejs.yml
@@ -7,41 +7,41 @@
 - name: Workstation | Software | NodeJS
   block:
 
-  - name: Workstation | Software | NodeJS | apt
-    block:
+    - name: Workstation | Software | NodeJS | apt
+      block:
 
-    - name: Workstation | Software | NodeJS | apt | Facts
-      ansible.builtin.set_fact:
-        node_version: node_24.x
+        - name: Workstation | Software | NodeJS | apt | Facts
+          ansible.builtin.set_fact:
+            node_version: node_24.x
 
-    - name: Workstation | Software | NodeJS | apt | Old | Remove
+        - name: Workstation | Software | NodeJS | apt | Old | Remove
+          ansible.builtin.package:
+            name: npm
+            state: absent
+
+        - name: Workstation | Software | NodeJS | apt | extrepo | Install
+          ansible.builtin.package:
+            name: extrepo
+            state: present
+
+        - name: Workstation | Software | NodeJS | apt | extrepo | Enable
+          ansible.builtin.shell: "extrepo enable {{ node_version }}"
+          register: shell_check
+          changed_when: shell_check.rc == 0
+
+        - name: Workstation | Software | NodeJS | apt | Install
+          ansible.builtin.package:
+            name: nodejs
+            state: present
+
+      when: ansible_pkg_mgr == "apt"
+
+    - name: Workstation | Software | NodeJS | All Others | Install
       ansible.builtin.package:
-        name: npm
-        state: absent
-
-    - name: Workstation | Software | NodeJS | apt | extrepo | Install
-      ansible.builtin.package:
-        name: extrepo
+        name:
+          - nodejs
+          - npm
         state: present
-        update_cache: true
-
-    - name: Workstation | Software | NodeJS | apt | extrepo | Enable
-      ansible.builtin.shell: "extrepo enable {{ node_version }}"
-
-    - name: Workstation | Software | NodeJS | apt | Install
-      ansible.builtin.package:
-        name: nodejs
-        state: latest
-        update_cache: true
-
-    when: ansible_pkg_mgr == "apt"
-
-  - name: Workstation | Software | NodeJS | All Others | Install
-    ansible.builtin.package:
-      name:
-        - nodejs
-        - npm
-      state: present
-    when: ansible_pkg_mgr != "apt"
+      when: ansible_pkg_mgr != "apt"
 
   when: coding