diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties
index 4544baff..26e4f53d 100644
--- a/.github/template-cleanup/gradle.properties
+++ b/.github/template-cleanup/gradle.properties
@@ -32,6 +32,3 @@ org.gradle.caching = true
 
 # Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
 systemProp.org.gradle.unsafe.kotlin.assignment = true
-
-# Temporary workaround for Kotlin Compiler OutOfMemoryError -> https://jb.gg/intellij-platform-kotlin-oom
-kotlin.incremental.useClasspathSnapshot = false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8adeb9f3..213b6949 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,9 @@
 ### Fixed
 - Dependabot workflow points to `next` branch in a newly created project
 
+### Removed
+- Removed workaround for Kotlin Compiler `OutOfMemoryError` as the issue is gone with Kotlin `1.9.0`
+
 ## [1.7.0] - 2023-06-07
 
 ### Added
diff --git a/gradle.properties b/gradle.properties
index 550f1e7c..b8ed73bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,6 +32,3 @@ org.gradle.caching = true
 
 # Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
 systemProp.org.gradle.unsafe.kotlin.assignment = true
-
-# Temporary workaround for Kotlin Compiler OutOfMemoryError -> https://jb.gg/intellij-platform-kotlin-oom
-kotlin.incremental.useClasspathSnapshot = false