diff --git a/.github/workflows/build-prs.yml b/.github/workflows/build-prs.yml
index 1c2db4fc2b..f74b9ff476 100644
--- a/.github/workflows/build-prs.yml
+++ b/.github/workflows/build-prs.yml
@@ -31,10 +31,10 @@ jobs:
         run:
           git switch -C pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.ref }}
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Setup with Gradle
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bf69c50ada..27940ca257 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
   release:
     uses: neoforged/actions/.github/workflows/gradle-publish.yml@main
     with:
-      java: 17
+      java: 21
       pre_gradle_tasks: setup
       gradle_tasks: publish '-Pneogradle.runtime.platform.installer.debug=false'
       version_labels: -beta, -stable
@@ -30,4 +30,3 @@ jobs:
       GPG_SUBKEY: ${{ secrets.GPG_SUBKEY }}
       GPG_SUBKEY_ID: ${{ secrets.GPG_SUBKEY_ID }}
       GPG_SUBKEY_PASSWORD: ${{ secrets.GPG_SUBKEY_PASSWORD }}
-      
\ No newline at end of file
diff --git a/.github/workflows/test-prs.yml b/.github/workflows/test-prs.yml
index 3d0ef4b3d0..fd33722179 100644
--- a/.github/workflows/test-prs.yml
+++ b/.github/workflows/test-prs.yml
@@ -28,10 +28,10 @@ jobs:
         run:
           git switch -C pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.ref }}
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Setup with Gradle
diff --git a/gradle.properties b/gradle.properties
index c6ca6f383f..24ae1a175f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,10 +9,10 @@ org.gradle.debug=false
 
 java_version=21
 
-minecraft_version=1.21-rc1
-neoform_version=20240610.133618
+minecraft_version=1.21
+neoform_version=20240613.152323
 # on snapshot versions, used to prefix the version
-neoforge_snapshot_next_stable=21.0
+neoforge_snapshot_next_stable=22.0
 
 mergetool_version=2.0.0
 accesstransformers_version=10.0.1
diff --git a/testframework/build.gradle b/testframework/build.gradle
index 96e2a28ce4..e6ab502ab9 100644
--- a/testframework/build.gradle
+++ b/testframework/build.gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    implementation project(':neoforge')
+    implementation project(path: ':neoforge', configuration: 'runtimeElements')
 
     compileOnly(platform("org.junit:junit-bom:${project.jupiter_api_version}"))
     compileOnly "org.junit.jupiter:junit-jupiter-params"
diff --git a/tests/build.gradle b/tests/build.gradle
index d2e18e318d..83f5f7dcc0 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -35,7 +35,7 @@ configurations {
 }
 
 dependencies {
-    implementation(neoforgeProject)
+    implementation project(path: ':neoforge', configuration: 'runtimeElements')
     implementation(testframeworkProject)
 
     junitImplementation(platform("org.junit:junit-bom:${project.jupiter_api_version}"))