diff --git a/README.md b/README.md
index f4c8b99e41f..0ae54fc8d0b 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@
 - [x] Authentication and Authorization. [Docs](https://supabase.com/docs/guides/auth)
 - [x] Auto-generated APIs.
   - [x] REST. [Docs](https://supabase.com/docs/guides/database/api#rest-api)
+  - [x] GraphQL. [Docs](https://supabase.com/docs/guides/database/api#graphql-api)
   - [x] Realtime subscriptions. [Docs](https://supabase.com/docs/guides/database/api#realtime-api)
-  - [x] GraphQL (Beta). [Docs](https://supabase.com/docs/guides/database/api#graphql-api)
 - [x] Functions.
   - [x] Database Functions. [Docs](https://supabase.com/docs/guides/database/functions)
   - [x] Edge Functions [Docs](https://supabase.com/docs/guides/functions)
@@ -63,6 +63,7 @@ You can also [self-host](https://supabase.com/docs/guides/hosting/overview) and
 - [PostgreSQL](https://www.postgresql.org/) is an object-relational database system with over 30 years of active development that has earned it a strong reputation for reliability, feature robustness, and performance.
 - [Realtime](https://github.com/supabase/realtime) is an Elixir server that allows you to listen to PostgreSQL inserts, updates, and deletes using websockets. Realtime polls Postgres' built-in replication functionality for database changes, converts changes to JSON, then broadcasts the JSON over websockets to authorized clients.
 - [PostgREST](http://postgrest.org/) is a web server that turns your PostgreSQL database directly into a RESTful API
+- [pg_graphql](http://github.com/supabase/pg_graphql/) a PostgreSQL extension that exposes a GraphQL API
 - [Storage](https://github.com/supabase/storage-api) provides a RESTful interface for managing Files stored in S3, using Postgres to manage permissions.
 - [postgres-meta](https://github.com/supabase/postgres-meta) is a RESTful API for managing your Postgres, allowing you to fetch tables, add roles, and run queries, etc.
 - [GoTrue](https://github.com/netlify/gotrue) is an SWT based API for managing users and issuing SWT tokens.
diff --git a/apps/docs/pages/guides/database/api.mdx b/apps/docs/pages/guides/database/api.mdx
index fc8f86a18ae..4b83ce2a50d 100644
--- a/apps/docs/pages/guides/database/api.mdx
+++ b/apps/docs/pages/guides/database/api.mdx
@@ -12,7 +12,7 @@ Supabase auto-generates three types of API directly from your database schema.
 
 - REST - interact with your database through a restful interface.
 - Realtime - listen to database changes.
-- GraphQL - [in beta](https://supabase.com/blog/pg-graphql).
+- GraphQL - manipulate your database using a graph-like query language
 
 The APIs are:
 
@@ -25,9 +25,10 @@ The APIs are:
 ## REST API [#rest-api-overview]
 
 Supabase provides a RESTful API using [PostgREST](https://postgrest.org/). This is a very thin API layer on top of Postgres.
-It provides everything you need from a CRUD API:
+It provides everything you need from a CRUD API at the URL `https://<project_ref>.supabase.co/rest/v1/`.
 
-- Basic CRUD operations
+Features:
+- Basic CRUD operations (Create/Read/Update/Delete)
 - Deeply nested joins, allowing you to fetch data from multiple tables in a single fetch
 - Works with Postgres Views
 - Works with Postgres Functions
@@ -42,15 +43,28 @@ It provides everything you need from a CRUD API:
   ></iframe>
 </div>
 
+Reference:
+- [Docs](https://postgrest.org/)
+- [Source Code](https://github.com/PostgREST/postgrest)
+
 ## GraphQL API [#graphql-api-overview]
 
-<Admonition type='note'>
+Supabase uses [pg_graphql](https://supabase.github.io/pg_graphql/) to expose a GraphQL API endpoint at `https://<project_ref>.supabase.co/graphql/v1/`.
+You can introspect and query the GraphQL API of an existing Supabase project within Studio [here](https://app.supabase.com/project/_/api/graphiql),
+or navigate there manually at `API Docs > GraphQL > GraphiQL`.
 
-GraphQL is in Beta, and may have breaking changes. It is only available on self-hosted setups and Supabase projects created after 28th March 2022.
+The GraphQL interface is automatically reflected from your database's schema and supports:
+- Basic CRUD operations (Create/Read/Update/Delete)
+- Support for Tables, Views, Materialized Views, and Foreign Tables
+- Arbitrarily deep relationships among tables/views
+- User defined computed fields
+- The Postgres security model - including Row Level Security, Roles, and Grants.
 
-</Admonition>
+The GraphQL API resolves all requests in a single round-trip leading to fast response times and high throughput.
 
-GraphQL in Supabase works through [pg_graphql](https://supabase.com/blog/pg-graphql), an open source PostgreSQL extension for GraphQL.
+Reference:
+- [Docs](https://supabase.github.io/pg_graphql/)
+- [Source Code](https://github.com/supabase/pg_graphql)
 
 ## Realtime API [#realtime-api-overview]