diff --git a/.github/workflows/build-app-workflow.yaml b/.github/workflows/build-app-workflow.yaml
index dabacb9c9f..515b2e0412 100644
--- a/.github/workflows/build-app-workflow.yaml
+++ b/.github/workflows/build-app-workflow.yaml
@@ -8,6 +8,11 @@ jobs:
         uses: actions/checkout@v3
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: 'gradle'
       - name: Build the app
         run: ./gradlew build
       - uses: actions/upload-artifact@v3
@@ -23,7 +28,7 @@ jobs:
         uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: 'gradle'
       - name: Install HAXM
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8c30e50c55..0d3d0dc0c5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -24,6 +24,11 @@ jobs:
       run: |
         find app/src/main/java/com/beemdevelopment/aegis/importers ! \( -name AegisImporter.java -o -name "DatabaseImporter*" \) -type f -exec rm -f {} +
         sed -i '/Importer.class/d' app/src/main/java/com/beemdevelopment/aegis/importers/DatabaseImporter.java
+    - uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: 'gradle'
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
diff --git a/gradle.properties b/gradle.properties
index 8d8636ec11..8b4fd0ea9e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,4 @@ android.enableJetifier=false
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m
+org.gradle.jvmargs=-Xmx8g