diff --git a/.github/workflows/freeagent-gem.yml b/.github/workflows/freeagent-gem.yml
index 62f7ad1..3e70639 100644
--- a/.github/workflows/freeagent-gem.yml
+++ b/.github/workflows/freeagent-gem.yml
@@ -2,10 +2,8 @@ name: Release Gem
 
 on:
   push:
-    branches:
-      - master
     paths:
-      - "lib/hermod/version.rb"
+      - 'lib/hermod/version.rb'
 
 jobs:
   release:
@@ -24,4 +22,14 @@ jobs:
       - name: Test
         run: bundle exec rake
 
-      - uses: rubygems/release-gem@v1
+      - name: Check for pre-release
+        id: is_prerelease
+        run: echo "is_prerelease=$(ruby -e 'puts Gem::Specification.load("hermod.gemspec").version.prerelease?')" >> "$GITHUB_OUTPUT"
+
+      - name: Create a Pre-release
+        if: ${{ github.ref != 'refs/heads/master' && steps.is_prerelease.outputs.is_prerelease == 'true' }}
+        uses: rubygems/release-gem@v1
+
+      - name: Create a Release
+        if: ${{ github.ref == 'refs/heads/master' && steps.is_prerelease.outputs.is_prerelease == 'false' }}
+        uses: rubygems/release-gem@v1