diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 584c2a26cf3..cc091ba7f81 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -22,9 +22,12 @@
   <depends optional="true" config-file="android.xml">org.jetbrains.android</depends>
   <depends optional="true" config-file="coverage.xml">Coverage</depends>
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
-  <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
 
+  <!-- CIDR-PLUGIN-EXCLUDE-START -->
+  <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
+  <!-- CIDR-PLUGIN-EXCLUDE-END -->
+
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
   <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
@@ -56,12 +59,14 @@
       <interface-class>org.jetbrains.kotlin.idea.completion.CompletionBindingContextProvider</interface-class>
       <implementation-class>org.jetbrains.kotlin.idea.completion.CompletionBindingContextProvider</implementation-class>
     </component>
+    <!-- CIDR-PLUGIN-EXCLUDE-START -->
     <component>
       <implementation-class>org.jetbrains.kotlin.idea.scratch.ui.ScratchFileHook</implementation-class>
     </component>
     <component>
       <implementation-class>org.jetbrains.kotlin.idea.scratch.ScratchFileModuleInfoProvider</implementation-class>
     </component>
+    <!-- CIDR-PLUGIN-EXCLUDE-END -->
   </project-components>
 
   <application-components>
diff --git a/idea/src/META-INF/plugin.xml.182 b/idea/src/META-INF/plugin.xml.182
index 099a69f7948..1a195c5fe12 100644
--- a/idea/src/META-INF/plugin.xml.182
+++ b/idea/src/META-INF/plugin.xml.182
@@ -22,9 +22,12 @@
   <depends optional="true" config-file="android.xml">org.jetbrains.android</depends>
   <depends optional="true" config-file="coverage.xml">Coverage</depends>
   <depends optional="true" config-file="i18n.xml">com.intellij.java-i18n</depends>
-  <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
   <depends optional="true" config-file="decompiler.xml">org.jetbrains.java.decompiler</depends>
 
+  <!-- CIDR-PLUGIN-EXCLUDE-START -->
+  <depends optional="true" config-file="injection.xml">org.intellij.intelliLang</depends>
+  <!-- CIDR-PLUGIN-EXCLUDE-END -->
+
   <!-- ULTIMATE-PLUGIN-PLACEHOLDER -->
 
   <!-- CIDR-PLUGIN-PLACEHOLDER-START -->
@@ -57,12 +60,14 @@
       <interface-class>org.jetbrains.kotlin.idea.completion.CompletionBindingContextProvider</interface-class>
       <implementation-class>org.jetbrains.kotlin.idea.completion.CompletionBindingContextProvider</implementation-class>
     </component>
+    <!-- CIDR-PLUGIN-EXCLUDE-START -->
     <component>
       <implementation-class>org.jetbrains.kotlin.idea.scratch.ui.ScratchFileHook</implementation-class>
     </component>
     <component>
       <implementation-class>org.jetbrains.kotlin.idea.scratch.ScratchFileModuleInfoProvider</implementation-class>
     </component>
+    <!-- CIDR-PLUGIN-EXCLUDE-END -->
   </project-components>
 
   <application-components>
diff --git a/prepare/cidr-plugin/build.gradle.kts b/prepare/cidr-plugin/build.gradle.kts
index 7d371847b3c..730100db276 100644
--- a/prepare/cidr-plugin/build.gradle.kts
+++ b/prepare/cidr-plugin/build.gradle.kts
@@ -34,7 +34,7 @@ val pluginXml by tasks.creating {
                 RegexOption.DOT_MATCHES_ALL)
 
         val excludeRegex = Regex(
-            """<!-- CIDR-PLUGIN-EXCLUDE-START -->(.*)<!-- CIDR-PLUGIN-EXCLUDE-END -->""",
+            """<!-- CIDR-PLUGIN-EXCLUDE-START -->(.*?)<!-- CIDR-PLUGIN-EXCLUDE-END -->""",
             RegexOption.DOT_MATCHES_ALL)
 
         val versionRegex = Regex("""<version>([^<]+)</version>""")