diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0db8d343..afc09df4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,8 +14,10 @@ The **patch** part changes is incremented if multiple releases happen the same m
 ### Added
 
 ### Changed
+* evolinux-users: remove Stretch references in tasks that also apply to next Debian versions.
 
 ### Fixed
+* packweb-apache,nagios-nrpe: add missing task and config fo PHP 8.2 container
 
 ### Removed
 
diff --git a/evolinux-users/tasks/sudo.yml b/evolinux-users/tasks/sudo.yml
index 85149147..b3089aab 100644
--- a/evolinux-users/tasks/sudo.yml
+++ b/evolinux-users/tasks/sudo.yml
@@ -11,9 +11,9 @@
 
 
 - block:
-  - ansible.builtin.include: sudo_stretch_common.yml
+  - ansible.builtin.include: sudo_common.yml
 
-  - ansible.builtin.include: sudo_stretch_user.yml
+  - ansible.builtin.include: sudo_user.yml
     vars:
       user: "{{ item.value }}"
     loop: "{{ evolinux_users | dict2items }}"
diff --git a/evolinux-users/tasks/sudo_stretch_common.yml b/evolinux-users/tasks/sudo_common.yml
similarity index 95%
rename from evolinux-users/tasks/sudo_stretch_common.yml
rename to evolinux-users/tasks/sudo_common.yml
index ba7fb50b..0560f997 100644
--- a/evolinux-users/tasks/sudo_stretch_common.yml
+++ b/evolinux-users/tasks/sudo_common.yml
@@ -10,7 +10,7 @@
 
 - name: "Verify 'evolinux' sudoers file presence (Debian 9 or later)"
   ansible.builtin.template:
-    src: sudoers_stretch.j2
+    src: sudoers.j2
     dest: /etc/sudoers.d/evolinux
     force: no
     mode: "0440"
diff --git a/evolinux-users/tasks/sudo_stretch_user.yml b/evolinux-users/tasks/sudo_user.yml
similarity index 100%
rename from evolinux-users/tasks/sudo_stretch_user.yml
rename to evolinux-users/tasks/sudo_user.yml
diff --git a/evolinux-users/templates/sudoers_stretch.j2 b/evolinux-users/templates/sudoers.j2
similarity index 100%
rename from evolinux-users/templates/sudoers_stretch.j2
rename to evolinux-users/templates/sudoers.j2