From b564e9de8bdcc0f0d2423723116c68b7f17b04df Mon Sep 17 00:00:00 2001
From: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
Date: Tue, 3 Dec 2024 17:22:49 +0000
Subject: [PATCH 1/2] backport of commit
 5ce7b8c0d67dae83df3e2995bfff58cc9146fbc5

---
 CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 44fba948e1..784b2c77dc 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -4,8 +4,8 @@
 
 # release configuration
 
-/.release/                               @hashicorp/github-secure-boundary
-/.github/workflows/build.yml             @hashicorp/github-secure-boundary
+/.release/                               @hashicorp/team-selfmanaged-releng
+/.github/workflows/build.yml             @hashicorp/team-selfmanaged-releng
 
 # education
 

From 99bf1e07a6ee0d9c1d1f469c4f8b87c2aba5b5bc Mon Sep 17 00:00:00 2001
From: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
Date: Tue, 3 Dec 2024 17:29:12 +0000
Subject: [PATCH 2/2] backport of commit
 edcf4b33bc917c73f654ad86855c81dc73bdc82f

---
 CODEOWNERS | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 784b2c77dc..cf8401253b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,11 +2,6 @@
 # the repo, unless a later match takes precedence.
 @hashicorp/boundary
 
-# release configuration
-
-/.release/                               @hashicorp/team-selfmanaged-releng
-/.github/workflows/build.yml             @hashicorp/team-selfmanaged-releng
-
 # education
 
 /website/content/                        @hashicorp/boundary-education-approvers