diff --git a/inventory/group_vars/maintainer_test b/inventory/group_vars/maintainer_test
index 8b15d8ac5f..1838bd8a6f 100644
--- a/inventory/group_vars/maintainer_test
+++ b/inventory/group_vars/maintainer_test
@@ -2,7 +2,6 @@
 freezes: false
 sudoers: "{{ private }}/files/sudo/arm-packager-sudoers"
 sudoers_main: nopasswd
-host_group: cloud
 datacenter: aws
 ansible_ifcfg_blocklist: true 
 
diff --git a/inventory/host_vars/aarch64-test01.fedorainfracloud.org b/inventory/host_vars/aarch64-test01.fedorainfracloud.org
index b61f03b019..25136dfcea 100644
--- a/inventory/host_vars/aarch64-test01.fedorainfracloud.org
+++ b/inventory/host_vars/aarch64-test01.fedorainfracloud.org
@@ -1,3 +1,2 @@
 datacenter: aws
 inventory_hostname: "aarch64-test01.fedorainfracloud.org"
-
diff --git a/inventory/host_vars/el6-test.fedorainfracloud.org b/inventory/host_vars/el6-test.fedorainfracloud.org
deleted file mode 100644
index 94698808d1..0000000000
--- a/inventory/host_vars/el6-test.fedorainfracloud.org
+++ /dev/null
@@ -1,19 +0,0 @@
----
-tcp_ports: [22]
-
-datacenter: aws
-nagios_Check_Services:
-  mail: false
-  nrpe: false
-  sshd: false
-  named: false
-  dhcpd: false
-  httpd: false
-  swap: false
-  ping: false
-  raid: false
-
-ansible_ssh_user: centos
-ansible_become: true
-ansible_become_user: root
-ansible_become_method: sudo
diff --git a/playbooks/groups/copr-hypervisor.yml b/playbooks/groups/copr-hypervisor.yml
index 0592d93912..d13708ec4a 100644
--- a/playbooks/groups/copr-hypervisor.yml
+++ b/playbooks/groups/copr-hypervisor.yml
@@ -18,9 +18,7 @@
     - import_role: name=nagios_client
     - import_role: name=openvpn/client
     - import_role: name=ipa/client
-    - import_role: name=sudo
 
-    - import_tasks: "{{ tasks_path }}/2fa_client.yml"
     - import_tasks: "{{ tasks_path }}/motd.yml"
 
   handlers:
diff --git a/playbooks/groups/maintainer-test.yml b/playbooks/groups/maintainer-test.yml
index 124ac0ae93..79fcc74fc5 100644
--- a/playbooks/groups/maintainer-test.yml
+++ b/playbooks/groups/maintainer-test.yml
@@ -1,58 +1,5 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=aarch64_test:armv7_test"
-
-- name: Do some basic cloud setup on them
-  hosts: maintainer_test:aarch64_test:armv7_test
-  gather_facts: True
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - /srv/private/ansible/vars.yml
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  pre_tasks:
-  - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
-  - name: set hostname (required by some services, at least postfix need it)
-    hostname: name="{{inventory_hostname}}"
-
-- name: setup second disk on aws maintainer-test instances
-  hosts: maintainer_test:\!ppc64le-test.fedorainfracloud.org
-  gather_facts: True
-  tags:
-   - maintainer-test
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  tasks:
-
-  - name: make a partition on first disk
-    parted: device=/dev/nvme0n1 number=1 state=present
-    tags:
-     - maintainer-test
-    when: inventory_hostname.startswith(('f30-test'))
-
-  - name: format the partition if it's not already
-    filesystem: dev=/dev/nvme0n1p1 fstype=ext4
-    tags:
-     - maintainer-test
-    when: inventory_hostname.startswith(('f30-test'))
-    ignore_errors: true
-
-  - name: mount cache filesystem on /var/cache/mock
-    mount: path=/var/cache/mock state=mounted src=/dev/nvme0n1p1 fstype=ext4
-    tags:
-     - maintainer-test
-    when: inventory_hostname.startswith(('f30-test'))
-
-  - name: bind mount cache filesystem on /var/lib/mock
-    mount: path=/var/lib/mock state=mounted src=/var/cache/mock fstype=none opts=bind
-    tags:
-     - maintainer-test
-    when: inventory_hostname.startswith(('f30-test'))
-
 - name: Setup maintainer test hosts
-  hosts: maintainer_test:aarch64_test:armv7_test
+  hosts: maintainer_test
   gather_facts: True
   tags:
    - maintainer-test
@@ -72,7 +19,6 @@
   - hosts
   - openvpn/client
   - ipa/client
-  - sudo
 
   tasks:
   # this is how you include other task lists
@@ -82,7 +28,7 @@
     dnf: state=present pkg={{ item }}
     with_items:
     - fedora-packager
-    when: ansible_distribution_major_version|int >= 29 and ansible_distribution == 'Fedora'
+    when: ansible_distribution == 'Fedora'
     tags:
     - packages