diff --git a/ansible/inventory/group_vars/all/source-repositories b/ansible/inventory/group_vars/all/source-repositories
index 2e4b3031..7d33218f 100644
--- a/ansible/inventory/group_vars/all/source-repositories
+++ b/ansible/inventory/group_vars/all/source-repositories
@@ -341,27 +341,6 @@ source_repositories:
           content: "{{ community_files.codeowners.openstack }}"
           dest: ".github/CODEOWNERS"
   # Ansible team
-  ansible-role-os-host-aggregates:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
-  os-networks:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
-  ansible-role-os-projects:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
   ansible-role-libvirt-host:
     repository_type: "ansible"
     workflows: "{{ ansible_workflows.role }}"
@@ -376,13 +355,6 @@ source_repositories:
       - codeowners:
           content: "{{ community_files.codeowners.ansible }}"
           dest: ".github/CODEOWNERS"
-  ansible-role-os-images:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
   ansible-role-vxlan:
     repository_type: "ansible"
     workflows: "{{ ansible_workflows.role }}"
@@ -404,34 +376,6 @@ source_repositories:
       - codeowners:
           content: "{{ community_files.codeowners.ansible }}"
           dest: ".github/CODEOWNERS"
-  ansible-role-os-volumes:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
-  ansible-role-grubcmdline:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
-  ansible-role-os-flavors:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
-  ansible-role-os-openstacksdk:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
   ansible-role-sriov:
     repository_type: "ansible"
     workflows: "{{ ansible_workflows.role }}"
@@ -439,13 +383,6 @@ source_repositories:
       - codeowners:
           content: "{{ community_files.codeowners.ansible }}"
           dest: ".github/CODEOWNERS"
-  ansible-role-os-openstackclient:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
   ansible-timezone:
     repository_type: "ansible"
     workflows: "{{ ansible_workflows.role }}"
@@ -495,13 +432,6 @@ source_repositories:
       - codeowners:
           content: "{{ community_files.codeowners.ansible }}"
           dest: ".github/CODEOWNERS"
-  ansible-role-os-container-clusters:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
   ansible-role-cluster-infra:
     repository_type: "ansible"
     workflows: "{{ ansible_workflows.role }}"
@@ -579,13 +509,6 @@ source_repositories:
       - codeowners:
           content: "{{ community_files.codeowners.ansible }}"
           dest: ".github/CODEOWNERS"
-  ansible-role-os-deploy-templates:
-    repository_type: "ansible"
-    workflows: "{{ ansible_workflows.role }}"
-    community_files:
-      - codeowners:
-          content: "{{ community_files.codeowners.ansible }}"
-          dest: ".github/CODEOWNERS"
   ansible-role-mlnx-neo:
     repository_type: "ansible"
     workflows: "{{ ansible_workflows.role }}"
diff --git a/docs/usage/github-organisation-management.md b/docs/usage/github-organisation-management.md
index efec32e0..e9248baf 100644
--- a/docs/usage/github-organisation-management.md
+++ b/docs/usage/github-organisation-management.md
@@ -91,9 +91,7 @@ To add a repository to a team you can append the name of the repository to the d
 ```yml 
 "repositories": {
   "Ansible": [
-    "ansible-role-os-host-aggregates",
     "ansible-role-os-networks",
-    "ansible-role-os-projects",
     ...
     "ansible-collection-pulp",
     "ansible-collection-hashicorp",
diff --git a/terraform/github/terraform.tfvars.json b/terraform/github/terraform.tfvars.json
index 9f334529..f5b29dcb 100644
--- a/terraform/github/terraform.tfvars.json
+++ b/terraform/github/terraform.tfvars.json
@@ -2,20 +2,11 @@
   "owner": "stackhpc",
   "repositories": {
     "Ansible": [
-      "ansible-role-os-host-aggregates",
-      "os-networks",
-      "ansible-role-os-projects",
       "ansible-role-libvirt-host",
       "ansible-role-libvirt-vm",
-      "ansible-role-os-images",
       "drac",
       "ansible-role-luks",
-      "ansible-role-os-volumes",
-      "ansible-role-grubcmdline",
-      "ansible-role-os-flavors",
-      "ansible-role-os-openstacksdk",
       "ansible-role-sriov",
-      "ansible-role-os-openstackclient",
       "ansible-timezone",
       "ansible-role-os-shade",
       "ansible-role-grafana-conf",
@@ -23,7 +14,6 @@
       "monasca-default-alarms",
       "stackhpc.ssm",
       "ansible-role-monasca-rsyslog",
-      "ansible-role-os-container-clusters",
       "ansible-role-cluster-infra",
       "ansible-role-os-ironic-state",
       "ansible-role-openvpn",
@@ -35,7 +25,6 @@
       "ansible-role-gluster-cluster",
       "mellanox-switch",
       "ansible-role-os-config",
-      "ansible-role-os-deploy-templates",
       "ansible-role-mlnx-neo",
       "ansible-collection-cephadm",
       "ansible-collection-pulp",