diff --git a/ansible/inventory/group_vars/all/source-repositories b/ansible/inventory/group_vars/all/source-repositories
index a913da22..85f6202a 100644
--- a/ansible/inventory/group_vars/all/source-repositories
+++ b/ansible/inventory/group_vars/all/source-repositories
@@ -108,6 +108,7 @@ source_repositories:
       - codeowners:
           content: "{{ community_files.codeowners.kayobe }}"
           dest: ".github/CODEOWNERS"
+  # OpenStack team
   bifrost:
     ignored_releases:
       - victoria
@@ -117,9 +118,8 @@ source_repositories:
       - master
     community_files:
       - codeowners:
-          content: "{{ community_files.codeowners.kayobe }}"
+          content: "{{ community_files.codeowners.openstack }}"
           dest: ".github/CODEOWNERS"
-  # OpenStack team
   barbican:
     ignored_releases:
       - victoria
diff --git a/terraform/github/terraform.tfvars.json b/terraform/github/terraform.tfvars.json
index 9f2b2923..68699bdd 100644
--- a/terraform/github/terraform.tfvars.json
+++ b/terraform/github/terraform.tfvars.json
@@ -44,6 +44,7 @@
       "caas-slurm-appliance"
     ],
     "Kayobe": [
+      "beokay",
       "kolla",
       "kayobe",
       "kayobe-automation",