diff --git a/.gitmodules b/.gitmodules
index 050e4c2652c0185002c1a3bb4a772dd97fd5d812..ed908a8b90880848d52ea0763033d07d8b00c8e6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "apm-protocol/apm-network/src/main/proto"]
 	path = apm-protocol/apm-network/src/main/proto
 	url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git
+[submodule "oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol"]
+	path = oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
+	url = https://github.com/apache/incubator-skywalking-query-protocol.git
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
index 7696dfbd9db944b33a89c1348044b2716f86d0e4..b2c6740a728808cc157a83b64ca33dcbc07693cb 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
@@ -63,19 +63,19 @@ public class GraphQLQueryProvider extends ModuleProvider {
 
     @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException {
         GraphQLSchema schema = SchemaParser.newParser()
-            .file("ui-graphql-v6/common.graphqls")
+            .file("query-protocol/common.graphqls")
             .resolvers(new Query(), new Mutation())
-            .file("ui-graphql-v6/metadata.graphqls")
+            .file("query-protocol/metadata.graphqls")
             .resolvers(new MetadataQuery())
-            .file("ui-graphql-v6/metric.graphqls")
+            .file("query-protocol/metric.graphqls")
             .resolvers(new MetricQuery())
-            .file("ui-graphql-v6/topology.graphqls")
+            .file("query-protocol/topology.graphqls")
             .resolvers(new TopologyQuery())
-            .file("ui-graphql-v6/trace.graphqls")
+            .file("query-protocol/trace.graphqls")
             .resolvers(new TraceQuery())
-            .file("ui-graphql-v6/aggregation.graphqls")
+            .file("query-protocol/aggregation.graphqls")
             .resolvers(new AggregationQuery())
-            .file("ui-graphql-v6/alarm.graphqls")
+            .file("query-protocol/alarm.graphqls")
             .resolvers(new AlarmQuery())
             .build()
             .makeExecutableSchema();
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
new file mode 160000
index 0000000000000000000000000000000000000000..ebbeb721d95bba8ee63bc2e706e877ee3a56433e
--- /dev/null
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
@@ -0,0 +1 @@
+Subproject commit ebbeb721d95bba8ee63bc2e706e877ee3a56433e