diff --git a/www/components/Partners/TileGrid.tsx b/www/components/Partners/TileGrid.tsx
index 4e7b3299fab..c1a2a5f089a 100644
--- a/www/components/Partners/TileGrid.tsx
+++ b/www/components/Partners/TileGrid.tsx
@@ -1,3 +1,4 @@
+import Image from 'next/image'
 import Link from 'next/link'
 import { Partner } from '~/types/partners'
 
@@ -34,16 +35,17 @@ export default function TileGrid({
                 hover:shadow-lg"
                   >
                     <div className="flex w-full space-x-6">
-                      <img
-                        className="
-                      transition-all scale-100 group-hover:scale-110
-                      flex-shrink-0 w-12 h-12 bg-gray-300 rounded-full
-                      "
-                        src={p.logo}
-                        alt={p.title}
-                      />
+                      <div className="w-10 h-10 transition-all scale-100 group-hover:scale-110">
+                        <Image
+                          layout="fixed"
+                          width={40}
+                          height={40}
+                          className="w-10 h-10 bg-gray-300 rounded-full"
+                          src={p.logo}
+                          alt={p.title}
+                        />
+                      </div>
                       <div>
-                        {/* <span className="text-xs text-scale-900">{p.category}</span> */}
                         <h3 className="transition-colors text-xl text-scale-1100 group-hover:text-scale-1200 mb-2">
                           {p.title}
                         </h3>
diff --git a/www/next.config.js b/www/next.config.js
index c5d4c7ea558..291212b011d 100644
--- a/www/next.config.js
+++ b/www/next.config.js
@@ -6,7 +6,14 @@ module.exports = withMDX({
 
   trailingSlash: false,
   images: {
-    domains: ['github.com', 'ca.slack-edge.com', 'res.cloudinary.com', 'images.unsplash.com'],
+    domains: [
+      'github.com',
+      'ca.slack-edge.com',
+      'res.cloudinary.com',
+      'images.unsplash.com',
+      'supabase.com',
+      'obuldanrptloktxcffvn.supabase.co',
+    ],
   },
   async headers() {
     return [
diff --git a/www/package-lock.json b/www/package-lock.json
index 25548e2aac6..e72e49ae496 100644
--- a/www/package-lock.json
+++ b/www/package-lock.json
@@ -1269,79 +1269,37 @@
       }
     },
     "@next/env": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-12.1.0.tgz",
-      "integrity": "sha512-nrIgY6t17FQ9xxwH3jj0a6EOiQ/WDHUos35Hghtr+SWN/ntHIQ7UpuvSi0vaLzZVHQWaDupKI+liO5vANcDeTQ=="
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-12.1.1.tgz",
+      "integrity": "sha512-VmTRkfo/IXOQCATndjW3OjKb8zmAuB07eDdzO9XvuXZP87SyvnCYw3jrhUuFhOe/FVsKiloafa5LJfToUpvjUQ=="
     },
     "@next/mdx": {
       "version": "10.2.3",
       "resolved": "https://registry.npmjs.org/@next/mdx/-/mdx-10.2.3.tgz",
       "integrity": "sha512-hseekptFqOCxLbdaNDS/yelaG2Q2uaNDilnRjq8Uv/LWHuZ9F2cp7ndwTolW9acJsbDedamKRMgdw4V2Fz0pUA=="
     },
+    "@next/swc-android-arm-eabi": {
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-12.1.1.tgz",
+      "integrity": "sha512-phV9H6d1eK1oVC7nmKKcCXvgOWT4K7aLC/beyO6yvbFC4XtBLE21vPwVl7B4ybz5xjSa6TXoR3TMR6vkW6Mv+A==",
+      "optional": true
+    },
     "@next/swc-android-arm64": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.1.0.tgz",
-      "integrity": "sha512-/280MLdZe0W03stA69iL+v6I+J1ascrQ6FrXBlXGCsGzrfMaGr7fskMa0T5AhQIVQD4nA/46QQWxG//DYuFBcA==",
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-12.1.1.tgz",
+      "integrity": "sha512-X5qEz0YeeYT0Gz2wXPAEtRKEuAsLUIEgC/DDfS98t/5Idjv0S4aqIX+TQdzoXP5bwQkIr+mSg+MBIdLtbtnCsA==",
       "optional": true
     },
     "@next/swc-darwin-arm64": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.0.tgz",
-      "integrity": "sha512-R8vcXE2/iONJ1Unf5Ptqjk6LRW3bggH+8drNkkzH4FLEQkHtELhvcmJwkXcuipyQCsIakldAXhRbZmm3YN1vXg==",
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-12.1.1.tgz",
+      "integrity": "sha512-bKKSNaTdnO3XPnfaR4NSpPcbs80fdbtOYC2lgtqLzA0bOMioupixMP5GrA/gfJHwh7GRH+A+sbgKQWsqSsYAqQ==",
       "optional": true
     },
     "@next/swc-darwin-x64": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.0.tgz",
-      "integrity": "sha512-ieAz0/J0PhmbZBB8+EA/JGdhRHBogF8BWaeqR7hwveb6SYEIJaDNQy0I+ZN8gF8hLj63bEDxJAs/cEhdnTq+ug==",
-      "optional": true
-    },
-    "@next/swc-linux-arm-gnueabihf": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.0.tgz",
-      "integrity": "sha512-njUd9hpl6o6A5d08dC0cKAgXKCzm5fFtgGe6i0eko8IAdtAPbtHxtpre3VeSxdZvuGFh+hb0REySQP9T1ttkog==",
-      "optional": true
-    },
-    "@next/swc-linux-arm64-gnu": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.0.tgz",
-      "integrity": "sha512-OqangJLkRxVxMhDtcb7Qn1xjzFA3s50EIxY7mljbSCLybU+sByPaWAHY4px97ieOlr2y4S0xdPKkQ3BCAwyo6Q==",
-      "optional": true
-    },
-    "@next/swc-linux-arm64-musl": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.0.tgz",
-      "integrity": "sha512-hB8cLSt4GdmOpcwRe2UzI5UWn6HHO/vLkr5OTuNvCJ5xGDwpPXelVkYW/0+C3g5axbDW2Tym4S+MQCkkH9QfWA==",
-      "optional": true
-    },
-    "@next/swc-linux-x64-gnu": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.0.tgz",
-      "integrity": "sha512-OKO4R/digvrVuweSw/uBM4nSdyzsBV5EwkUeeG4KVpkIZEe64ZwRpnFB65bC6hGwxIBnTv5NMSnJ+0K/WmG78A==",
-      "optional": true
-    },
-    "@next/swc-linux-x64-musl": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.0.tgz",
-      "integrity": "sha512-JohhgAHZvOD3rQY7tlp7NlmvtvYHBYgY0x5ZCecUT6eCCcl9lv6iV3nfu82ErkxNk1H893fqH0FUpznZ/H3pSw==",
-      "optional": true
-    },
-    "@next/swc-win32-arm64-msvc": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.0.tgz",
-      "integrity": "sha512-T/3gIE6QEfKIJ4dmJk75v9hhNiYZhQYAoYm4iVo1TgcsuaKLFa+zMPh4056AHiG6n9tn2UQ1CFE8EoybEsqsSw==",
-      "optional": true
-    },
-    "@next/swc-win32-ia32-msvc": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.0.tgz",
-      "integrity": "sha512-iwnKgHJdqhIW19H9PRPM9j55V6RdcOo6rX+5imx832BCWzkDbyomWnlzBfr6ByUYfhohb8QuH4hSGEikpPqI0Q==",
-      "optional": true
-    },
-    "@next/swc-win32-x64-msvc": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.0.tgz",
-      "integrity": "sha512-aBvcbMwuanDH4EMrL2TthNJy+4nP59Bimn8egqv6GHMVj0a44cU6Au4PjOhLNqEh9l+IpRGBqMTzec94UdC5xg==",
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-12.1.1.tgz",
+      "integrity": "sha512-2VOsA6WLDuDBA6935djohWGGeUIKeQhXwDwu1CKx1b8+6YMMIvFr/y2dpPWoct+5/IjFz84a2MnbABwpoNB9YA==",
       "optional": true
     },
     "@nodelib/fs.scandir": {
@@ -4016,28 +3974,77 @@
       "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
     },
     "next": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/next/-/next-12.1.0.tgz",
-      "integrity": "sha512-s885kWvnIlxsUFHq9UGyIyLiuD0G3BUC/xrH0CEnH5lHEWkwQcHOORgbDF0hbrW9vr/7am4ETfX4A7M6DjrE7Q==",
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/next/-/next-12.1.1.tgz",
+      "integrity": "sha512-IOfEIAgroMtsoYz6HXpDS+b5WB9WZ+MH266COXGlcpIiYSgUyJf9xV6vF+zY2RPvBJFT4fUW0EVdVnoOmTloDw==",
       "requires": {
-        "@next/env": "12.1.0",
-        "@next/swc-android-arm64": "12.1.0",
-        "@next/swc-darwin-arm64": "12.1.0",
-        "@next/swc-darwin-x64": "12.1.0",
-        "@next/swc-linux-arm-gnueabihf": "12.1.0",
-        "@next/swc-linux-arm64-gnu": "12.1.0",
-        "@next/swc-linux-arm64-musl": "12.1.0",
-        "@next/swc-linux-x64-gnu": "12.1.0",
-        "@next/swc-linux-x64-musl": "12.1.0",
-        "@next/swc-win32-arm64-msvc": "12.1.0",
-        "@next/swc-win32-ia32-msvc": "12.1.0",
-        "@next/swc-win32-x64-msvc": "12.1.0",
+        "@next/env": "12.1.1",
+        "@next/swc-android-arm-eabi": "12.1.1",
+        "@next/swc-android-arm64": "12.1.1",
+        "@next/swc-darwin-arm64": "12.1.1",
+        "@next/swc-darwin-x64": "12.1.1",
+        "@next/swc-linux-arm-gnueabihf": "12.1.1",
+        "@next/swc-linux-arm64-gnu": "12.1.1",
+        "@next/swc-linux-arm64-musl": "12.1.1",
+        "@next/swc-linux-x64-gnu": "12.1.1",
+        "@next/swc-linux-x64-musl": "12.1.1",
+        "@next/swc-win32-arm64-msvc": "12.1.1",
+        "@next/swc-win32-ia32-msvc": "12.1.1",
+        "@next/swc-win32-x64-msvc": "12.1.1",
         "caniuse-lite": "^1.0.30001283",
         "postcss": "8.4.5",
-        "styled-jsx": "5.0.0",
+        "styled-jsx": "5.0.1",
         "use-subscription": "1.5.1"
       },
       "dependencies": {
+        "@next/swc-linux-arm-gnueabihf": {
+          "version": "12.1.1",
+          "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-12.1.1.tgz",
+          "integrity": "sha512-1urXtWwqjqbbpJBWeJYz5ATgelKacVNdKIdhfahbsmW+DZGoK5TYovgieyHFYUCyHdTuKeLTVR62ahIRUBv1YA==",
+          "optional": true
+        },
+        "@next/swc-linux-arm64-gnu": {
+          "version": "12.1.1",
+          "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-12.1.1.tgz",
+          "integrity": "sha512-CDD9yFuknDvTOzzDnvfmb58USI5Vu6FUyzw96udKj7KA/n1YrNQ4K8X7KsDCRZoqfRWYceAyj1EpwHkfdiB7bg==",
+          "optional": true
+        },
+        "@next/swc-linux-arm64-musl": {
+          "version": "12.1.1",
+          "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-12.1.1.tgz",
+          "integrity": "sha512-nxyjgmbOpZm7gGPj9EV5Cqosoujt+ih/8SO2XG+BetgfAk0+c15793DHVAljNuc8GF9wpzqQnjMMUZ211VmQsg==",
+          "optional": true
+        },
+        "@next/swc-linux-x64-gnu": {
+          "version": "12.1.1",
+          "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-12.1.1.tgz",
+          "integrity": "sha512-L8Cu8kH3Vn2dnRpvcvGGA1TlmDP2WXJ+qDwvjb/ikDXLdRdmFvJwHh45JUGiW2FHed3lGseOgNsuYiDvnT8Cdw==",
+          "optional": true
+        },
+        "@next/swc-linux-x64-musl": {
+          "version": "12.1.1",
+          "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-12.1.1.tgz",
+          "integrity": "sha512-4RAb7L69MoRSggBqUfF3OrtBCUN2zPDi7asfL7bfxEhH10LGzyfil8dT0GVjPOPFz/SyLx3ORd6avGij2IlJUA==",
+          "optional": true
+        },
+        "@next/swc-win32-arm64-msvc": {
+          "version": "12.1.1",
+          "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-12.1.1.tgz",
+          "integrity": "sha512-zvkuNIgOxkAU3RbzWRGCcFasDxWJdhONt2YeRGe39dJERHhEFA1u4HgaZw/SFE/kfrNRUZbXjJNAg3OU/EpPZw==",
+          "optional": true
+        },
+        "@next/swc-win32-ia32-msvc": {
+          "version": "12.1.1",
+          "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-12.1.1.tgz",
+          "integrity": "sha512-GsNDtZ//uKWNVjiwv3YKQYsDXuRWTz8jTmxopf5Ws3dK+zA77hn4o46LBQg0JPCNqTUO6eIOlUBjqSL6ejxmSQ==",
+          "optional": true
+        },
+        "@next/swc-win32-x64-msvc": {
+          "version": "12.1.1",
+          "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.1.1.tgz",
+          "integrity": "sha512-nH5osn/uK9wsjT8Jh1YxMtRrkN5hoCNLQjsEdvfUfb+loQXeYiBd3n/0DUJkf6Scjfv6/htfUTPP3AEa7AbBxQ==",
+          "optional": true
+        },
         "postcss": {
           "version": "8.4.5",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
@@ -6090,9 +6097,9 @@
       }
     },
     "styled-jsx": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.0.0.tgz",
-      "integrity": "sha512-qUqsWoBquEdERe10EW8vLp3jT25s/ssG1/qX5gZ4wu15OZpmSMFI2v+fWlRhLfykA5rFtlJ1ME8A8pm/peV4WA=="
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.0.1.tgz",
+      "integrity": "sha512-+PIZ/6Uk40mphiQJJI1202b+/dYeTVd9ZnMPR80pgiWbjIwvN2zIp4r9et0BgqBuShh48I0gttPlAXA7WVvBxw=="
     },
     "supports-color": {
       "version": "5.5.0",
diff --git a/www/pages/partners/[slug].tsx b/www/pages/partners/[slug].tsx
index 68dca6ed3ad..0bc1a8a9f82 100644
--- a/www/pages/partners/[slug].tsx
+++ b/www/pages/partners/[slug].tsx
@@ -10,6 +10,7 @@ import DefaultLayout from '~/components/Layouts/Default'
 import SectionContainer from '~/components/Layouts/SectionContainer'
 import { Partner } from '~/types/partners'
 import Error404 from '../404'
+import Image from 'next/image'
 
 const supabase = createClient(
   'https://obuldanrptloktxcffvn.supabase.co',
@@ -47,7 +48,10 @@ function Partner({ partner }: { partner: Partner }) {
             </Link>
 
             <div className="flex items-center space-x-4">
-              <img
+              <Image
+                layout="fixed"
+                width={56}
+                height={56}
                 className="rounded-full bg-scale-400 w-14 h-14 flex-shrink-f0"
                 src={partner.logo}
                 alt={partner.title}
@@ -89,8 +93,15 @@ function Partner({ partner }: { partner: Partner }) {
                 {partner.images.map((image: any, i: number) => {
                   return (
                     <SwiperSlide key={i}>
-                      <div className="ml-3 mr-3 cursor-move">
-                        <img src={image} alt={partner.title} />
+                      <div className="relative block ml-3 mr-3 cursor-move">
+                        <Image
+                          layout="responsive"
+                          objectFit="contain"
+                          width={1460}
+                          height={960}
+                          src={image}
+                          alt={partner.title}
+                        />
                       </div>
                     </SwiperSlide>
                   )