diff --git a/docs/README.md b/docs/README.md
index e15b61dfaa..1dfe42baf3 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -27,6 +27,7 @@ Semantic Conventions are defined for the following areas:
 * [Exceptions](exceptions/README.md): Semantic Conventions for exceptions.
 * [FaaS](faas/README.md): Semantic Conventions for Function as a Service (FaaS) operations.
 * [Feature Flags](feature-flags/README.md): Semantic Conventions for feature flag evaluations.
+* [GraphQL](graphql/graphql-spans.md): Semantic Conventions for GraphQL implementations.
 * [HTTP](http/README.md): Semantic Conventions for HTTP client and server operations.
 * [Messaging](messaging/README.md): Semantic Conventions for messaging operations and systems.
 * [Object Stores](object-stores/README.md): Semantic Conventions for object stores operations.
diff --git a/docs/database/README.md b/docs/database/README.md
index ab5bc2658a..ff0b546d8b 100644
--- a/docs/database/README.md
+++ b/docs/database/README.md
@@ -31,7 +31,6 @@ Technology specific semantic conventions are defined for the following databases
 * [Cosmos DB](cosmosdb.md): Semantic Conventions for *Microsoft Cosmos DB*.
 * [CouchDB](couchdb.md): Semantic Conventions for *CouchDB*.
 * [Elasticsearch](elasticsearch.md): Semantic Conventions for *Elasticsearch*.
-* [GraphQL](graphql.md): Semantic Conventions for *GraphQL Server*.
 * [HBase](hbase.md): Semantic Conventions for *HBase*.
 * [MongoDB](mongodb.md): Semantic Conventions for *MongoDB*.
 * [MSSQL](mssql.md): Semantic Conventions for *MSSQL*.
diff --git a/docs/database/database-spans.md b/docs/database/database-spans.md
index 09449ae15a..b454ddea8e 100644
--- a/docs/database/database-spans.md
+++ b/docs/database/database-spans.md
@@ -187,7 +187,6 @@ More specific Semantic Conventions are defined for the following database techno
 * [Cosmos DB](cosmosdb.md): Semantic Conventions for *Microsoft Cosmos DB*.
 * [CouchDB](couchdb.md): Semantic Conventions for *CouchDB*.
 * [Elasticsearch](elasticsearch.md): Semantic Conventions for *Elasticsearch*.
-* [GraphQL](graphql.md): Semantic Conventions for *GraphQL Server*.
 * [HBase](hbase.md): Semantic Conventions for *HBase*.
 * [MongoDB](mongodb.md): Semantic Conventions for *MongoDB*.
 * [MSSQL](mssql.md): Semantic Conventions for *MSSQL*.
diff --git a/docs/database/graphql.md b/docs/graphql/graphql-spans.md
similarity index 100%
rename from docs/database/graphql.md
rename to docs/graphql/graphql-spans.md