diff --git a/README.md b/README.md
index 08120545543..0b5a5e6f455 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ You can also [self-host](https://supabase.com/docs/guides/hosting/overview) and
- [Storage](https://github.com/supabase/storage-api) a RESTful API for managing files in S3, with Postgres handling permissions.
- [pg_graphql](http://github.com/supabase/pg_graphql/) a PostgreSQL extension that exposes a GraphQL API.
- [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.
-- [Kong](https://github.com/Kong/kong) is a cloud-native API gateway.
+- [Envoy](https://github.com/envoyproxy/envoy) is a cloud-native, high-performance edge and service proxy.
#### Client libraries
diff --git a/apps/docs/content/guides/auth/architecture.mdx b/apps/docs/content/guides/auth/architecture.mdx
index b4c0a53092b..3665526c40c 100644
--- a/apps/docs/content/guides/auth/architecture.mdx
+++ b/apps/docs/content/guides/auth/architecture.mdx
@@ -6,12 +6,12 @@ subtitle: 'The architecture behind Supabase Auth.'
There are four major layers to Supabase Auth:
1. [Client layer.](#client-layer) This can be one of the Supabase client SDKs, or manually made HTTP requests using the HTTP client of your choice.
-1. Kong API gateway. This is shared between all Supabase products.
+1. Envoy API gateway. This is shared between all Supabase products.
1. [Auth service](#auth-service) (formerly known as GoTrue).
1. [Postgres database.](#postgres) This is shared between all Supabase products.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -171,4 +171,23 @@
+
+ENVOY
+envoyproxy.io
+POSTGRESQL
+postgresql.org
+GoTrue
+PostgREST
+Realtime
+Storage
+pg-meta
+Functions
+pg_graphql
+/auth
+/rest
+/realtime
+/storage
+/pg
+/functions
+/graphql
diff --git a/apps/docs/public/img/supabase-architecture.svg b/apps/docs/public/img/supabase-architecture.svg
index 2b0ad6325a9..6b4dfd3dc8f 100644
--- a/apps/docs/public/img/supabase-architecture.svg
+++ b/apps/docs/public/img/supabase-architecture.svg
@@ -15,69 +15,69 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -171,4 +171,23 @@
+
+ENVOY
+envoyproxy.io
+POSTGRESQL
+postgresql.org
+GoTrue
+PostgREST
+Realtime
+Storage
+pg-meta
+Functions
+pg_graphql
+/auth
+/rest
+/realtime
+/storage
+/pg
+/functions
+/graphql