diff --git a/playbooks/roles/install-ansible/tasks/install_ansible_collection.yaml b/playbooks/roles/install-ansible/tasks/install_ansible_collection.yaml
index f7b79073e1..a1f855f770 100644
--- a/playbooks/roles/install-ansible/tasks/install_ansible_collection.yaml
+++ b/playbooks/roles/install-ansible/tasks/install_ansible_collection.yaml
@@ -1,11 +1,11 @@
-- name: 'Ensure {{ item.namespace }}/{{ item.name }} directory'
+- name: 'Ensure {{ item.namespace }} top-level directory'
   file:
-    path: '/root/.ansible/collections/ansible_collections/{{ item.namespace }}/{{ item.name }}'
+    path: '/root/.ansible/collections/ansible_collections/{{ item.namespace }}/'
     state: directory
     mode: 0755
 
 - name: 'Link in {{ item.namespace }}/{{ item.name }} collection'
   file:
-    src: '{{ ansible_user_dir}}/src/github.com/{{repo}}'
+    src: '{{ ansible_user_dir}}/src/github.com/{{ item.repo }}'
     dest: '/root/.ansible/collections/ansible_collections/{{ item.namespace }}/{{ item.name }}'
     state: link
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 8cb8205b5b..ee27e3d790 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -81,6 +81,14 @@
         # NOTE(ianw): 2019-06-11 pinned to stable branch until we handle 1.0
         #  http://lists.openstack.org/pipermail/openstack-infra/2019-June/006400.html
         override-checkout: stable/0.x
+      - name: github.com/ansible-collections/ansible.posix
+        override-checkout: main
+      - name: github.com/ansible-collections/ansible.netcommon
+        override-checkout: main
+      - name: github.com/ansible-collections/community.crypto
+        override-checkout: main
+      - name: github.com/ansible-collections/community.general
+        override-checkout: main
     vars:
       bridge_ansible_name: '{{ ansible_user_dir}}/src/github.com/ansible/ansible'
       bridge_ansible_version: null