diff --git a/activiti-intellij-plugin/build.gradle b/activiti-intellij-plugin/build.gradle
index 6e0733c7..b638145f 100644
--- a/activiti-intellij-plugin/build.gradle
+++ b/activiti-intellij-plugin/build.gradle
@@ -36,14 +36,14 @@ sourceSets {
 }
 
 intellij {
-    version = "IC-2021.3"
+    version = intellijPlatform
     pluginName = 'activiti-bpmn-plugin'
     updateSinceUntilBuild = false
-    plugins = ["java"]
+    plugins = intellijPlatformPlugins
 }
 
 runPluginVerifier {
-    ideVersions = ["IU-2021.3"]
+    ideVersions = ["IU-2021.3", "IC-2021.3"]
 }
 
 verifyPlugin {
diff --git a/bpmn-intellij-plugin-commons/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/commons/langinjection/DefaultDelegateExpressionUiInjector.kt b/bpmn-intellij-plugin-commons/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/commons/langinjection/DefaultDelegateExpressionUiInjector.kt
index ebfb7fd9..fade630f 100644
--- a/bpmn-intellij-plugin-commons/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/commons/langinjection/DefaultDelegateExpressionUiInjector.kt
+++ b/bpmn-intellij-plugin-commons/src/main/kotlin/com/valb3r/bpmn/intellij/plugin/commons/langinjection/DefaultDelegateExpressionUiInjector.kt
@@ -48,8 +48,7 @@ abstract class DefaultDelegateExpressionUiInjector: MultiHostInjector {
 
     private fun injectSpel(context: PsiLanguageInjectionHost, registrar: MultiHostRegistrar) {
         val text = context.text
-        val language = Language.getRegisteredLanguages().firstOrNull { it.id == "SpEL" } ?:
-            Language.getRegisteredLanguages().firstOrNull { it.id == "JAVA" } ?: return
+        val language = Language.getRegisteredLanguages().firstOrNull { it.id == "SpEL" } ?: return
         registrar.startInjecting(language)
         if (context.text.contains(spelStart) && context.text.endsWith(spelEnd)) {
             registrar.addPlace("", "", context, TextRange(3, text.length - 2))
diff --git a/camunda-intellij-plugin/build.gradle b/camunda-intellij-plugin/build.gradle
index de665283..ba658f35 100644
--- a/camunda-intellij-plugin/build.gradle
+++ b/camunda-intellij-plugin/build.gradle
@@ -43,7 +43,7 @@ intellij {
 }
 
 runPluginVerifier {
-    ideVersions = ["IU-2021.3"]
+    ideVersions = ["IU-2021.3", "IC-2021.3"]
 }
 
 verifyPlugin {
diff --git a/flowable-intellij-plugin/build.gradle b/flowable-intellij-plugin/build.gradle
index 33bd5aec..d977b957 100644
--- a/flowable-intellij-plugin/build.gradle
+++ b/flowable-intellij-plugin/build.gradle
@@ -43,7 +43,7 @@ intellij {
 }
 
 runPluginVerifier {
-    ideVersions = ["IU-2021.3"]
+    ideVersions = ["IU-2021.3", "IC-2021.3"]
 }
 
 verifyPlugin {