diff --git a/apps/docs/public/img/supabase-squad.png b/apps/docs/public/img/supabase-squad.png
deleted file mode 100644
index b84de2e987c..00000000000
Binary files a/apps/docs/public/img/supabase-squad.png and /dev/null differ
diff --git a/apps/docs/pages/handbook/supasquad.mdx b/apps/www/pages/supasquad.mdx
similarity index 89%
rename from apps/docs/pages/handbook/supasquad.mdx
rename to apps/www/pages/supasquad.mdx
index e6ec7e336ac..b2866a3871a 100644
--- a/apps/docs/pages/handbook/supasquad.mdx
+++ b/apps/www/pages/supasquad.mdx
@@ -1,18 +1,22 @@
-import Layout from '~/layouts/DefaultGuideLayout'
+import Layout from '../layouts/Layout'
+import SectionContainer from '../components/Layouts/SectionContainer'
 
 export const meta = {
-  id: 'supasquad',
-  title: 'SupaSquad',
-  description: 'Supabase Advocate program',
+  title: 'Service Level Agreement',
+  description: 'Supabase Service Level Agreement',
 }
 
+<SectionContainer>
+
+# SupaSquad
+
 The SupaSquad is an official Supabase advocate program where community members help build and manage the Supabase community.
 
 - Official recognition in the Supabase community.
 - Direct connection to the Supabase team.
 - Help steer the Supabase community.
 
-![Supabase SupaSquad](/docs/img/supabase-squad.png)
+![Supabase SupaSquad](/images/supabase-squad.png)
 
 ## Requirements
 
@@ -89,6 +93,6 @@ Apply to join the program using [this form](https://airtable.com/shr0FtLqLfhpuEy
   the Supabase ecosystem.
 </details>
 
-export const Page = ({ children }) => <Layout meta={meta} children={children} />
+</SectionContainer>
 
-export default Page
+export default (context) => <Layout meta={meta} children={context.children} context={context} />
diff --git a/apps/www/public/images/supabase-squad.png b/apps/www/public/images/supabase-squad.png
new file mode 100644
index 00000000000..8027de56ba7
Binary files /dev/null and b/apps/www/public/images/supabase-squad.png differ