diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 087d24d721560eba4716dd80d1da9ee140f5477b..d4afc69d9871d96d8966582e8bd4a99145df2839 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -61,7 +61,7 @@
     dest: "/etc/adduser.conf"
     state: present
     backrefs: true
-    regexp: '^DIR_MODE='
+    regexp: '^\s*#?\s*DIR_MODE='
     line: 'DIR_MODE=0750'
 
 - name: Deploy bash profile configuration for fancier prompts
@@ -103,7 +103,7 @@
     owner: root
     group: root
     mode: 0640
-  # Checksums: bullseye
+  # Checksums: bullseye and bookworm (same)
   when: |
     root_bashrc_stat.stat.checksum == "1a422a148ad225aa5ba33f8dafd2b7cfcdbd701f"
 
@@ -483,6 +483,15 @@
     state: present
   when: ntp_pools | length > 0
 
+- name: Remove NTP packages
+  apt:
+    name:
+      - ntpsec
+      - ntpsec-ntpdate
+    state: absent
+    purge: true
+  when: ntp_pools | length == 0
+
 - name: Deploy NTP configuration
   template:
     src: "ntp.conf.j2"