diff --git a/.github/workflows/publishdocker-branch.yml b/.github/workflows/publishdocker-branch.yml
index 0bfe6ee4..d8ef62fa 100644
--- a/.github/workflows/publishdocker-branch.yml
+++ b/.github/workflows/publishdocker-branch.yml
@@ -4,16 +4,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - name: Get branch
-      run: echo ::set-env name=BRANCH::${GITHUB_REF#refs/heads/}
-    - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
-      env:
-        VERSION: ${{ github.sha }}
-      with:
-        name: tautulli/tautulli
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        dockerfile: Dockerfile
-        buildargs: VERSION, BRANCH
+      - name: Checkout Code
+        uses: actions/checkout@master
+      - name: Get Branch
+        run: echo ::set-env name=BRANCH::${GITHUB_REF#refs/heads/}
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@master
+        env:
+          VERSION: ${{ github.sha }}
+        with:
+          name: tautulli/tautulli
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          dockerfile: Dockerfile
+          buildargs: VERSION, BRANCH
diff --git a/.github/workflows/publishdocker-release.yml b/.github/workflows/publishdocker-release.yml
index cc42942d..b3194fff 100644
--- a/.github/workflows/publishdocker-release.yml
+++ b/.github/workflows/publishdocker-release.yml
@@ -6,19 +6,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - name: Get branch
-      run: echo ::set-env name=BRANCH::${GITHUB_REF#refs/heads/}
-    - name: Get release version
-      run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//}
-    - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
-      env:
-        VERSION: ${{ github.sha }}
-      with:
-        name: tautulli/tautulli
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        dockerfile: Dockerfile
-        buildargs: VERSION, BRANCH
-        tags: ${{ env.RELEASE_VERSION }}
+      - name: Checkout Code
+        uses: actions/checkout@master
+      - name: Get Branch
+        run: echo ::set-env name=BRANCH::${GITHUB_REF#refs/heads/}
+      - name: Get Release Version
+        run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//}
+      - name: Publish to Registry
+        uses: elgohr/Publish-Docker-Github-Action@master
+        env:
+          VERSION: ${{ github.sha }}
+        with:
+          name: tautulli/tautulli
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          dockerfile: Dockerfile
+          buildargs: VERSION, BRANCH
+          tags: ${{ env.RELEASE_VERSION }}
diff --git a/.github/workflows/publishrelease-beta.yml b/.github/workflows/publishrelease-beta.yml
new file mode 100644
index 00000000..28183600
--- /dev/null
+++ b/.github/workflows/publishrelease-beta.yml
@@ -0,0 +1,29 @@
+name: Create Pre-Release
+on:
+  push:
+    tags:
+      - 'v*-beta'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@master
+      - name: Get Release Version
+        run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//}
+      - name: Get Changelog
+        run: echo ::set-env name=CHANGELOG::"$( sed -n '/^## /{p; :loop n; p; /^## /q; b loop}' CHANGELOG.md | sed '$d' | sed '$d' | sed '$d' | sed ':a;N;$!ba;s/\n/%0A/g' )"
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_VERSION }}
+          release_name: Tautulli ${{ env.RELEASE_VERSION }}
+          body: |
+            ## Changelog
+            
+            ##${{ env.CHANGELOG }}
+          draft: false
+          prerelease: true
diff --git a/.github/workflows/publishrelease-master.yml b/.github/workflows/publishrelease-master.yml
new file mode 100644
index 00000000..e7795681
--- /dev/null
+++ b/.github/workflows/publishrelease-master.yml
@@ -0,0 +1,30 @@
+name: Create Release
+on:
+  push:
+    tags:
+      - 'v*'
+      - '!v*-beta'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@master
+      - name: Get Release Version
+        run: echo ::set-env name=RELEASE_VERSION::${GITHUB_REF/refs\/tags\//}
+      - name: Get Changelog
+        run: echo ::set-env name=CHANGELOG::"$( sed -n '/^## /{p; :loop n; p; /^## /q; b loop}' CHANGELOG.md | sed '$d' | sed '$d' | sed '$d' | sed ':a;N;$!ba;s/\n/%0A/g' )"
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.RELEASE_VERSION }}
+          release_name: Tautulli ${{ env.RELEASE_VERSION }}
+          body: |
+            ## Changelog
+            
+            ##${{ env.CHANGELOG }}
+          draft: false
+          prerelease: false