diff --git a/apps/docs/components/Sponsors.tsx b/apps/www/components/Sponsors.tsx
similarity index 78%
rename from apps/docs/components/Sponsors.tsx
rename to apps/www/components/Sponsors.tsx
index f6203f69201..bd7ca85c3e1 100644
--- a/apps/docs/components/Sponsors.tsx
+++ b/apps/www/components/Sponsors.tsx
@@ -7,32 +7,32 @@ export default function Sponsors() {
     {
       tier_name: '$5,000 a month',
       heading: 'Enterprise: $5,000 per month',
-      transactions: sponsors.filter((x) => x.tier == '$5,000 a month'),
+      transactions: sponsors.filter((x: any) => x.tier == '$5,000 a month'),
     },
     {
       tier_name: '$2,500 a month',
       heading: 'Agency: $2,500 per month',
-      transactions: sponsors.filter((x) => x.tier == '$2,500 a month'),
+      transactions: sponsors.filter((x: any) => x.tier == '$2,500 a month'),
     },
     {
       tier_name: '$1,000 a month',
       heading: 'Startup: $1,000 per month',
-      transactions: sponsors.filter((x) => x.tier == '$1,000 a month'),
+      transactions: sponsors.filter((x: any) => x.tier == '$1,000 a month'),
     },
     {
       tier_name: '$49 a month',
       heading: 'Evangelist: $49 per month',
-      transactions: sponsors.filter((x) => x.tier == '$49 a month'),
+      transactions: sponsors.filter((x: any) => x.tier == '$49 a month'),
     },
     {
       tier_name: '$19 a month',
       heading: 'Supporter: $19 per month',
-      transactions: sponsors.filter((x) => x.tier == '$19 a month'),
+      transactions: sponsors.filter((x: any) => x.tier == '$19 a month'),
     },
     {
       tier_name: '$5 a month',
       heading: 'Contributor: $5 per month',
-      transactions: sponsors.filter((x) => x.tier == '$5 a month'),
+      transactions: sponsors.filter((x: any) => x.tier == '$5 a month'),
     },
   ]
 
@@ -44,7 +44,7 @@ export default function Sponsors() {
             <div key={index}>
               <h4 className="font-bold">{t.heading}</h4>
               <div className="grid sm:grid-cols-2 lg:grid-cols-3 gap-6 pl-4">
-                {t.transactions.map((x, index) => (
+                {t.transactions.map((x: any, index: any) => (
                   <div className="" key={index}>
                     <a
                       className="flex items-center gap-4 shadow-none shrink-0"
diff --git a/apps/docs/data/maintainers.json b/apps/www/data/maintainers.json
similarity index 100%
rename from apps/docs/data/maintainers.json
rename to apps/www/data/maintainers.json
diff --git a/apps/docs/data/sponsors.json b/apps/www/data/sponsors.json
similarity index 100%
rename from apps/docs/data/sponsors.json
rename to apps/www/data/sponsors.json
diff --git a/apps/www/lib/redirects.js b/apps/www/lib/redirects.js
index 11d28e34e7c..0490d26c95f 100644
--- a/apps/www/lib/redirects.js
+++ b/apps/www/lib/redirects.js
@@ -556,11 +556,6 @@ module.exports = [
     source: '/docs/reference/javascript/reset-password-email',
     destination: '/docs/reference/javascript/auth-api-resetpasswordforemail',
   },
-  {
-    permanent: true,
-    source: '/oss',
-    destination: '/docs/oss',
-  },
   {
     permanent: true,
     source: '/docs/reference/postgres/connection-strings',
diff --git a/apps/www/package.json b/apps/www/package.json
index 17051852fdf..3ce73a7ff4a 100644
--- a/apps/www/package.json
+++ b/apps/www/package.json
@@ -18,6 +18,7 @@
     "@mdx-js/react": "^1.6.22",
     "@next/bundle-analyzer": "^13.0.0",
     "@next/mdx": "^10.0.7",
+    "@octokit/core": "^4.1.0",
     "@supabase/auth-ui-react": "^0.1.6",
     "@supabase/supabase-js": "^2.0.0",
     "classnames": "^2.3.1",
diff --git a/apps/docs/pages/oss.tsx b/apps/www/pages/oss.tsx
similarity index 61%
rename from apps/docs/pages/oss.tsx
rename to apps/www/pages/oss.tsx
index fe6d75a72ab..1a932ff9fe4 100644
--- a/apps/docs/pages/oss.tsx
+++ b/apps/www/pages/oss.tsx
@@ -1,22 +1,21 @@
 import { useState, useEffect } from 'react'
 import { Octokit } from '@octokit/core'
-import Layout from '~/layouts/Default'
+import DefaultLayout from '~/components/Layouts/Default'
+import SectionContainer from '~/components/Layouts/SectionContainer'
 import maintainers from '../data/maintainers.json'
-import { menuItems } from '~/components/Navigation/Navigation.constants'
-import GithubCard from '../components/GithubCard'
 import Sponsors from '../components/Sponsors'
 import Image from 'next/image'
 
-export default function Oss({ meta }) {
+export default function Oss() {
   const octokit = new Octokit()
 
   const [activePill, setActivePill] = useState('All')
   const [repos, setRepos] = useState([])
 
   const maintainerTags = maintainers
-    .reduce((acc, x) => acc.concat(x.tags), []) // get all tags
-    .filter((v, i, a) => a.indexOf(v) === i) // remove duplicates
-    .sort((a, b) => a.localeCompare(b)) // alphabetical
+    .reduce((acc: any, x: any) => acc.concat(x.tags), []) // get all tags
+    .filter((v: any, i: any, a: any) => a.indexOf(v) === i) // remove duplicates
+    .sort((a: any, b: any) => a.localeCompare(b)) // alphabetical
   const maintainerPills = ['All'].concat(maintainerTags)
 
   useEffect(() => {
@@ -29,46 +28,42 @@ export default function Oss({ meta }) {
       })
       setRepos(
         res.data
-          .filter((r) => !!r.stargazers_count)
-          .sort((a, b) => b.stargazers_count - a.stargazers_count)
+          .filter((r: any) => !!r.stargazers_count)
+          .sort((a: any, b: any) => b.stargazers_count - a.stargazers_count)
       )
     }
     fetchOctoData()
   }, [])
 
   return (
-    <Layout meta={meta} menuItems={menuItems['docs']} currentPage="docs">
-      <section className={'section-lg'}>
+    <DefaultLayout>
+      <div className="text-scale-1200 container mx-auto">
+      <SectionContainer>
         <div className="container">
-          <div className="flex items-center">
+        <div className="flex items-center mb-16">
             <div className="col">
-              <h1 className="mt-0">Open source</h1>
-              <p className="">
+              <h1 className="mb-10 text-4xl font-medium">Open source</h1>
+              <p className="max-w-xl">
                 Supabase is an open source company, supporting existing open source tools and
                 communities wherever possible.
               </p>
             </div>
           </div>
-        </div>
-      </section>
-
-      <section className={'section-lg'}>
-        <div className="container">
-          <h2 className="with-underline">Sponsors</h2>
+          <h2 className="mb-6 text-2xl font-medium">Sponsors</h2>
           <Sponsors />
         </div>
-      </section>
+      </SectionContainer>
 
-      <section>
+      <SectionContainer>
         <div className="">
-          <h2>Community Maintainers</h2>
+          <h2 className="mb-6 text-2xl font-medium">Community Maintainers</h2>
 
           <div className="overflow-auto md:max-w-none hidden sm:block">
             <ul className="flex 2xl:gap-4 items-center p-0">
               {maintainerPills.map((x) => (
                 <li
                   key={x}
-                  className={`mx-4 rounded-sm inline-block p-2 cursor-pointer hover:text-brand-800 ${
+                  className={`mx-4 rounded-t-lg inline-block p-2 cursor-pointer hover:text-brand-800 ${
                     activePill == x ? 'bg-gray-200 dark:bg-gray-400 text-brand-800' : ''
                   }`}
                   onClick={() => setActivePill(x)}
@@ -85,12 +80,12 @@ export default function Oss({ meta }) {
               .map((x, idx) => (
                 <div className="" key={idx}>
                   <a
-                    className="shadow-none flex gap-4"
+                    className="flex gap-4"
                     href={`https://github.com/${x.handle}`}
                     target="_blank"
                     rel="noreferrer"
                   >
-                    <div className="grow bg-gray-200 dark:bg-gray-400 p-4">
+                    <div className="grow bg-gray-200 dark:bg-gray-400 p-4 rounded-lg">
                       <div className="flex gap-4 shrink-0">
                         <Image
                           className="rounded-full my-0"
@@ -111,29 +106,34 @@ export default function Oss({ meta }) {
               ))}
           </div>
         </div>
-      </section>
+      </SectionContainer>
 
       {/* OSS */}
-      <section>
+      <SectionContainer>
         <div>
-          <h2>Repositories</h2>
+          <h2 className="mb-6 text-2xl font-medium">Repositories</h2>
           <div className="grid gap-4">
             {repos.length < 1 && <div></div>}
             {repos.length >= 1 &&
-              repos.map((props, idx) => (
-                <div className="bg-gray-200 dark:bg-gray-400 p-4" key={idx}>
-                  <GithubCard
-                    title={props.name}
-                    description={props.description}
-                    href={props.html_url}
-                    stars={props.stargazers_count}
-                    handle={props.full_name}
-                  />
+              repos.map((props: any, idx: any) => (
+                <div className="bg-gray-200 dark:bg-gray-400 p-4 rounded-lg" key={idx}>
+                  <a className="h-full" href={props.html_url}>
+                    <div className="card__body">
+                      <h4 className="uppercase my-2 font-semibold">{props.name}</h4>
+                      <span className="text-sm">{props.description}</span>
+                    </div>
+                    <hr className="my-2" />
+                    <div className="flex justify-between py-2 text-xs">
+                      <div>@{props.full_name}</div>
+                      <div>{props.stargazers_count} ★</div>
+                    </div>
+                  </a>
                 </div>
               ))}
           </div>
         </div>
-      </section>
-    </Layout>
+      </SectionContainer>
+      </div>
+    </DefaultLayout>
   )
 }
diff --git a/package-lock.json b/package-lock.json
index 66be52941a9..14714bc64cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -217,6 +217,7 @@
         "@mdx-js/react": "^1.6.22",
         "@next/bundle-analyzer": "^13.0.0",
         "@next/mdx": "^10.0.7",
+        "@octokit/core": "^4.1.0",
         "@supabase/auth-ui-react": "^0.1.6",
         "@supabase/supabase-js": "^2.0.0",
         "classnames": "^2.3.1",
@@ -66010,6 +66011,7 @@
         "@mdx-js/react": "^1.6.22",
         "@next/bundle-analyzer": "^13.0.0",
         "@next/mdx": "^10.0.7",
+        "@octokit/core": "*",
         "@supabase/auth-ui-react": "^0.1.6",
         "@supabase/supabase-js": "^2.0.0",
         "@tailwindcss/typography": "^0.5.7",