diff --git a/build.gradle.kts b/build.gradle.kts
index e86c258..74e0621 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
+    implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 }
 
diff --git a/samples/lambda-kotlin-request-router-sample-proto/build.gradle.kts b/samples/lambda-kotlin-request-router-sample-proto/build.gradle.kts
index 15a560a..707e5c4 100644
--- a/samples/lambda-kotlin-request-router-sample-proto/build.gradle.kts
+++ b/samples/lambda-kotlin-request-router-sample-proto/build.gradle.kts
@@ -34,7 +34,7 @@ repositories {
 
 val proto = "3.11.1"
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
+    implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 
     implementation("io.moia.lambda-kotlin-request-router:router-protobuf:0.10.2")
diff --git a/samples/lambda-kotlin-request-router-sample/build.gradle.kts b/samples/lambda-kotlin-request-router-sample/build.gradle.kts
index c674cd9..ba268b0 100644
--- a/samples/lambda-kotlin-request-router-sample/build.gradle.kts
+++ b/samples/lambda-kotlin-request-router-sample/build.gradle.kts
@@ -30,7 +30,7 @@ repositories {
 }
 
 dependencies {
-    implementation(kotlin("stdlib-jdk8"))
+    implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 
     implementation("io.moia.lambda-kotlin-request-router:router:0.10.2")
@@ -49,7 +49,7 @@ dependencies {
 
 tasks {
     withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "1.8"
+        kotlinOptions.jvmTarget = "17"
     }
 
     withType<Test> {