diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9d11c3f..4d5da411 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   In order to properly support up-to-date checking and caching, task outputs have to be specified (see
   [Incremental build](https://docs.gradle.org/current/userguide/incremental_build.html) in the Gradle documentation).
 
+### Changed
+
+- `MpsCheck` and `MpsExecute` (together with `MpsGenerate`) marked as incubating. They may experience some breaking
+  changes in future releases.
+
 ## 1.21.2
 
 ### Fixed
diff --git a/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt b/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt
index 624a9e57..7ebb086c 100644
--- a/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt
+++ b/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsCheck.kt
@@ -5,6 +5,7 @@ import de.itemis.mps.gradle.ErrorMessages
 import de.itemis.mps.gradle.launcher.MpsBackendBuilder
 import de.itemis.mps.gradle.launcher.MpsVersionDetection
 import org.gradle.api.GradleException
+import org.gradle.api.Incubating
 import org.gradle.api.file.*
 import org.gradle.api.logging.LogLevel
 import org.gradle.api.provider.ListProperty
@@ -17,6 +18,7 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin
 import org.gradle.process.CommandLineArgumentProvider
 
 @CacheableTask
+@Incubating
 abstract class MpsCheck : JavaExec(), VerificationTask {
 
     @get:Internal("covered by mpsVersion, initialModelcheckBackendClasspath()")
diff --git a/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsExecute.kt b/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsExecute.kt
index eeab7bbe..2b32998d 100644
--- a/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsExecute.kt
+++ b/src/main/kotlin/de/itemis/mps/gradle/tasks/MpsExecute.kt
@@ -5,6 +5,7 @@ import de.itemis.mps.gradle.ErrorMessages
 import de.itemis.mps.gradle.launcher.MpsBackendBuilder
 import de.itemis.mps.gradle.launcher.MpsVersionDetection
 import org.gradle.api.GradleException
+import org.gradle.api.Incubating
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.Directory
 import org.gradle.api.file.DirectoryProperty
@@ -19,6 +20,7 @@ import org.gradle.work.DisableCachingByDefault
 
 
 @DisableCachingByDefault(because = "calls arbitrary user code")
+@Incubating
 abstract class MpsExecute : JavaExec() {
 
     @get:Internal