diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 8aeed417f2087920bd0b7a044bf0387947860bb5..2e54e87a4654998d4c63d135e4e4bac404243d60 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -80,7 +80,10 @@
     owner: root
     group: root
     mode: 0640
-  when: root_bashrc_stat.stat.checksum == "b737c392222ddac2271cc8d0d8cc0308d08cf458"
+  # Checksums: buster, bullseye
+  when: |
+    root_bashrc_stat.stat.checksum == "b737c392222ddac2271cc8d0d8cc0308d08cf458" or
+    root_bashrc_stat.stat.checksum == "1a422a148ad225aa5ba33f8dafd2b7cfcdbd701f"
 
 - name: Install sudo
   apt:
@@ -104,7 +107,7 @@
     owner: root
     group: root
     mode: 0644
-  when: "'emacs24' in common_packages or 'emacs24-nox' in common_packages"
+  when: "['emacs24', 'emacs24-nox', 'emacs25', 'emacs25-nox', 'emacs', 'emacs-nox'] | intersect(common_packages) | length > 0"
 
 - name: Set-up operating system groups
   group:
@@ -183,6 +186,15 @@
     name: ferm
     state: present
 
+- name: Prevent ferm from using legacy iptables tools
+  lineinfile:
+    path: "/usr/sbin/ferm"
+    regexp: "legacy_name.*="
+    line: "        my $legacy_name = $1 . '-do-not-use-legacy-' . $2;"
+    state: present
+  notify:
+    - Restart ferm
+
 - name: Configure ferm init script coniguration file
   copy:
     src: "ferm"
@@ -323,8 +335,8 @@
   with_items:
     - name: pipreqcheck
       virtualenv_path: "/var/lib/pipreqcheck/virtualenv"
-      python_path: "/usr/bin/python"
-      creates: "/var/lib/pipreqcheck/virtualenv/bin/python2"
+      python_path: "/usr/bin/python2.7"
+      creates: "/var/lib/pipreqcheck/virtualenv/bin/python2.7"
     - name: pipreqcheck-py3
       virtualenv_path: "/var/lib/pipreqcheck/virtualenv-py3"
       python_path: "/usr/bin/python3"