diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml
index 3f5269b..62812f1 100644
--- a/.github/workflows/deploy_snapshot.yml
+++ b/.github/workflows/deploy_snapshot.yml
@@ -15,7 +15,7 @@ on:
     types: [ trigger_after_upstream_deploy ]
 
 env:
-  GRADLE_VERSION: 7.6.4 # Gradle version used
+  GRADLE_VERSION: 8.5 # Gradle version used
   GRADLE_CLI_OPTS: "-Pci --build-cache " # CLI options passed to Gradle
   GRADLE_BUILD_ACTION_CACHE_KEY_JOB: "test-cache-${{ github.head_ref }}.${{ github.sha }}"
 
@@ -29,6 +29,11 @@ jobs:
     steps:
       - name: Checkout project sources
         uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
@@ -45,6 +50,11 @@ jobs:
     steps:
       - name: Checkout project sources
         uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
diff --git a/.github/workflows/test_branch.yml b/.github/workflows/test_branch.yml
index 77dcf7a..7489733 100644
--- a/.github/workflows/test_branch.yml
+++ b/.github/workflows/test_branch.yml
@@ -12,7 +12,7 @@ on:
     branches-ignore: [ "dev" ] # Do not run this on the default branch
 
 env:
-  GRADLE_VERSION: 7.6.4 # Gradle version used
+  GRADLE_VERSION: 8.5 # Gradle version used
   GRADLE_CLI_OPTS: "-Pci --build-cache " # CLI options passed to Gradle
   GRADLE_BUILD_ACTION_CACHE_KEY_JOB: "test-cache-${{ github.head_ref }}.${{ github.sha }}"
 
@@ -26,6 +26,11 @@ jobs:
     steps:
       - name: Checkout project sources
         uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1f2e8e0..c9a907e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 # (c) https://github.com/MontiCore/monticore
 
-image: registry.git.rwth-aachen.de/monticore/container-registry/gradle:7.6.4-jdk11
+image: registry.git.rwth-aachen.de/monticore/container-registry/gradle:8.5-jdk21
 
 stages:
   - build