diff --git a/ansible/inventory/group_vars/all/source-repositories b/ansible/inventory/group_vars/all/source-repositories
index 82533372..3f141571 100644
--- a/ansible/inventory/group_vars/all/source-repositories
+++ b/ansible/inventory/group_vars/all/source-repositories
@@ -100,6 +100,13 @@ source_repositories:
       - codeowners:
           content: "{{ community_files.codeowners.kayobe }}"
           dest: ".github/CODEOWNERS"
+  terraform-kayobe-multinode:
+    repository_type: "single-branch"
+    workflows: []
+    community_files:
+      - codeowners:
+          content: "{{ community_files.codeowners.kayobe }}"
+          dest: ".github/CODEOWNERS"
   bifrost:
     ignored_releases:
       - victoria
diff --git a/terraform/github-runners/ansible/site.yml b/terraform/github-runners/ansible/site.yml
index 23b9449a..dba22cec 100644
--- a/terraform/github-runners/ansible/site.yml
+++ b/terraform/github-runners/ansible/site.yml
@@ -17,7 +17,7 @@
     # Start the service manually.
     - name: Ensure runner service is running
       ansible.builtin.service:
-        name: actions.runner.stackhpc-stackhpc-release-train.{{ ansible_facts.hostname }}.service
+        name: actions.runner.{{ github_account }}-{{ github_repo }}.{{ ansible_facts.hostname }}.service
         state: started
         enabled: true
       become: true
diff --git a/terraform/github/branches.tf b/terraform/github/branches.tf
index 3c58f5cc..7c99c8bd 100644
--- a/terraform/github/branches.tf
+++ b/terraform/github/branches.tf
@@ -26,10 +26,6 @@ resource "github_branch_protection" "ansible_branch_protection" {
     contexts = lookup(var.required_status_checks, each.key, { "default" : [] }).default
     strict   = false
   }
-
-  lifecycle {
-    prevent_destroy = true
-  }
 }
 
 resource "github_branch_protection" "batch_branch_protection" {
@@ -55,10 +51,6 @@ resource "github_branch_protection" "batch_branch_protection" {
     contexts = lookup(var.required_status_checks, each.key, { "default" : [] }).default
     strict   = false
   }
-
-  lifecycle {
-    prevent_destroy = true
-  }
 }
 
 resource "github_branch_protection" "kayobe_branch_protection_py_3-6" {
@@ -94,10 +86,6 @@ resource "github_branch_protection" "kayobe_branch_protection_py_3-6" {
     }).default)
     strict = false
   }
-
-  lifecycle {
-    prevent_destroy = false
-  }
 }
 
 resource "github_branch_protection" "kayobe_branch_protection_py_3-10" {
@@ -129,10 +117,6 @@ resource "github_branch_protection" "kayobe_branch_protection_py_3-10" {
     }).default)
     strict = false
   }
-
-  lifecycle {
-    prevent_destroy = true
-  }
 }
 
 resource "github_branch_protection" "openstack_branch_protection_py_3-6" {
@@ -168,9 +152,6 @@ resource "github_branch_protection" "openstack_branch_protection_py_3-6" {
     }).default)
     strict = false
   }
-  lifecycle {
-    prevent_destroy = true
-  }
 }
 
 resource "github_branch_protection" "openstack_branch_protection_py_3-10" {
@@ -202,10 +183,6 @@ resource "github_branch_protection" "openstack_branch_protection_py_3-10" {
     }).default)
     strict = false
   }
-
-  lifecycle {
-    prevent_destroy = false
-  }
 }
 
 resource "github_branch_protection" "platform_branch_protection" {
@@ -231,10 +208,6 @@ resource "github_branch_protection" "platform_branch_protection" {
     contexts = lookup(var.required_status_checks, each.key, { "default" : [] }).default
     strict   = false
   }
-
-  lifecycle {
-    prevent_destroy = true
-  }
 }
 
 resource "github_branch_protection" "releasetrain_branch_protection" {
@@ -260,10 +233,6 @@ resource "github_branch_protection" "releasetrain_branch_protection" {
     contexts = lookup(var.required_status_checks, each.key, { "default" : [] }).default
     strict   = false
   }
-
-  lifecycle {
-    prevent_destroy = true
-  }
 }
 
 resource "github_branch_protection" "smslab_branch_protection" {
@@ -289,9 +258,5 @@ resource "github_branch_protection" "smslab_branch_protection" {
     contexts = lookup(var.required_status_checks, each.key, { "default" : [] }).default
     strict   = false
   }
-
-  lifecycle {
-    prevent_destroy = true
-  }
 }
 
diff --git a/terraform/github/terraform.tfvars.json b/terraform/github/terraform.tfvars.json
index b41218c0..1cabfad2 100644
--- a/terraform/github/terraform.tfvars.json
+++ b/terraform/github/terraform.tfvars.json
@@ -54,16 +54,17 @@
       "caas-slurm-appliance"
     ],
     "Kayobe": [
+      "bifrost",
       "kolla",
       "kayobe",
       "kayobe-automation",
       "kolla-ansible",
       "openstack-admin-guide",
       "stackhpc-kayobe-config",
-      "ansible-collection-kayobe-workflows"
+      "ansible-collection-kayobe-workflows",
+      "terraform-kayobe-multinode"
     ],
     "OpenStack": [
-      "bifrost",
       "barbican",
       "cinder",
       "cloudkitty",