diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ebf093d3f..d8d750cae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,8 +18,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: |
+            11
+            17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Build
-        run: ./gradlew build --stacktrace
+        run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 3d4281aa3..fc8fbc422 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -12,8 +12,10 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: |
+          11
+          17
         distribution: 'zulu'
         cache: 'gradle'
     - name: Build
-      run: ./gradlew build
+      run: ./gradlew -PenableCrossCompilerPlugin=true build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f71520b33..12980ca3d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,7 +37,9 @@ jobs:
           echo BRANCH=$BRANCHES >> $GITHUB_ENV
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: |
+            11
+            17
           distribution: 'zulu'
           cache: 'gradle'
       - name: Assemble release info
@@ -59,7 +61,7 @@ jobs:
           ORG_GRADLE_PROJECT_nexusPgpSigningKey: ${{ secrets.NEXUS_PGP_SIGNING_KEY }}
           ORG_GRADLE_PROJECT_nexusPgpSigningPassword: ${{ secrets.NEXUS_PGP_SIGNING_PASSWORD }}
         run: |
-          ./gradlew --info publishToNexus closeAndReleaseNexusStagingRepository
+          ./gradlew -PenableCrossCompilerPlugin=true --info publishToNexus closeAndReleaseNexusStagingRepository
       - name: Create release
         if: steps.release_info.outputs.SKIP_RELEASE == 'false'
         uses: softprops/action-gh-release@v2
diff --git a/gradle.properties b/gradle.properties
index 9bfc28da7..5ff48f304 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 kotlinVersion=1.6.21
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
-targetJava11=true
+targetJava17=false
 includeRuntimes=actuator,core,eureka,retrofit,secrets-aws,secrets-gcp,stackdriver,swagger,tomcat,web
 
 org.gradle.jvmargs=-Xmx2g -Xms2g