diff --git a/.github/workflows/build-on-commit.yaml b/.github/workflows/build-on-commit.yaml
index 0d09768..246bb67 100644
--- a/.github/workflows/build-on-commit.yaml
+++ b/.github/workflows/build-on-commit.yaml
@@ -2,62 +2,22 @@ name: Build on commit
 on:
   push:
     branches:
-      - snapshot
-
-defaults:
-  run:
-    working-directory: ./template
-
+      - master
+      - next-version
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout OPENRNDR repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          repository: openrndr/openrndr
-          path: ./openrndr
-          ref: master
-
-      - name: Checkout ORX repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          repository: openrndr/orx
-          path: ./orx
-          ref: master
-
-      - name: Checkout current repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          repository: openrndr/openrndr-template
-          path: ./template
-          ref: snapshot
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21
+          #cache: 'gradle'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
 
-      - name: Set swap space
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 8
-
-      - name: Build OPENRNDR
-        working-directory: ./openrndr
-        run: ./gradlew publishToMavenLocal snapshot
-
-      - name: Build ORX
-        working-directory: ./orx
-        run: ./gradlew publishToMavenLocal snapshot
-
-      - name: Build template
-        working-directory: ./template
+      - name: Build sources
         run: ./gradlew build
-
diff --git a/.github/workflows/build-snapshot-on-commit.yaml b/.github/workflows/build-snapshot-on-commit.yaml
new file mode 100644
index 0000000..6c330ed
--- /dev/null
+++ b/.github/workflows/build-snapshot-on-commit.yaml
@@ -0,0 +1,63 @@
+name: Build snapshot on commit
+on:
+  push:
+    branches:
+      - snapshot
+
+defaults:
+  run:
+    working-directory: ./template
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout OPENRNDR repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          repository: openrndr/openrndr
+          path: ./openrndr
+          ref: master
+
+      - name: Checkout ORX repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          repository: openrndr/orx
+          path: ./orx
+          ref: master
+
+      - name: Checkout current repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          repository: openrndr/openrndr-template
+          path: ./template
+          ref: snapshot
+
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Set swap space
+        uses: pierotofy/set-swap-space@v1.0
+        with:
+          swap-size-gb: 8
+
+      - name: Build OPENRNDR
+        working-directory: ./openrndr
+        run: ./gradlew publishToMavenLocal snapshot
+
+      - name: Build ORX
+        working-directory: ./orx
+        run: ./gradlew publishToMavenLocal snapshot
+
+      - name: Build template
+        working-directory: ./template
+        run: ./gradlew build
+