diff --git a/extensions/molecule/nodejs.16/converge.yml b/extensions/molecule/nodejs.16/converge.yml
index 00c9bd337..d8953e085 100644
--- a/extensions/molecule/nodejs.16/converge.yml
+++ b/extensions/molecule/nodejs.16/converge.yml
@@ -6,9 +6,7 @@
 
 - name: Default
   tags: [default]
-  hosts:
-    - debian.bullseye
-    - debian.bookworm
+  hosts: debian
   tasks:
     - block:  # noqa: name[missing]
         - name: Role
diff --git a/extensions/molecule/nodejs.16/prepare.yml b/extensions/molecule/nodejs.16/prepare.yml
index f4306c702..e8d49375c 100644
--- a/extensions/molecule/nodejs.16/prepare.yml
+++ b/extensions/molecule/nodejs.16/prepare.yml
@@ -2,9 +2,7 @@
 
 - name: Prepare
   tags: [always]
-  hosts:
-    - debian.bullseye
-    - debian.bookworm
+  hosts: debian
   tasks:
     - name: Apt
       ansible.builtin.import_role:
diff --git a/roles/apt/vars/main.yaml b/roles/apt/vars/main.yaml
index 362a5fc3c..5fc55fd62 100644
--- a/roles/apt/vars/main.yaml
+++ b/roles/apt/vars/main.yaml
@@ -97,9 +97,9 @@ manala_apt_repositories_patterns:
     legacy_file: deb_nodesource_com_node_14_x.list
   nodesource_16:
     uris: https://deb.nodesource.com/node_16.x
-    suites: "{{ ansible_facts.distribution_release }}"
+    suites: nodistro
     components: main
-    key: nodesource_legacy
+    key: nodesource
     legacy_file: deb_nodesource_com_node_16_x.list
   nodesource_18:
     uris: https://deb.nodesource.com/node_18.x