diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 9ce57113..8d9f0150 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'DreamExposure/DisCal-Discord-Bot' }}
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
     steps:
       - uses: actions/checkout@v4
 
@@ -70,7 +70,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'adopt'
 
       - name: Change wrapper permissions
diff --git a/build.gradle.kts b/build.gradle.kts
index e5bd5b4d..ad83af8f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -119,8 +119,8 @@ allprojects {
     }
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlin {
diff --git a/gradle.properties b/gradle.properties
index e9c44871..5eb69930 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -35,4 +35,4 @@ copyDownVersion=1.1
 jsoupVersion=1.20.1
 
 # Jib properties
-baseImage=eclipse-temurin:17-jdk-alpine@sha256:0e6e494ac4da6509a038b7689250bc7ea68beaf8a5efbca5ed7c8692457b283c
+baseImage=eclipse-temurin:21-jdk-alpine@sha256:2f2f553ce09d25e2d2f0f521ab94cd73f70c9b21327a29149c23a2b63b8e29a0