diff --git a/roles/remove/tasks/main.yml b/roles/remove/tasks/main.yml
new file mode 100644
index 000000000..b0d8af0c2
--- /dev/null
+++ b/roles/remove/tasks/main.yml
@@ -0,0 +1,9 @@
+---
+- name: 'Remove packages we do not need.'
+  ansible.builtin.yum:
+    state: absent
+    name:
+      - tuned
+      - polkit  # Security risk due to bug and we don't need it!
+  become: true
+...
diff --git a/single_group_playbooks/cluster_part1.yml b/single_group_playbooks/cluster_part1.yml
index 32ac087d8..9e0a6af5f 100644
--- a/single_group_playbooks/cluster_part1.yml
+++ b/single_group_playbooks/cluster_part1.yml
@@ -12,6 +12,7 @@
     - {role: spacewalk_client, when: repo_manager == 'spacewalk'}
     - {role: pulp_client, when: repo_manager == 'pulp'}
     - logrotate
+    - remove
     - update
     - logins
     - figlet_motd
diff --git a/single_group_playbooks/docs.yml b/single_group_playbooks/docs.yml
index d314b728a..d53b76111 100644
--- a/single_group_playbooks/docs.yml
+++ b/single_group_playbooks/docs.yml
@@ -8,6 +8,7 @@
     - admin_users
     - ssh_host_signer
     - logrotate
+    - remove
     - update
     - {role: geerlingguy.repo-epel, become: true}
     - sshd
diff --git a/single_group_playbooks/irods.yml b/single_group_playbooks/irods.yml
index d075021a5..626f126ec 100644
--- a/single_group_playbooks/irods.yml
+++ b/single_group_playbooks/irods.yml
@@ -43,6 +43,7 @@
     - pulp_client
     - {role: geerlingguy.security, become: true}
     - {role: geerlingguy.firewall, become: true}
+    - remove
     - update
     - docker
     - irods
diff --git a/single_group_playbooks/jumphost.yml b/single_group_playbooks/jumphost.yml
index 189a7d3d2..84b9e6e24 100644
--- a/single_group_playbooks/jumphost.yml
+++ b/single_group_playbooks/jumphost.yml
@@ -9,6 +9,7 @@
     - ssh_host_signer
     - ssh_known_hosts
     - logrotate
+    - remove
     - update
     - {role: geerlingguy.repo-epel, become: true}
     - {role: geerlingguy.firewall, become: true}
diff --git a/single_group_playbooks/repo.yml b/single_group_playbooks/repo.yml
index 954a52c11..472888654 100644
--- a/single_group_playbooks/repo.yml
+++ b/single_group_playbooks/repo.yml
@@ -13,6 +13,7 @@
     - static_hostname_lookup
     - sshd
     - {role: geerlingguy.security, become: true}
+    - remove
     - update
     - pulp_server
 ...
diff --git a/single_role_playbooks/remove.yml b/single_role_playbooks/remove.yml
new file mode 100644
index 000000000..0e5149d0f
--- /dev/null
+++ b/single_role_playbooks/remove.yml
@@ -0,0 +1,14 @@
+---
+- hosts:
+    - jumphost
+  roles:
+    - remove
+
+- hosts:
+    - repo
+    - cluster
+    - docs
+    - irods
+  roles:
+    - remove
+...