diff --git a/roles/ensure-kubernetes/tasks/crio-Ubuntu-20.04.yaml b/roles/ensure-kubernetes/tasks/crio-Ubuntu-20.04.yaml
new file mode 100644
index 000000000..f389bc41d
--- /dev/null
+++ b/roles/ensure-kubernetes/tasks/crio-Ubuntu-20.04.yaml
@@ -0,0 +1,27 @@
+- name: Add all repositories
+  include_role:
+    name: ensure-package-repositories
+  vars:
+    repositories_keys:
+      - url: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_{{ ansible_distribution_version }}/Release.key"
+      - url: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.16/xUbuntu_{{ ansible_distribution_version }}/Release.key"
+    repositories_list:
+      - repo: "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_{{ ansible_distribution_version }}/ /"
+      - repo: "deb https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable:/cri-o:/1.16/xUbuntu_{{ ansible_distribution_version }}/ /"
+- name: Install packages
+  package:
+    name:
+      - cri-o-1.16
+      - containernetworking-plugins
+      - podman
+      - cri-tools
+    state: present
+  become: true
+- name: Set crio cgroup driver
+  ini_file:
+    path: /etc/crio/crio.conf
+    section: crio.runtime
+    option: cgroup_manager
+    value: '"cgroupfs"'
+    mode: 0644
+  become: true
diff --git a/roles/ensure-kubernetes/tasks/crio.yaml b/roles/ensure-kubernetes/tasks/crio-default.yaml
similarity index 100%
rename from roles/ensure-kubernetes/tasks/crio.yaml
rename to roles/ensure-kubernetes/tasks/crio-default.yaml
diff --git a/roles/ensure-kubernetes/tasks/minikube.yaml b/roles/ensure-kubernetes/tasks/minikube.yaml
index 08361d61c..26207ebe9 100644
--- a/roles/ensure-kubernetes/tasks/minikube.yaml
+++ b/roles/ensure-kubernetes/tasks/minikube.yaml
@@ -14,9 +14,16 @@
   include_role:
     name: ensure-docker
 
+# Ubuntu focal doesn't have cri-o-1.15 packages, per distro tasks is
+# required to install crio
 - name: Install crio
   when: kubernetes_runtime == 'cri-o'
-  include_tasks: crio.yaml
+  include_tasks: "{{ zj_distro_os }}"
+  with_first_found:
+    - "crio-{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
+    - "crio-default.yaml"
+  loop_control:
+    loop_var: zj_distro_os
 
 - name: Create .kube directory
   file:
diff --git a/test-playbooks/registry/buildset-registry-pre.yaml b/test-playbooks/registry/buildset-registry-pre.yaml
index 5976a9a15..ac0afc6d2 100644
--- a/test-playbooks/registry/buildset-registry-pre.yaml
+++ b/test-playbooks/registry/buildset-registry-pre.yaml
@@ -1,17 +1,9 @@
 - hosts: all
   roles:
-    - name: ensure-package-repositories
-      repositories_list:
-        - repo: ppa:projectatomic/ppa
+    - ensure-docker
+    - ensure-skopeo
 
   tasks:
-    - name: Install packages
-      become: true
-      package:
-        name:
-          - skopeo
-        state: present
-
     # This happens in the pre-playbook of the
     # opendev-buildset-registry job.  Since we're testing these roles
     # in opendev, and we're running a second buildset registry, we