diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
deleted file mode 100644
index f2aca68..0000000
--- a/.github/workflows/tag.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Tag
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release version (e.g. v0.1.0)'
-        required: true
-      message:
-        description: 'Tag message'
-        required: true
-
-jobs:
-  create-tag:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Create Tag
-        uses: negz/create-tag@39bae1e0932567a58c20dea5a1a0d18358503320 # v1
-        with:
-          version: ${{ github.event.inputs.version }}
-          message: ${{ github.event.inputs.message }}
-          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CODEOWNERS b/CODEOWNERS
index d152911..a38d819 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -19,4 +19,4 @@
 # See also OWNERS.md for governance details
 
 # Fallback owners
-*			@sergenyalcin @turkenf @negz
+*			@sergenyalcin @turkenf @negz @stevendborrelli @phisco
diff --git a/OWNERS.md b/OWNERS.md
index 765224c..caabd9c 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -11,8 +11,10 @@ This page lists all maintainers for **this** repository. Each repository in the
 repository maintainers in their own `OWNERS.md` file.
 
 ## Maintainers
-* Nic Cope <negz@upbound.com> ([negz](https://github.com/negz))
-* Sergen Yalcin <sergen@upbound.com> ([sergenyalcin](https://github.com/sergenyalcin))
-* Fatih Turken <fatih@upbound.com> ([turkenf](https://github.com/turkenf))
+* Nic Cope <negz@upbound.io> ([negz](https://github.com/negz))
+* Sergen Yalcin <sergen@upbound.io> ([sergenyalcin](https://github.com/sergenyalcin))
+* Fatih Turken <fatih@upbound.io> ([turkenf](https://github.com/turkenf))
+* Steven Borrelli <steven@upbound.io> ([stevendborrelli](https://github.com/stevendborrelli))
+* Philippe Scorsolini <philippe.scorsolini@upbound.io> ([phisco](https://github.com/phisco))
 
 See [CODEOWNERS](./CODEOWNERS) for automatic PR assignment.