diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 6996c0a..f981c19 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -19,12 +19,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  success:
+  build:
     strategy:
       matrix:
-        os: [windows, macos, ubuntu]
+        os: [ windows-2022, macos-12, ubuntu-22.04 ]
       fail-fast: false
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     steps:
       # Checkout the repository
       - name: Checkout
@@ -33,3 +33,15 @@ jobs:
         with:
           check-command: ./gradlew check runAll --parallel
           should-deploy: false
+  success:
+    runs-on: ubuntu-22.04
+    needs:
+      - build
+    if: >-
+      always() && (
+        contains(join(needs.*.result, ','), 'failure')
+        || !contains(join(needs.*.result, ','), 'cancelled')
+      )
+    steps:
+      - name: Verify that there were no failures
+        run: ${{ !contains(join(needs.*.result, ','), 'failure') }}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b1624c4..3499ded 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6b536db..c46dd4e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,6 +2,7 @@ rootProject.name = "protelis-alchemist-tutorial"
 
 plugins {
     id("com.gradle.enterprise") version "3.16"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
     id("org.danilopianini.gradle-pre-commit-git-hooks") version "1.1.16"
 }
 
@@ -13,8 +14,6 @@ gradleEnterprise {
     }
 }
 
-enableFeaturePreview("VERSION_CATALOGS")
-
 gitHooks {
     commitMsg { conventionalCommits() }
     createHooks()