diff --git a/.idea/modules.xml b/.idea/modules.xml
index 587e24fb09f0..d5bafaeb9131 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -979,6 +979,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/git4idea/rt/intellij.vcs.git.rt.iml" filepath="$PROJECT_DIR$/plugins/git4idea/rt/intellij.vcs.git.rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/github-core/intellij.vcs.github.iml" filepath="$PROJECT_DIR$/plugins/github/github-core/intellij.vcs.github.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/community/intellij.vcs.github.community.iml" filepath="$PROJECT_DIR$/plugins/github/community/intellij.vcs.github.community.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/github/github-json/intellij.vcs.github.json.iml" filepath="$PROJECT_DIR$/plugins/github/github-json/intellij.vcs.github.json.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/github/github-tracker/intellij.vcs.github.tracker.iml" filepath="$PROJECT_DIR$/plugins/github/github-tracker/intellij.vcs.github.tracker.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml" filepath="$PROJECT_DIR$/plugins/gitlab/gitlab-core/intellij.vcs.gitlab.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml" filepath="$PROJECT_DIR$/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml" />
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index ec7c92ade993..619a7db41aed 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -227,5 +227,6 @@
     <orderEntry type="module" module-name="intellij.vcs.gitlab.yaml" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.jvm.analysis.impl" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.byteCodeViewer" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.vcs.github.json" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/github/github-core/resources/intellij.vcs.github.xml b/plugins/github/github-core/resources/intellij.vcs.github.xml
index d28deadfeaf2..c04b82155898 100644
--- a/plugins/github/github-core/resources/intellij.vcs.github.xml
+++ b/plugins/github/github-core/resources/intellij.vcs.github.xml
@@ -3,7 +3,6 @@
     <plugin id="com.intellij.modules.lang"/>
     <plugin id="Git4Idea"/>
     <module name="intellij.platform.collaborationTools"/>
-    <plugin id="com.intellij.modules.json"/>
   </dependencies>
 
   <resource-bundle>messages.GithubBundle</resource-bundle>
@@ -100,10 +99,6 @@
     <gitPushNotificationCustomizer implementation="org.jetbrains.plugins.github.notification.GHPushNotificationCustomizer"/>
   </extensions>
 
-  <extensions defaultExtensionNs="JavaScript.JsonSchema">
-    <ProviderFactory implementation="org.jetbrains.plugins.github.extensions.GHActionJsonSchemaProviderFactory"/>
-  </extensions>
-
   <actions>
     <action id="Github.Share" class="org.jetbrains.plugins.github.GithubShareAction" icon="AllIcons.Vcs.Vendors.Github">
       <add-to-group group-id="Vcs.Import"/>
diff --git a/plugins/github/github-json/intellij.vcs.github.json.iml b/plugins/github/github-json/intellij.vcs.github.json.iml
new file mode 100644
index 000000000000..7efc1b38dab2
--- /dev/null
+++ b/plugins/github/github-json/intellij.vcs.github.json.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.vcs.github" />
+    <orderEntry type="module" module-name="intellij.json" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/github/github-json/resources/intellij.vcs.github.json.xml b/plugins/github/github-json/resources/intellij.vcs.github.json.xml
new file mode 100644
index 000000000000..bf30ad0f9020
--- /dev/null
+++ b/plugins/github/github-json/resources/intellij.vcs.github.json.xml
@@ -0,0 +1,9 @@
+<idea-plugin package="org.jetbrains.plugins.github.json">
+  <dependencies>
+    <plugin id="com.intellij.modules.json"/>
+  </dependencies>
+
+  <extensions defaultExtensionNs="JavaScript.JsonSchema">
+    <ProviderFactory implementation="org.jetbrains.plugins.github.json.GHActionJsonSchemaProviderFactory"/>
+  </extensions>
+</idea-plugin>
\ No newline at end of file
diff --git a/plugins/github/github-core/resources/schemas/github-action.json b/plugins/github/github-json/resources/schemas/github-action.json
similarity index 100%
rename from plugins/github/github-core/resources/schemas/github-action.json
rename to plugins/github/github-json/resources/schemas/github-action.json
diff --git a/plugins/github/github-core/resources/schemas/github-workflow.json b/plugins/github/github-json/resources/schemas/github-workflow.json
similarity index 100%
rename from plugins/github/github-core/resources/schemas/github-workflow.json
rename to plugins/github/github-json/resources/schemas/github-workflow.json
diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/extensions/GHActionJsonSchemaProviderFactory.kt b/plugins/github/github-json/src/org/jetbrains/plugins/github/json/GHActionJsonSchemaProviderFactory.kt
similarity index 84%
rename from plugins/github/github-core/src/org/jetbrains/plugins/github/extensions/GHActionJsonSchemaProviderFactory.kt
rename to plugins/github/github-json/src/org/jetbrains/plugins/github/json/GHActionJsonSchemaProviderFactory.kt
index 6c0edccc5ea0..562ac0d40168 100644
--- a/plugins/github/github-core/src/org/jetbrains/plugins/github/extensions/GHActionJsonSchemaProviderFactory.kt
+++ b/plugins/github/github-json/src/org/jetbrains/plugins/github/json/GHActionJsonSchemaProviderFactory.kt
@@ -1,5 +1,5 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package org.jetbrains.plugins.github.extensions
+package org.jetbrains.plugins.github.json
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
@@ -8,10 +8,12 @@ import com.jetbrains.jsonSchema.extension.JsonSchemaFileProvider
 import com.jetbrains.jsonSchema.extension.JsonSchemaProviderFactory
 import com.jetbrains.jsonSchema.extension.SchemaType
 import org.jetbrains.annotations.Nls
+import org.jetbrains.plugins.github.extensions.isGithubActionFile
+import org.jetbrains.plugins.github.extensions.isGithubWorkflowFile
 import org.jetbrains.plugins.github.i18n.GithubBundle
 
-const val ACTION_SCHEMA_PATH = "/schemas/github-action.json"
-const val WORKFLOW_SCHEMA_PATH = "/schemas/github-workflow.json"
+private const val ACTION_SCHEMA_PATH = "/schemas/github-action.json"
+private const val WORKFLOW_SCHEMA_PATH = "/schemas/github-workflow.json"
 
 internal class GHActionJsonSchemaProviderFactory: JsonSchemaProviderFactory {
   override fun getProviders(project: Project): List<JsonSchemaFileProvider?> {
@@ -37,5 +39,4 @@ internal class GHActionJsonSchemaProviderFactory: JsonSchemaProviderFactory {
 
     override fun getSchemaType(): SchemaType = SchemaType.embeddedSchema
   }
-
 }
\ No newline at end of file