diff --git a/CHANGELOG.md b/CHANGELOG.md
index dea9f18a..23f3ed03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ The **patch** part changes incrementally at each release.
 * apt: store keys in /etc/apt/trusted.gpg.d in ascii format
 * certbot: sync_remote.sh is configurable
 * evolinux-base: copy GPG key instead of using apt-key
+* nodejs: change GPG key name
 * ntpd: Add leapfile configuration setting to ntpd on debian 10+
 * packweb-apache: install phpMyAdmin from buster-backports
 * spamassassin: change dependency on evomaintenance
diff --git a/nodejs/files/yarnpkg.asc b/nodejs/files/yarn.asc
similarity index 100%
rename from nodejs/files/yarnpkg.asc
rename to nodejs/files/yarn.asc
diff --git a/nodejs/tasks/yarn.yml b/nodejs/tasks/yarn.yml
index 31bce9c6..44306d42 100644
--- a/nodejs/tasks/yarn.yml
+++ b/nodejs/tasks/yarn.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: NodeJS embedded GPG key is absent
+- name: Yarn embedded GPG key is absent
   apt_key:
     id: "86E50310"
     keyring: /etc/apt/trusted.gpg
@@ -11,10 +11,10 @@
     - nodejs
     - yarn
 
-- name: NodeJS GPG key is installed
+- name: Yarn GPG key is installed
   copy:
-    src: yarnpkg.asc
-    dest: /etc/apt/trusted.gpg.d/yarnpkg.asc
+    src: yarn.asc
+    dest: /etc/apt/trusted.gpg.d/yarn.asc
     mode: "0644"
     owner: root
     group: root
@@ -24,7 +24,7 @@
     - nodejs
     - yarn
 
-- name: yarn sources list is available
+- name: Yarn sources list is available
   apt_repository:
     repo: "deb https://dl.yarnpkg.com/debian/ stable main"
     filename: yarn
@@ -36,7 +36,7 @@
     - nodejs
     - yarn
 
-- name: yarn is installed
+- name: Yarn is installed
   apt:
     name: yarn
     state: present