diff --git a/build.gradle b/build.gradle
index 76253b8c..2daab7b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-	id 'org.jetbrains.kotlin.jvm' version '1.6.0' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.5.32' apply false
 }
 
 ext {
@@ -63,7 +63,7 @@ configure(moduleProjects) {
 			mavenBom "org.springframework.data:spring-data-bom:2021.1.0"
 			mavenBom "org.springframework.security:spring-security-bom:5.6.0"
 			mavenBom "com.querydsl:querydsl-bom:5.0.0"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.0"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32"
 			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
 			mavenBom "org.junit:junit-bom:5.8.1"
 			mavenBom "org.testcontainers:testcontainers-bom:1.16.2"
diff --git a/gradle.properties b/gradle.properties
index 95f26d5d..c9269b59 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,3 +4,5 @@ org.gradle.caching=true
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8
+
+kotlin.stdlib.default.dependency=false
\ No newline at end of file
diff --git a/spring-graphql/build.gradle b/spring-graphql/build.gradle
index 6686c461..cdb095fd 100644
--- a/spring-graphql/build.gradle
+++ b/spring-graphql/build.gradle
@@ -19,8 +19,8 @@ dependencies {
 	compileOnly 'org.springframework.data:spring-data-commons'
 
 	compileOnly 'com.google.code.findbugs:jsr305'
-	compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core'
 	compileOnly 'org.jetbrains.kotlin:kotlin-stdlib'
+	compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core'
 
 	compileOnly 'javax.validation:validation-api'
 
@@ -54,7 +54,6 @@ dependencies {
 
 	testRuntimeOnly 'org.apache.logging.log4j:log4j-core'
 	testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
-	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 }
 
 test {