diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index 5304f0d4..66665139 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -102,6 +102,8 @@ jobs:
       matrix:
         release: [true, false]
     with:
+      linux_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}, {\"swift_version\": \"5.10\"}]"
+      windows_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]"
       linux_pre_build_command: |
         git config --global --add safe.directory "$(realpath .)"
         git config --local user.name 'swift-ci'
diff --git a/CODEOWNERS b/CODEOWNERS
index b1e1991a..925b7fa1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -8,7 +8,7 @@
 # See https://swift.org/CONTRIBUTORS.txt for Swift project authors
 #
 
-* @allevato @hamishknight @rintaro
+* @allevato @hborla @hamishknight @rintaro
 
-.github/ @shahmishal
-.swiftci/ @shahmishal
+.github/ @hborla @shahmishal
+.swiftci/ @hborla @shahmishal