diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index 9003029c694f..b5eaf316426d 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -71,7 +71,7 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of(
   "intellij.platform.scriptDebugger.ui",
   "intellij.platform.smRunner",
   "intellij.platform.structureView.impl",
-  "intellij.platform.tasks.impl",
+  "intellij.platform.tasks",
   "intellij.platform.testRunner",
   "intellij.platform.rd.community",
   "intellij.remoteDev.util",
diff --git a/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt b/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt
index 1adc8c4d2098..d08e814513a6 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt
+++ b/platform/core-impl/src/com/intellij/ide/plugins/ModulesWithDependencies.kt
@@ -176,7 +176,8 @@ private val knownNotFullyMigratedPluginIds: Set<String> = hashSetOf(
  * To avoid breaking compatibility, dependencies on these modules are automatically added to plugins which define dependency on the platform using 
  * `<depends>com.intellij.modules.platform</depends` or `<depends>com.intellij.modules.lang</depends` tags.
  */
-private val contentModulesExtractedInCorePluginWhichCanBeUsedFromExternalPlugins = listOf<String>(
+private val contentModulesExtractedInCorePluginWhichCanBeUsedFromExternalPlugins = listOf(
+  "intellij.platform.tasks.impl",
 )
 
 private fun collectDirectDependenciesInOldFormat(rootDescriptor: IdeaPluginDescriptorImpl,
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index bd7242eb4415..fbcea8187eb8 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -182,9 +182,6 @@
   <xi:include href="/META-INF/duplicates-analysis.xml">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/tasks.xml">
-    <xi:fallback/>
-  </xi:include>
 
   <xi:include href="/META-INF/ExternalProcessAuthHelper.xml">
     <xi:fallback/>
diff --git a/platform/platform-resources/src/META-INF/common-ide-modules.xml b/platform/platform-resources/src/META-INF/common-ide-modules.xml
index 287fb95b8e34..c771b68873b3 100644
--- a/platform/platform-resources/src/META-INF/common-ide-modules.xml
+++ b/platform/platform-resources/src/META-INF/common-ide-modules.xml
@@ -7,6 +7,7 @@
     <module name="intellij.platform.lvcs.impl"/>
     <module name="intellij.platform.smRunner.vcs"/>
     <module name="intellij.platform.collaborationTools"/>
+    <module name="intellij.platform.tasks.impl"/>
     <module name="intellij.libraries.microba"/>
     <module name="intellij.libraries.skiko"/>
     <module name="intellij.platform.compose"/>
diff --git a/platform/tasks-platform-impl/resources/META-INF/tasks.xml b/platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml
similarity index 95%
rename from platform/tasks-platform-impl/resources/META-INF/tasks.xml
rename to platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml
index 568257b11ee5..3b58ec188c78 100644
--- a/platform/tasks-platform-impl/resources/META-INF/tasks.xml
+++ b/platform/tasks-platform-impl/resources/intellij.platform.tasks.impl.xml
@@ -1,4 +1,7 @@
 <idea-plugin>
+  <dependencies>
+    <module name="intellij.platform.vcs.impl"/>
+  </dependencies>
   <extensionPoints>
     <extensionPoint name="tasks.contextProvider" interface="com.intellij.tasks.context.WorkingContextProvider" dynamic="true"/>
     <extensionPoint name="tasks.repositoryType" interface="com.intellij.tasks.TaskRepositoryType" dynamic="true"/>
diff --git a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
index 13b1289d8da6..b62abc60f38c 100644
--- a/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/resources/META-INF/plugin.xml
@@ -16,6 +16,7 @@
   <dependencies>
     <plugin id="com.intellij.modules.xml" />
     <module name="intellij.platform.vcs.impl"/>
+    <module name="intellij.platform.tasks.impl"/>
   </dependencies>
   <depends optional="true" config-file="java-contexts.xml">com.intellij.java</depends>
   <!--