diff --git a/.github/workflows/rivet-deploy.yml b/.github/workflows/rivet-deploy.yml
index 7ea173b..efc8ffd 100644
--- a/.github/workflows/rivet-deploy.yml
+++ b/.github/workflows/rivet-deploy.yml
@@ -10,6 +10,7 @@ jobs:
     name: Prepare
     runs-on: ubuntu-20.04
     outputs:
+      ns_name_id: ${{ steps.derive_names.outputs.branch_name }}
       ns_name_id: ${{ steps.derive_names.outputs.ns_name_id }}
       version_name: ${{ steps.derive_names.outputs.version_name }}
     steps:
@@ -24,6 +25,7 @@ jobs:
           ns_name_id=$(echo $branch_name | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]\+/-/g' | cut -c 1-16)
           short_hash=$(git rev-parse --short HEAD)
           version_name="${short_hash} (${branch_name})"
+          echo "::set-output name=branch_name::$branch_name"
           echo "::set-output name=ns_name_id::$ns_name_id"
           echo "::set-output name=version_name::$version_name"
 
@@ -94,7 +96,7 @@ jobs:
       - name: Create Namespace
         run: |
           # Ignore error if namespace already exists
-          rivet namespace create --id "${{ needs.prepare.outputs.ns_name_id }}" --name "$(git rev-parse --abbrev-ref HEAD)" || true
+          rivet namespace create --id "${{ needs.prepare.outputs.ns_name_id }}" --name "${{ needs.prepare.outputs.branch_name }}" || true
 
       - name: Deploy Version
         run: |