diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d8b80d1..2a7b539 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # Global rule:
-* @Bandwidth/dx
\ No newline at end of file
+* @Bandwidth/band-swi @Bandwidth/band-swi-github-repo-admin
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index dd1c336..e5c561c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -26,7 +26,7 @@ env:
 jobs:
   deploy_pre_release:
     name: Deploy OpenAPI Generator Client Pre-Release
-    if: ${{ !github.event.release.prerelease && github.event.release.target_commitish == 'feature/openapi-generator-sdk' }}
+    if: ${{ github.event.release.prerelease && github.event.release.target_commitish == 'feature/openapi-generator-sdk' }}
     runs-on: ubuntu-latest
     env:
       BW_PROJECT_NAME: src/Bandwidth.Standard
@@ -37,9 +37,9 @@ jobs:
       
       - name: Check Release Tag Format
         run: |
-          re=[0-9]+\.[0-9]+\.[0-9]+b[0-9]+
+          re=^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(beta|alpha|rc))(\.[0-9]+)?$
           if ! [[ $RELEASE_VERSION =~ $re ]]; then
-            echo 'Tag does not match expected regex pattern for beta releases (v[0-9]+.[0-9]+.[0-9]+b[0-9]+)'
+            echo "Tag does not match expected regex pattern for beta releases ($re)"
             echo $RELEASE_VERSION
             echo 'Please update your tag to match the expected regex pattern'
             exit 1
@@ -88,9 +88,9 @@ jobs:
       
       - name: Check Release Tag Format
         run: |
-          re=[0-9]+\.[0-9]+\.[0-9]+[0-9]+
+          re=^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$
           if ! [[ $RELEASE_VERSION =~ $re ]]; then
-            echo 'Tag does not match expected regex pattern for beta releases (v[0-9]+.[0-9]+.[0-9]+[0-9]+)'
+            echo "Tag does not match expected regex pattern for releases ($re)"
             echo $RELEASE_VERSION
             echo 'Please update your tag to match the expected regex pattern'
             exit 1