diff --git a/build-logic/convention/src/main/kotlin/build-logic.android.base.gradle.kts b/build-logic/convention/src/main/kotlin/build-logic.android.base.gradle.kts
index 1c9fef81..df902233 100644
--- a/build-logic/convention/src/main/kotlin/build-logic.android.base.gradle.kts
+++ b/build-logic/convention/src/main/kotlin/build-logic.android.base.gradle.kts
@@ -23,7 +23,6 @@
 @file:Suppress("UnstableApiUsage")
 
 import com.android.build.gradle.BaseExtension
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
 plugins {
     id("com.android.base")
@@ -48,13 +47,9 @@ extensions.findByType(BaseExtension::class)?.run {
         targetCompatibility = Version.java
     }
 
-    kotlinOptions {
-        jvmTarget = Version.java.toString()
-    }
-
     packagingOptions.jniLibs.useLegacyPackaging = false
 }
 
-fun BaseExtension.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
-    (this as ExtensionAware).extensions.configure("kotlinOptions", block)
+kotlin {
+    jvmToolchain(Version.java.toString().toInt())
 }
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties
index 070cb702..da1db5f0 100644
--- a/build-logic/gradle/wrapper/gradle-wrapper.properties
+++ b/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/build.gradle.kts b/build.gradle.kts
index 8293c11c..2694393f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,8 +20,10 @@
  * <https://github.com/cinit/QAuxiliary/blob/master/LICENSE.md>.
  */
 
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("build-logic.root-project")
+    alias(libs.plugins.kotlin.jvm) apply false
 }
 
 tasks.register<Delete>("clean").configure {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 159fb669..d6bd5dcb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -40,4 +40,5 @@ sealedEnum-ksp = { module = "com.github.livefront.sealed-enum:ksp", version = "0
 changelog = { id = "org.jetbrains.changelog", version = "2.0.0" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 license = { id = "com.jaredsburrows.license", version = "0.9.0" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 49c305a7..22c55122 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Dec 02 09:11:05 CST 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libs/ksp/build.gradle.kts b/libs/ksp/build.gradle.kts
index a67dde89..687b5bcf 100644
--- a/libs/ksp/build.gradle.kts
+++ b/libs/ksp/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     kotlin("jvm")
 }
@@ -9,8 +7,8 @@ dependencies {
     implementation(libs.kotlinpoet.ksp)
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = Version.java.toString()
+kotlin {
+    jvmToolchain(Version.java.toString().toInt())
 }
 
 tasks.withType<JavaCompile> {