diff --git a/roles/builder_repo/files/builder-infrastructure.repo b/roles/builder_repo/files/builder-infrastructure.repo
deleted file mode 100644
index ef6b4f23a4..0000000000
--- a/roles/builder_repo/files/builder-infrastructure.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[builder-infrastructure]
-name=Builder Packages from Fedora Infrastructure $releasever - $basearch
-baseurl=http://infrastructure.fedoraproject.org/repo/builder-rpms/$releasever/$basearch/
-enabled=1
-gpgcheck=1
-gpgkey=http://infrastructure.fedoraproject.org/repo/RPM-GPG-KEY-INFRASTRUCTURE
diff --git a/roles/builder_repo/tasks/main.yml b/roles/builder_repo/tasks/main.yml
deleted file mode 100644
index 917a89e8ef..0000000000
--- a/roles/builder_repo/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Add builder infra yum repo
-  ansible.builtin.file: dest=/etc/yum.repos.d/builder-infrastructure.repo state=absent
-  tags:
-  - builder_infra
diff --git a/roles/collectd/fcomm-queue/files/fcomm-queue-collectd.py b/roles/collectd/fcomm-queue/files/fcomm-queue-collectd.py
deleted file mode 100644
index 80978f87af..0000000000
--- a/roles/collectd/fcomm-queue/files/fcomm-queue-collectd.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-import retask.queue
-import socket
-import time
-
-interval = 2
-
-# Use FQDN
-hostname = socket.gethostname()
-
-queue = retask.queue.Queue('fedora-packages')
-queue.connect()
-
-while True:
-    print "PUTVAL %s/redis/queue_length interval=%i %i:%i" % (
-        hostname,
-        interval,
-        int(time.time()),
-        queue.length,
-    )
-    time.sleep(interval)
diff --git a/roles/collectd/fcomm-queue/files/fcomm-queue.conf b/roles/collectd/fcomm-queue/files/fcomm-queue.conf
deleted file mode 100644
index 44fe541a3a..0000000000
--- a/roles/collectd/fcomm-queue/files/fcomm-queue.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LoadPlugin exec
-<Plugin exec>
-    Exec "redis" "/usr/local/bin/fcomm-queue-collectd"
-</Plugin>
diff --git a/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.mod b/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.mod
deleted file mode 100644
index c95ef0cd5b..0000000000
Binary files a/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.mod and /dev/null differ
diff --git a/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.pp b/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.pp
deleted file mode 100644
index c22da3b0e1..0000000000
Binary files a/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.pp and /dev/null differ
diff --git a/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.te b/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.te
deleted file mode 100644
index bb7c6ec5d0..0000000000
--- a/roles/collectd/fcomm-queue/files/selinux/fi-collectd-fcomm.te
+++ /dev/null
@@ -1,17 +0,0 @@
-
-module fi-collectd-fcomm 1.0;
-
-require {
-	type bin_t;
-	type collectd_t;
-	type ldconfig_exec_t;
-    type shell_exec_t;
-	class file { read getattr open ioctl execute execute_no_trans };
-    class lnk_file { read };
-}
-
-allow collectd_t bin_t:file ioctl;
-allow collectd_t bin_t:lnk_file read;
-allow collectd_t ldconfig_exec_t:file { read execute open execute_no_trans };
-
-allow collectd_t shell_exec_t:file { getattr execute_no_trans };
diff --git a/roles/collectd/fcomm-queue/tasks/main.yml b/roles/collectd/fcomm-queue/tasks/main.yml
deleted file mode 100644
index a50b6f2e77..0000000000
--- a/roles/collectd/fcomm-queue/tasks/main.yml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-
-- name: Install python-retask
-  ansible.builtin.package: name=python-retask state=present
-  tags:
-  - collectd
-
-- name: Copy in /usr/local/bin/fcomm-queue-collectd
-  ansible.builtin.copy: >
-    src=fcomm-queue-collectd.py
-    dest=/usr/local/bin/fcomm-queue-collectd
-    mode=0755
-  tags:
-  - collectd
-  notify: Restart collectd
-
-- name: Copy in /etc/collectd.d/fcomm-queue.conf
-  ansible.builtin.copy: >
-    src=fcomm-queue.conf
-    dest=/etc/collectd.d/fcomm-queue-conf
-  tags:
-  - collectd
-  notify: Restart collectd
-
-# Three tasks for handling our custom selinux module.
-- name: Ensure a directory exists for our custom selinux module
-  ansible.builtin.file: dest=/usr/share/collectd state=directory
-  tags:
-  - collectd
-  - selinux
-
-- name: Copy over our fcomm collectd selinux module
-  ansible.builtin.copy: src=selinux/fi-collectd-fcomm.pp dest=/usr/share/collectd/fi-collectd-fcomm.pp
-  register: ficfcomm_module
-  tags:
-  - collectd
-  - selinux
-
-- name: Check to see if its even installed yet
-  ansible.builtin.shell: semodule -l | grep fi-collectd-fcomm | wc -l
-  register: ficfcomm_grep
-  check_mode: no
-  changed_when: "'0' in ficfcomm_grep.stdout"
-  tags:
-  - collectd
-  - selinux
-
-- name: Install our fcomm collectd selinux module
-  ansible.builtin.command: semodule -i /usr/share/collectd/fi-collectd-fcomm.pp
-  when: ficfcomm_module is changed or ficfcomm_grep is changed
-  tags:
-  - collectd
-  - selinux
-
-- name: Lastly, set some selinux booleans
-  seboolean: name={{item}} persistent=yes state=yes
-  with_items:
-  - collectd_tcp_network_connect
-  tags:
-  - collectd
-  - selinux
diff --git a/roles/collectd/web-service/tasks/main.yml b/roles/collectd/web-service/tasks/main.yml
deleted file mode 100644
index 22ee219c9f..0000000000
--- a/roles/collectd/web-service/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-
-- name: Copy in /usr/local/bin/web-service-collectd
-  ansible.builtin.template: >
-    src=web-service-collectd.py
-    dest="/usr/local/bin/web-service-collectd-{{ site }}"
-    mode=0755
-  tags:
-  - collectd
-  notify: Restart collectd
-
-- name: Copy in /etc/collectd.d/web-service.conf
-  ansible.builtin.template: >
-    src=web-service.conf
-    dest=/etc/collectd.d/{{ site }}.conf
-  tags:
-  - collectd
-  notify: Restart collectd
-
-- name: Let collectd talk to apache over tcp
-  seboolean: name=collectd_tcp_network_connect state=yes persistent=yes
-  tags:
-  - collectd
-  ignore_errors: true
diff --git a/roles/collectd/web-service/templates/web-service-collectd.py b/roles/collectd/web-service/templates/web-service-collectd.py
deleted file mode 100644
index a29935c815..0000000000
--- a/roles/collectd/web-service/templates/web-service-collectd.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-""" monitor website request times for collectd """
-
-import time
-import socket
-import urllib
-
-
-hostname = socket.gethostname()  # Use FQDN, I guess..
-
-
-def get_loadtime(url):
-    start = time.time()
-    _ = urllib.urlopen(url)
-    return time.time() - start
-
-
-if __name__ == '__main__':
-    site = "{{ site }}"
-    url = "{{ url }}"
-    interval = int("{{ interval }}")
-
-    try:
-        while True:
-            loadtime = get_loadtime(url)
-            timestamp = int(time.time())
-            print "PUTVAL %s/%s/delay-%s interval=%i %i:%f" % (
-                hostname, 'web', site, interval, timestamp, loadtime)
-            time.sleep((interval - (loadtime % interval)) % interval)
-    except KeyboardInterrupt:
-        pass
diff --git a/roles/collectd/web-service/templates/web-service.conf b/roles/collectd/web-service/templates/web-service.conf
deleted file mode 100644
index 8cd8116e74..0000000000
--- a/roles/collectd/web-service/templates/web-service.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LoadPlugin exec
-<Plugin exec>
-    Exec "nobody" "/usr/local/bin/web-service-collectd-{{ site }}"
-</Plugin>
diff --git a/roles/gitolite/base/tasks/main.yml b/roles/gitolite/base/tasks/main.yml
deleted file mode 100644
index af550810f5..0000000000
--- a/roles/gitolite/base/tasks/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# tasklist for setting up a basic gitolite
-
-- name: Install the needed packages
-  ansible.builtin.package: name={{item}} state=present
-  with_items:
-  - gitolite3
-  - perl-Sys-Syslog
-
-- name: Ensure the /etc/gitolite directory
-  ansible.builtin.file: path=/etc/gitolite owner=root group=root mode=0755 state=directory
diff --git a/roles/koji_db/tasks/main.yml b/roles/koji_db/tasks/main.yml
deleted file mode 100644
index 7f8dc04e1c..0000000000
--- a/roles/koji_db/tasks/main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-#
-# These tasks only run on koji db servers from the postgresql playbook
-#
-#
-# create a koji db user to own the db with the kojidatabasepassword from private
-#
-- name: Koji db user
-  postgresql_user: name=koji password={{ aarch64kojidatabasepassword }}
-  tags:
-  - db
-  when: is_kojidb == "True"
-#
-# create a koji database if not already created
-#
-- name: Databases creation
-  postgresql_db: name=koji owner=koji encoding=UTF-8
-  tags:
-  - db
-  when: is_kojidb == "True"
-#
-# Load the initial schema and create a file to note that it's loaded now.
-#
-- name: Load initial schema
-  ansible.builtin.shell: creates=/var/lib/pgql/koji-schema psql koji koji < /usr/share/doc/koji*/docs/schema.sql
-  tags:
-  - db
-  when: is_kojidb == "True"