diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 455ec73..142da52 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,23 +6,19 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
 
-    strategy:
-      matrix:
-        gradle-version: [ '7.6.2', '8.0.1', '8.2.1' ]
-
     steps:
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
 
       - uses: actions/checkout@v4
 
       - uses: gradle/wrapper-validation-action@v3
 
-      - uses: gradle/gradle-build-action@v3
+      - uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: ${{ matrix.gradle-version }}
-          arguments: check --continue
+          gradle-version: '8.12.1'
 
-#    TODO Add publish on tag support
+      - run:
+          ./gradlew check --continue
diff --git a/.gitignore b/.gitignore
index 6607f25..cc56745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .gradle
+.kotlin
 /build/
 
 # Ignore Gradle GUI config
diff --git a/build.gradle.kts b/build.gradle.kts
index 2b3c28c..32855fc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,6 +38,13 @@ tasks.named("publishPlugins") {
 group = "org.assertj"
 version = "2.2.0-SNAPSHOT"
 
+java {
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(21)
+    vendor = JvmVendorSpec.ADOPTIUM
+  }
+}
+
 gradlePlugin {
   website.set("https://github.com/assertj/assertj-generator-gradle-plugin")
   vcsUrl.set("https://github.com/assertj/assertj-generator-gradle-plugin.git")
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5083229..9bf7bd3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/test/kotlin/org/assertj/generator/gradle/StringExtensions.kt b/src/test/kotlin/org/assertj/generator/gradle/StringExtensions.kt
new file mode 100644
index 0000000..ff0367e
--- /dev/null
+++ b/src/test/kotlin/org/assertj/generator/gradle/StringExtensions.kt
@@ -0,0 +1,5 @@
+package org.assertj.generator.gradle
+
+internal fun String.capitalized(): String {
+  return this[0].uppercaseChar() + this.substring(1)
+}
diff --git a/src/test/kotlin/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.kt b/src/test/kotlin/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.kt
index eacc7bb..86b5c9e 100644
--- a/src/test/kotlin/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.kt
+++ b/src/test/kotlin/org/assertj/generator/gradle/parameter/OutputDirectoryParameter.kt
@@ -15,6 +15,7 @@ package org.assertj.generator.gradle.parameter
 import net.navatwo.gradle.testkit.junit5.GradleProject
 import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
 import org.assertj.generator.gradle.TestUtils.writeBuildFile
+import org.assertj.generator.gradle.capitalized
 import org.assertj.generator.gradle.isSuccessful
 import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.testkit.runner.GradleRunner
diff --git a/src/test/kotlin/org/assertj/generator/gradle/parameter/SkipParameter.kt b/src/test/kotlin/org/assertj/generator/gradle/parameter/SkipParameter.kt
index 0ea97d4..ac1717d 100644
--- a/src/test/kotlin/org/assertj/generator/gradle/parameter/SkipParameter.kt
+++ b/src/test/kotlin/org/assertj/generator/gradle/parameter/SkipParameter.kt
@@ -15,6 +15,7 @@ package org.assertj.generator.gradle.parameter
 import net.navatwo.gradle.testkit.junit5.GradleProject
 import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
 import org.assertj.generator.gradle.TestUtils.writeBuildFile
+import org.assertj.generator.gradle.capitalized
 import org.assertj.generator.gradle.isSuccessful
 import org.gradle.configurationcache.extensions.capitalized
 import org.gradle.testkit.runner.GradleRunner