diff --git a/.github/workflows/github-actions.yml b/.github/workflows/production-release.yml
similarity index 61%
rename from .github/workflows/github-actions.yml
rename to .github/workflows/production-release.yml
index b0b7028d6..f6f5abffe 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/production-release.yml
@@ -1,34 +1,28 @@
-name: release-coolify
+name: production-release
 
 on:
   release:
-    types: published
+    types: [published]
 
 jobs:
-  make-it-coolifyed:
+  making-something-cool:
     runs-on: ubuntu-latest
     steps:
-       -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
-       - 
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-       -
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-       -
-        name: Login to DockerHub
-        uses: docker/login-action@v1 
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-       - 
-         name: Get current package version
-         uses: martinbeentjes/npm-get-version-action@v1.2.3
-         id: package-version
-       -
-        name: Build and push
+      - name: Get current package version
+        uses: martinbeentjes/npm-get-version-action@v1.2.3
+        id: package-version
+      - name: Build and push
         uses: docker/build-push-action@v2
         with:
           context: .
diff --git a/.github/workflows/staging-release.yml b/.github/workflows/staging-release.yml
new file mode 100644
index 000000000..dbd30fec4
--- /dev/null
+++ b/.github/workflows/staging-release.yml
@@ -0,0 +1,31 @@
+name: staging-release
+
+on:
+  push:
+    branches:
+      - next
+
+jobs:
+  staging-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: coollabsio/coolify:next
+          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next
+          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next,mode=max