diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
index d7a47e427fa..a5d00055c52 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.kt
@@ -454,7 +454,7 @@ They should be a subset of sources passed as free arguments."""
     @GradleDeprecatedOption(
         message = "Compiler flag -Xuse-k2 is deprecated; please use language version 2.0 instead",
         level = DeprecationLevel.WARNING,
-        removeAfter = "2.0.0",
+        removeAfter = LanguageVersion.KOTLIN_2_0,
     )
     @GradleOption(
         DefaultValue.BOOLEAN_FALSE_DEFAULT,
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/GradleDeprecatedOption.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/GradleDeprecatedOption.kt
index fcbca65bff1..5aa63247d9a 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/GradleDeprecatedOption.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/GradleDeprecatedOption.kt
@@ -5,9 +5,11 @@
 
 package org.jetbrains.kotlin.cli.common.arguments
 
+import org.jetbrains.kotlin.config.LanguageVersion
+
 @Retention(AnnotationRetention.RUNTIME)
 annotation class GradleDeprecatedOption(
     val message: String = "This option has no effect and will be removed in a future release.",
-    val removeAfter: String,
+    val removeAfter: LanguageVersion,
     val level: DeprecationLevel
 )
\ No newline at end of file
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt
index 71ca8da8f04..095ecb7aaa2 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.kt
@@ -51,7 +51,7 @@ class K2JSCompilerArguments : CommonCompilerArguments() {
     @GradleDeprecatedOption(
         message = "Only for legacy backend.",
         level = DeprecationLevel.WARNING,
-        removeAfter = "2.0.0"
+        removeAfter = LanguageVersion.KOTLIN_2_0,
     )
     @Argument(value = "-no-stdlib", description = "Don't automatically include the default Kotlin/JS stdlib in compilation dependencies.")
     var noStdlib = false
@@ -151,7 +151,7 @@ class K2JSCompilerArguments : CommonCompilerArguments() {
     @GradleDeprecatedOption(
         message = "Only for legacy backend.",
         level = DeprecationLevel.WARNING,
-        removeAfter = "2.0.0"
+        removeAfter = LanguageVersion.KOTLIN_2_0,
     )
     @Deprecated("It is senseless to use with IR compiler. Only for compatibility.")
     @Argument(value = "-meta-info", description = "Generate .meta.js and .kjsm files with metadata. Use this to create a library.")
diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSDceArguments.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSDceArguments.kt
index e5bb2aa299f..c365b648ca1 100644
--- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSDceArguments.kt
+++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSDceArguments.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.cli.common.arguments
 
 import org.jetbrains.kotlin.cli.common.arguments.DevModeOverwritingStrategies.ALL
 import org.jetbrains.kotlin.cli.common.arguments.DevModeOverwritingStrategies.OLDER
+import org.jetbrains.kotlin.config.LanguageVersion
 
 class K2JSDceArguments : CommonToolArguments() {
     companion object {
@@ -21,7 +22,7 @@ class K2JSDceArguments : CommonToolArguments() {
     @GradleDeprecatedOption(
         message = "Use task 'destinationDirectory' to configure output directory",
         level = DeprecationLevel.WARNING,
-        removeAfter = "1.9.0"
+        removeAfter = LanguageVersion.KOTLIN_1_9,
     )
     @Argument(
             value = "-output-dir",
diff --git a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
index db718c2e1ae..fdda3bbaaa7 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
@@ -611,8 +611,7 @@ private fun generateMultiplatformCommonOptionsImpl(
 
 private inline fun <reified T : Any> List<KProperty1<T, *>>.filterToBeDeleted() = filter { prop ->
     prop.findAnnotation<GradleDeprecatedOption>()
-        ?.let { LanguageVersion.fromVersionString(it.removeAfter) }
-        ?.let { it >= LanguageVersion.LATEST_STABLE }
+        ?.let { it.removeAfter >= LanguageVersion.LATEST_STABLE }
         ?: true
 }