diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml
index 704b7aa50..329006f14 100644
--- a/.github/workflows/nightly-docker.yml
+++ b/.github/workflows/nightly-docker.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: Kareadita/Kavita-webui
-          ref: feature/sentry-release
+          ref: develop
           path: Kavita-webui/
 
       - name: NodeJS to Compile WebUI
@@ -69,4 +69,4 @@ jobs:
             description: 
             details: 'https://hub.docker.com/r/kizaing/kavita/tags?page=1&ordering=last_updated'
             text: A new nightly build has been released for docker.
-            webhookUrl: ${{ secrets.DISCORD_DOCKER_UPDATE_URL }}
\ No newline at end of file
+            webhookUrl: ${{ secrets.DISCORD_DOCKER_UPDATE_URL }}
diff --git a/.github/workflows/stable-docker.yml b/.github/workflows/stable-docker.yml
new file mode 100644
index 000000000..7b8a68c6e
--- /dev/null
+++ b/.github/workflows/stable-docker.yml
@@ -0,0 +1,63 @@
+name: CI to Docker Hub
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Check Out Repo
+        uses: actions/checkout@v2
+
+      - name: Check Out WebUI
+        uses: actions/checkout@v2
+        with:
+          repository: Kareadita/Kavita-webui
+          ref: main
+          path: Kavita-webui/
+
+      - name: NodeJS to Compile WebUI
+        uses: actions/setup-node@v2.1.5
+        with:
+          node-version: '14'
+      - run: |
+          cd Kavita-webui/ || exit
+          npm install
+          npm run prod
+          mv dist/ ../API/wwwroot
+          cd ../ || exit
+
+      - name: Compile dotnet app
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '5.0.x'
+      - run: ./action-build.sh
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: true
+          tags: kizaing/kavita:latest
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}