diff --git a/packages/schema/.graphqlconfig b/packages/schema/.graphqlconfig
deleted file mode 100644
index b94c65de4..000000000
--- a/packages/schema/.graphqlconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "Custom GraphQL schema",
-  "schemaPath": "**/*.graphqls"
-}
diff --git a/packages/schema/graphql.config.yml b/packages/schema/graphql.config.yml
new file mode 100644
index 000000000..2d3d7b99f
--- /dev/null
+++ b/packages/schema/graphql.config.yml
@@ -0,0 +1,3 @@
+schema: 'src/schema.graphql'
+include:
+  - 'phpstorm-support/**/directives.graphql'
diff --git a/packages/schema/phpstorm-support/drupal-modules b/packages/schema/phpstorm-support/drupal-modules
new file mode 120000
index 000000000..d098e5a94
--- /dev/null
+++ b/packages/schema/phpstorm-support/drupal-modules
@@ -0,0 +1 @@
+../../../apps/cms/web/modules
\ No newline at end of file
diff --git a/packages/schema/phpstorm-support/node-modules b/packages/schema/phpstorm-support/node-modules
new file mode 120000
index 000000000..8318b413a
--- /dev/null
+++ b/packages/schema/phpstorm-support/node-modules
@@ -0,0 +1 @@
+../../../apps/website/node_modules/@amazeelabs
\ No newline at end of file