diff --git a/docs/roles/debian/nodejs.md b/docs/roles/debian/nodejs.md
index 1931faa13..0e4624ee1 100644
--- a/docs/roles/debian/nodejs.md
+++ b/docs/roles/debian/nodejs.md
@@ -8,8 +8,8 @@ Installs NodeJS from official repos.
 ---
 nodejs:
   # Used by apt_unattended_upgrades
-  apt_origin_nodejs: "origin=Node Source,codename=${distro_codename},label=Node Source" # nodejs repo
-  apt_signed_by_nodejs: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
+  apt_origin_nodejs: "origin=Node Source,codename=nodistro,label=Node Source" # nodejs repo
+  apt_signed_by_nodejs: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key
   apt_origin_yarn: "origin=yarn,codename=stable,label=yarn-stable" # yarn repo
   apt_signed_by_yarn: https://dl.yarnpkg.com/debian/pubkey.gpg
   version: 18.x # LTS - see https://nodejs.dev/en/about/releases/
diff --git a/docs/roles/debian/postfix.md b/docs/roles/debian/postfix.md
index afd84b496..7f24ebb64 100644
--- a/docs/roles/debian/postfix.md
+++ b/docs/roles/debian/postfix.md
@@ -23,7 +23,7 @@ postfix:
   protocols: all
   relayhost: ""
   transport_maps: # see Postfix manual examples - https://www.postfix.org/transport.5.html
-    - "* discard :"
+    - "* discard"
   use_dkim: false
   # AWS SES config - to authenticate with an IAM user see https://docs.aws.amazon.com/ses/latest/dg/smtp-credentials.html
   use_ses: false
diff --git a/roles/debian/nodejs/README.md b/roles/debian/nodejs/README.md
index 1931faa13..0e4624ee1 100644
--- a/roles/debian/nodejs/README.md
+++ b/roles/debian/nodejs/README.md
@@ -8,8 +8,8 @@ Installs NodeJS from official repos.
 ---
 nodejs:
   # Used by apt_unattended_upgrades
-  apt_origin_nodejs: "origin=Node Source,codename=${distro_codename},label=Node Source" # nodejs repo
-  apt_signed_by_nodejs: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
+  apt_origin_nodejs: "origin=Node Source,codename=nodistro,label=Node Source" # nodejs repo
+  apt_signed_by_nodejs: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key
   apt_origin_yarn: "origin=yarn,codename=stable,label=yarn-stable" # yarn repo
   apt_signed_by_yarn: https://dl.yarnpkg.com/debian/pubkey.gpg
   version: 18.x # LTS - see https://nodejs.dev/en/about/releases/
diff --git a/roles/debian/nodejs/defaults/main.yml b/roles/debian/nodejs/defaults/main.yml
index c2103ced1..0ae6c011c 100644
--- a/roles/debian/nodejs/defaults/main.yml
+++ b/roles/debian/nodejs/defaults/main.yml
@@ -1,8 +1,8 @@
 ---
 nodejs:
   # Used by apt_unattended_upgrades
-  apt_origin_nodejs: "origin=Node Source,codename=${distro_codename},label=Node Source" # nodejs repo
-  apt_signed_by_nodejs: https://deb.nodesource.com/gpgkey/nodesource.gpg.key
+  apt_origin_nodejs: "origin=Node Source,codename=nodistro,label=Node Source" # nodejs repo
+  apt_signed_by_nodejs: https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key
   apt_origin_yarn: "origin=yarn,codename=stable,label=yarn-stable" # yarn repo
   apt_signed_by_yarn: https://dl.yarnpkg.com/debian/pubkey.gpg
   version: 18.x # LTS - see https://nodejs.dev/en/about/releases/
diff --git a/roles/debian/nodejs/tasks/main.yml b/roles/debian/nodejs/tasks/main.yml
index 027659df7..3128b7bb8 100644
--- a/roles/debian/nodejs/tasks/main.yml
+++ b/roles/debian/nodejs/tasks/main.yml
@@ -4,16 +4,15 @@
     name: debian/apt_repository
   vars:
     apt_repository:
-      legacy_repo: "deb https://deb.nodesource.com/node_{{ nodejs.version }} {{ ansible_distribution_release }} main"
+      legacy_repo: "deb https://deb.nodesource.com/node_{{ nodejs.version }} nodistro main"
       format: deb822
       name: nodejs
       types:
         - deb
-        - deb-src
       uris:
         - "https://deb.nodesource.com/node_{{ nodejs.version }}"
       signed_by: "{{ nodejs.apt_signed_by_nodejs }}"
-      suites: "{{ ansible_distribution_release }}"
+      suites: "nodistro"
       components:
         - main
       state: present
diff --git a/roles/debian/postfix/README.md b/roles/debian/postfix/README.md
index afd84b496..7f24ebb64 100644
--- a/roles/debian/postfix/README.md
+++ b/roles/debian/postfix/README.md
@@ -23,7 +23,7 @@ postfix:
   protocols: all
   relayhost: ""
   transport_maps: # see Postfix manual examples - https://www.postfix.org/transport.5.html
-    - "* discard :"
+    - "* discard"
   use_dkim: false
   # AWS SES config - to authenticate with an IAM user see https://docs.aws.amazon.com/ses/latest/dg/smtp-credentials.html
   use_ses: false