diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 5f0f0f1a..cc7b092c 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/setup-java@v1
         if: ${{ matrix.runtime != 'linux-fedora-x64' }}
         with:
-          java-version: '16'
+          java-version: '17'
           architecture: ${{ matrix.arch }}
 
       - name: Setup Cl
@@ -79,7 +79,7 @@ jobs:
 
       - name: Build rpm Package
         if: ${{ matrix.runtime == 'linux-fedora-x64' }}
-        uses: Syer10/Fedora-Java16-Action@v1
+        uses: Syer10/Fedora-Java17-Action@v1
         with:
           command: ./gradlew ${{ matrix.build }} --stacktrace
 
@@ -137,7 +137,7 @@ jobs:
         uses: actions/download-artifact@v2
 
       - name: Fix rpm java dependency
-        uses: Syer10/Fedora-Java16-Action@v1
+        uses: Syer10/Fedora-Java17-Action@v1
         with:
           command: ./scripts/RpmDependencyFix.sh
 
diff --git a/.github/workflows/Check.yml b/.github/workflows/Check.yml
index e0c664e1..3cb15ef8 100644
--- a/.github/workflows/Check.yml
+++ b/.github/workflows/Check.yml
@@ -31,7 +31,7 @@ jobs:
 #
 #      - uses: actions/setup-java@v1
 #        with:
-#          java-version: '16'
+#          java-version: '17'
 #          architecture: x64
 #
 #      - name: Setup Cl
diff --git a/.github/workflows/Preview.yml b/.github/workflows/Preview.yml
index afa3b1b2..31f02425 100644
--- a/.github/workflows/Preview.yml
+++ b/.github/workflows/Preview.yml
@@ -64,7 +64,7 @@ jobs:
       - uses: actions/setup-java@v1
         if: ${{ matrix.runtime != 'linux-fedora-x64' }}
         with:
-          java-version: '16'
+          java-version: '17'
           architecture: ${{ matrix.arch }}
 
       - name: Setup Cl
@@ -85,7 +85,7 @@ jobs:
 
       - name: Build rpm Package
         if: ${{ matrix.runtime == 'linux-fedora-x64' }}
-        uses: Syer10/Fedora-Java16-Action@v1
+        uses: Syer10/Fedora-Java17-Action@v1
         with:
           command: ./gradlew ${{ matrix.build }} -Ppreview="${{ env.COMMIT_COUNT }}" --stacktrace
 
@@ -145,7 +145,7 @@ jobs:
         uses: actions/download-artifact@v2
 
       - name: Fix rpm java dependency
-        uses: Syer10/Fedora-Java16-Action@v1
+        uses: Syer10/Fedora-Java17-Action@v1
         with:
           command: ./scripts/RpmDependencyFix.sh
 
diff --git a/.github/workflows/Update.yml b/.github/workflows/Update.yml
index 1f1ce085..aec45da7 100644
--- a/.github/workflows/Update.yml
+++ b/.github/workflows/Update.yml
@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: '16'
+          java-version: '17'
           architecture: x64
 
       - name: Setup Cl
diff --git a/README.md b/README.md
index 0afec9fc..97a4b569 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ Download the latest apk from [the releases section][release] (Or from [the previ
 
 ## General troubleshooting
 ### I'm having issues starting the application
-Make sure you have used either an installer, or you have Java 15 installed.
+Make sure you have used either an installer, or you have Java 17 installed.
 
 ### It says server failed to start
 Make sure that if you used an installer, that you have at least Java 8 installed.
@@ -76,7 +76,7 @@ Join Tachidesk's [discord server](https://discord.gg/DDZdqZWaHA) to hang out wit
 ## Building from source
 ### Prerequisite: Software dependencies
 You need this software packages installed in order to build this project:
-- Java Development Kit and Java Runtime Environment version 15, this can be handled by IntelliJ
+- Java Development Kit and Java Runtime Environment version 17, this can be handled by IntelliJ
 ### Building a jar for your OS
 Run `./gradlew packageUberJarForCurrentOS`, the resulting built jar file will be `build/compose/Tachidesk-JUI-os-arch-X.Y.Z.jar`.
 
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
index 8c30f76f..ea6a6c95 100644
--- a/buildSrc/src/main/kotlin/Config.kt
+++ b/buildSrc/src/main/kotlin/Config.kt
@@ -10,7 +10,7 @@ object Config {
     const val preview = true
     const val previewCommit = "86f0b3f29f2ea3f986eb40a7d4a5814112097b8e"
 
-    val desktopJvmTarget = JavaVersion.VERSION_16
+    val desktopJvmTarget = JavaVersion.VERSION_17
     val androidJvmTarget = JavaVersion.VERSION_11
 
     const val androidDev = false