diff --git a/apps/web/content/oss-friends/aider.mdx b/apps/web/content/oss-friends/aider.mdx
new file mode 100644
index 0000000000..e7ca64afa8
--- /dev/null
+++ b/apps/web/content/oss-friends/aider.mdx
@@ -0,0 +1,6 @@
+---
+name: Aider
+description: AI pair programming in your terminal. Chat with LLMs to edit code in your local git repo.
+href: https://aider.chat
+github: https://github.com/paul-gauthier/aider
+---
diff --git a/apps/web/content/oss-friends/airbyte.mdx b/apps/web/content/oss-friends/airbyte.mdx
new file mode 100644
index 0000000000..fdd65554eb
--- /dev/null
+++ b/apps/web/content/oss-friends/airbyte.mdx
@@ -0,0 +1,7 @@
+---
+name: Airbyte
+description: Open source data integration platform. Move data from any source to any destination with 300+ connectors.
+href: https://airbyte.com
+github: https://github.com/airbytehq/airbyte
+image: https://cdn.prod.website-files.com/687b2d16145b3601a227c537/687b2d16145b3601a227d8a2_opengraph%20(3).png
+---
diff --git a/apps/web/content/oss-friends/appflowy.mdx b/apps/web/content/oss-friends/appflowy.mdx
new file mode 100644
index 0000000000..7ba3141e06
--- /dev/null
+++ b/apps/web/content/oss-friends/appflowy.mdx
@@ -0,0 +1,7 @@
+---
+name: AppFlowy
+description: Open source Notion alternative. AI-powered workspace for wikis, projects, and knowledge management with full data control.
+href: https://appflowy.io
+github: https://github.com/AppFlowy-IO/AppFlowy
+image: https://appflowy.com/_next/static/media/og-image.838814e7.png
+---
diff --git a/apps/web/content/oss-friends/appsmith.mdx b/apps/web/content/oss-friends/appsmith.mdx
new file mode 100644
index 0000000000..121ac9a791
--- /dev/null
+++ b/apps/web/content/oss-friends/appsmith.mdx
@@ -0,0 +1,7 @@
+---
+name: Appsmith
+description: Open source low-code platform to build internal tools. Connect to databases and APIs to create custom apps fast.
+href: https://appsmith.com
+github: https://github.com/appsmithorg/appsmith
+image: https://images.ctfassets.net/lpvian6u6i39/3K4hnNGrLSlQzJRF4bn32J/8da3f35480fa66fd6c439e9af35b60ab/Default_OG_image.jpg
+---
diff --git a/apps/web/content/oss-friends/appwrite.mdx b/apps/web/content/oss-friends/appwrite.mdx
new file mode 100644
index 0000000000..7c86d24046
--- /dev/null
+++ b/apps/web/content/oss-friends/appwrite.mdx
@@ -0,0 +1,7 @@
+---
+name: Appwrite
+description: Open source backend platform. Build secure apps with authentication, databases, storage, and serverless functions.
+href: https://appwrite.io
+github: https://github.com/appwrite/appwrite
+image: https://appwrite.io/images/open-graph/website.png
+---
diff --git a/apps/web/content/oss-friends/chatwoot.mdx b/apps/web/content/oss-friends/chatwoot.mdx
new file mode 100644
index 0000000000..c4e028aa0f
--- /dev/null
+++ b/apps/web/content/oss-friends/chatwoot.mdx
@@ -0,0 +1,6 @@
+---
+name: Chatwoot
+description: Open source customer engagement platform. Omnichannel support with live chat, email, social media, and messaging apps.
+href: https://chatwoot.com
+github: https://github.com/chatwoot/chatwoot
+---
diff --git a/apps/web/content/oss-friends/cline.mdx b/apps/web/content/oss-friends/cline.mdx
new file mode 100644
index 0000000000..9babab4e8c
--- /dev/null
+++ b/apps/web/content/oss-friends/cline.mdx
@@ -0,0 +1,7 @@
+---
+name: Cline
+description: Autonomous coding agent for VS Code. AI-powered assistant that can create files, run commands, and use the browser with your permission.
+href: https://cline.bot
+github: https://github.com/cline/cline
+image: https://cline.bot/cline_og_img.png
+---
diff --git a/apps/web/content/oss-friends/continue.mdx b/apps/web/content/oss-friends/continue.mdx
new file mode 100644
index 0000000000..7980aa3db7
--- /dev/null
+++ b/apps/web/content/oss-friends/continue.mdx
@@ -0,0 +1,7 @@
+---
+name: Continue
+description: Open source AI code assistant. The leading IDE extension for connecting any LLM to VS Code and JetBrains.
+href: https://continue.dev
+github: https://github.com/continuedev/continue
+image: https://cdn.prod.website-files.com/663e06c56841363663ffbbcf/688c27c869cbd188382d8bca_social%20card%402x.png
+---
diff --git a/apps/web/content/oss-friends/coolify.mdx b/apps/web/content/oss-friends/coolify.mdx
new file mode 100644
index 0000000000..60e8db8673
--- /dev/null
+++ b/apps/web/content/oss-friends/coolify.mdx
@@ -0,0 +1,7 @@
+---
+name: Coolify
+description: Open source self-hosting platform. Deploy applications, databases, and services on your own hardware with ease.
+href: https://coolify.io
+github: https://github.com/coollabsio/coolify
+image: https://coolify.io/og-image.png
+---
diff --git a/apps/web/content/oss-friends/dify.mdx b/apps/web/content/oss-friends/dify.mdx
new file mode 100644
index 0000000000..aae6b1e006
--- /dev/null
+++ b/apps/web/content/oss-friends/dify.mdx
@@ -0,0 +1,7 @@
+---
+name: Dify
+description: Open source LLM app development platform. Build AI workflows, RAG pipelines, and agent applications with visual orchestration.
+href: https://dify.ai
+github: https://github.com/langgenius/dify
+image: https://framerusercontent.com/assets/wuOqS9XwiT7WjyMd0HAinp7aWo.png
+---
diff --git a/apps/web/content/oss-friends/directus.mdx b/apps/web/content/oss-friends/directus.mdx
new file mode 100644
index 0000000000..7d6ef3c0ff
--- /dev/null
+++ b/apps/web/content/oss-friends/directus.mdx
@@ -0,0 +1,7 @@
+---
+name: Directus
+description: Open source data platform. Instant REST and GraphQL APIs for any SQL database with a no-code app builder.
+href: https://directus.io
+github: https://github.com/directus/directus
+image: https://directus.io/og-image.png
+---
diff --git a/apps/web/content/oss-friends/drizzle.mdx b/apps/web/content/oss-friends/drizzle.mdx
new file mode 100644
index 0000000000..5df4d482c8
--- /dev/null
+++ b/apps/web/content/oss-friends/drizzle.mdx
@@ -0,0 +1,6 @@
+---
+name: Drizzle
+description: TypeScript ORM for SQL databases. Lightweight, performant, and type-safe with zero dependencies.
+href: https://orm.drizzle.team
+github: https://github.com/drizzle-team/drizzle-orm
+---
diff --git a/apps/web/content/oss-friends/ghost.mdx b/apps/web/content/oss-friends/ghost.mdx
new file mode 100644
index 0000000000..297b2962b7
--- /dev/null
+++ b/apps/web/content/oss-friends/ghost.mdx
@@ -0,0 +1,7 @@
+---
+name: Ghost
+description: Open source publishing platform. Professional publishing for creators with memberships, newsletters, and content monetization.
+href: https://ghost.org
+github: https://github.com/TryGhost/Ghost
+image: https://ghost.org/images/meta/ghost.png
+---
diff --git a/apps/web/content/oss-friends/gitlab.mdx b/apps/web/content/oss-friends/gitlab.mdx
new file mode 100644
index 0000000000..69fd2a29be
--- /dev/null
+++ b/apps/web/content/oss-friends/gitlab.mdx
@@ -0,0 +1,7 @@
+---
+name: GitLab
+description: The complete DevOps platform. Open source alternative to GitHub with built-in CI/CD, security, and project management.
+href: https://gitlab.com
+github: https://github.com/gitlabhq/gitlabhq
+image: https://res.cloudinary.com/about-gitlab-com/image/upload/v1758207578/whxaklh4tf6nonryosrs.png
+---
diff --git a/apps/web/content/oss-friends/hanko.mdx b/apps/web/content/oss-friends/hanko.mdx
index ad75366b39..8b00a9704a 100644
--- a/apps/web/content/oss-friends/hanko.mdx
+++ b/apps/web/content/oss-friends/hanko.mdx
@@ -3,4 +3,5 @@ name: Hanko
 description: Open source authentication. Passwordless auth with passkeys and WebAuthn.
 href: https://hanko.io
 github: https://github.com/teamhanko/hanko
+image: https://cdn.prod.website-files.com/5e6f5bf4a2ae9702a833f3ee/66277404f19790e279140c2f_Hanko.png
 ---
diff --git a/apps/web/content/oss-friends/hoppscotch.mdx b/apps/web/content/oss-friends/hoppscotch.mdx
new file mode 100644
index 0000000000..7d2954e5e6
--- /dev/null
+++ b/apps/web/content/oss-friends/hoppscotch.mdx
@@ -0,0 +1,6 @@
+---
+name: Hoppscotch
+description: Open source API development ecosystem. The open source Postman alternative for testing REST, GraphQL, and WebSocket APIs.
+href: https://hoppscotch.io
+github: https://github.com/hoppscotch/hoppscotch
+---
diff --git a/apps/web/content/oss-friends/lago.mdx b/apps/web/content/oss-friends/lago.mdx
new file mode 100644
index 0000000000..1e15c0a402
--- /dev/null
+++ b/apps/web/content/oss-friends/lago.mdx
@@ -0,0 +1,7 @@
+---
+name: Lago
+description: Open source metering and usage-based billing. The open source alternative to Stripe Billing for product-led SaaS.
+href: https://getlago.com
+github: https://github.com/getlago/lago
+image: https://cdn.prod.website-files.com/635119506e36baf5c267fecd/635b6df0ee8effaa54c1fa42_banner-open-graph.jpg
+---
diff --git a/apps/web/content/oss-friends/langfuse.mdx b/apps/web/content/oss-friends/langfuse.mdx
new file mode 100644
index 0000000000..4c5dab6a0f
--- /dev/null
+++ b/apps/web/content/oss-friends/langfuse.mdx
@@ -0,0 +1,7 @@
+---
+name: Langfuse
+description: Open source LLM engineering platform. Traces, evals, prompt management, and metrics for debugging and improving LLM apps.
+href: https://langfuse.com
+github: https://github.com/langfuse/langfuse
+image: https://langfuse.com/og.png
+---
diff --git a/apps/web/content/oss-friends/mattermost.mdx b/apps/web/content/oss-friends/mattermost.mdx
new file mode 100644
index 0000000000..364c409511
--- /dev/null
+++ b/apps/web/content/oss-friends/mattermost.mdx
@@ -0,0 +1,7 @@
+---
+name: Mattermost
+description: Open source platform for secure collaboration. Self-hosted Slack alternative for teams that need data control.
+href: https://mattermost.com
+github: https://github.com/mattermost/mattermost
+image: https://mattermost.com/wp-content/uploads/2025/03/USCommercial_1200x628_V2.png
+---
diff --git a/apps/web/content/oss-friends/medusa.mdx b/apps/web/content/oss-friends/medusa.mdx
new file mode 100644
index 0000000000..9f15050efc
--- /dev/null
+++ b/apps/web/content/oss-friends/medusa.mdx
@@ -0,0 +1,7 @@
+---
+name: Medusa
+description: Open source composable commerce platform. The open source Shopify alternative for building digital commerce.
+href: https://medusajs.com
+github: https://github.com/medusajs/medusa
+image: https://cdn.sanity.io/images/5a711ubd/production/98c540b597c98129f16085ceb4809f09c7929630-2400x1260.png?w=1200
+---
diff --git a/apps/web/content/oss-friends/minio.mdx b/apps/web/content/oss-friends/minio.mdx
new file mode 100644
index 0000000000..8d349938e6
--- /dev/null
+++ b/apps/web/content/oss-friends/minio.mdx
@@ -0,0 +1,7 @@
+---
+name: MinIO
+description: High-performance object storage. S3-compatible storage for AI/ML, analytics, and cloud-native applications.
+href: https://min.io
+github: https://github.com/minio/minio
+image: https://cdn.prod.website-files.com/681c8426519d8db8f867c1e8/68501f4ba8cc7fed33ecee9f_766a547f27ec1958c368e92c8c4a0c62_minio_share.png
+---
diff --git a/apps/web/content/oss-friends/neon.mdx b/apps/web/content/oss-friends/neon.mdx
new file mode 100644
index 0000000000..0d902c35b6
--- /dev/null
+++ b/apps/web/content/oss-friends/neon.mdx
@@ -0,0 +1,7 @@
+---
+name: Neon
+description: Serverless Postgres. Fully managed with autoscaling, branching, and bottomless storage.
+href: https://neon.tech
+github: https://github.com/neondatabase/neon
+image: https://neon.com/images/social-previews/index.jpg
+---
diff --git a/apps/web/content/oss-friends/nocodb.mdx b/apps/web/content/oss-friends/nocodb.mdx
new file mode 100644
index 0000000000..d36417d770
--- /dev/null
+++ b/apps/web/content/oss-friends/nocodb.mdx
@@ -0,0 +1,7 @@
+---
+name: NocoDB
+description: Open source Airtable alternative. Turn any database into a smart spreadsheet with APIs and automation.
+href: https://nocodb.com
+github: https://github.com/nocodb/nocodb
+image: https://cdn.prod.website-files.com/650a7aeba6c28976499496bb/686278d1c40e23ec5f1ac414_66245a0c0a05baffdf947012613f7c7b_Website%20Thumbnail.png
+---
diff --git a/apps/web/content/oss-friends/penpot.mdx b/apps/web/content/oss-friends/penpot.mdx
new file mode 100644
index 0000000000..bb2e04642b
--- /dev/null
+++ b/apps/web/content/oss-friends/penpot.mdx
@@ -0,0 +1,7 @@
+---
+name: Penpot
+description: Open source design platform. The open source Figma alternative for design and prototyping with real-time collaboration.
+href: https://penpot.app
+github: https://github.com/penpot/penpot
+image: https://site-assets.plasmic.app/d90e7c3a0897aff68a1229d98cda6246.webp
+---
diff --git a/apps/web/content/oss-friends/plane.mdx b/apps/web/content/oss-friends/plane.mdx
new file mode 100644
index 0000000000..a3820bda61
--- /dev/null
+++ b/apps/web/content/oss-friends/plane.mdx
@@ -0,0 +1,7 @@
+---
+name: Plane
+description: Open source project management. The open source JIRA alternative for issue tracking, sprints, and product roadmaps.
+href: https://plane.so
+github: https://github.com/makeplane/plane
+image: https://plane.so/opengraph-image-4usi79.png?f59298c224fc2be3
+---
diff --git a/apps/web/content/oss-friends/pocketbase.mdx b/apps/web/content/oss-friends/pocketbase.mdx
new file mode 100644
index 0000000000..6f986117af
--- /dev/null
+++ b/apps/web/content/oss-friends/pocketbase.mdx
@@ -0,0 +1,6 @@
+---
+name: PocketBase
+description: Open source backend in a single file. Realtime database, authentication, and file storage in one Go binary.
+href: https://pocketbase.io
+github: https://github.com/pocketbase/pocketbase
+---
diff --git a/apps/web/content/oss-friends/prisma.mdx b/apps/web/content/oss-friends/prisma.mdx
new file mode 100644
index 0000000000..849a8153a3
--- /dev/null
+++ b/apps/web/content/oss-friends/prisma.mdx
@@ -0,0 +1,7 @@
+---
+name: Prisma
+description: Next-generation Node.js and TypeScript ORM. Type-safe database access with auto-generated queries.
+href: https://prisma.io
+github: https://github.com/prisma/prisma
+image: https://cdn.sanity.io/images/p2zxqf70/production/384386cb3c2c21b3ad27c6b6758547fe18b08ac1-1200x630.png
+---
diff --git a/apps/web/content/oss-friends/sentry.mdx b/apps/web/content/oss-friends/sentry.mdx
new file mode 100644
index 0000000000..7b8ad8eef2
--- /dev/null
+++ b/apps/web/content/oss-friends/sentry.mdx
@@ -0,0 +1,7 @@
+---
+name: Sentry
+description: Application monitoring and error tracking. Debug faster with full stack visibility and actionable insights.
+href: https://sentry.io
+github: https://github.com/getsentry/sentry
+image: https://sentry.io/static/sentry-welcome-meta-img-aa40135577a256e0e78aaf4b24946082.png
+---
diff --git a/apps/web/content/oss-friends/strapi.mdx b/apps/web/content/oss-friends/strapi.mdx
new file mode 100644
index 0000000000..918114d821
--- /dev/null
+++ b/apps/web/content/oss-friends/strapi.mdx
@@ -0,0 +1,7 @@
+---
+name: Strapi
+description: Open source headless CMS. Build customizable APIs and manage content with a flexible, developer-first approach.
+href: https://strapi.io
+github: https://github.com/strapi/strapi
+image: https://delicate-dawn-ac25646e6d.media.strapiapp.com/HP_meta_b32f546a40.png
+---
diff --git a/apps/web/content/oss-friends/surrealdb.mdx b/apps/web/content/oss-friends/surrealdb.mdx
new file mode 100644
index 0000000000..7397f2206f
--- /dev/null
+++ b/apps/web/content/oss-friends/surrealdb.mdx
@@ -0,0 +1,7 @@
+---
+name: SurrealDB
+description: Multi-model cloud database. SQL-style queries for documents, graphs, and time-series in one platform.
+href: https://surrealdb.com
+github: https://github.com/surrealdb/surrealdb
+image: https://surrealdb.com/_astro/main.cgvMOQpK.jpg
+---
diff --git a/apps/web/content/oss-friends/tabby.mdx b/apps/web/content/oss-friends/tabby.mdx
new file mode 100644
index 0000000000..7d278a3481
--- /dev/null
+++ b/apps/web/content/oss-friends/tabby.mdx
@@ -0,0 +1,6 @@
+---
+name: Tabby
+description: Self-hosted AI coding assistant. Open source GitHub Copilot alternative with local model support.
+href: https://tabby.tabbyml.com
+github: https://github.com/TabbyML/tabby
+---
diff --git a/apps/web/content/oss-friends/teable.mdx b/apps/web/content/oss-friends/teable.mdx
new file mode 100644
index 0000000000..e94f125cf1
--- /dev/null
+++ b/apps/web/content/oss-friends/teable.mdx
@@ -0,0 +1,6 @@
+---
+name: Teable
+description: Open source Airtable alternative. Super fast, real-time, no-code database built on Postgres with spreadsheet interface.
+href: https://teable.io
+github: https://github.com/teableio/teable
+---
diff --git a/apps/web/content/oss-friends/turso.mdx b/apps/web/content/oss-friends/turso.mdx
new file mode 100644
index 0000000000..3056d141b4
--- /dev/null
+++ b/apps/web/content/oss-friends/turso.mdx
@@ -0,0 +1,7 @@
+---
+name: Turso
+description: SQLite for production. Edge-hosted distributed database built on libSQL with global replication.
+href: https://turso.tech
+github: https://github.com/tursodatabase/libsql
+image: https://turso.tech/opengraph-image.png?8abb64b5fd9d7c60
+---
diff --git a/apps/web/content/oss-friends/typesense.mdx b/apps/web/content/oss-friends/typesense.mdx
new file mode 100644
index 0000000000..a26f670f55
--- /dev/null
+++ b/apps/web/content/oss-friends/typesense.mdx
@@ -0,0 +1,7 @@
+---
+name: Typesense
+description: Open source search engine. Lightning-fast, typo-tolerant search with instant results and easy setup.
+href: https://typesense.org
+github: https://github.com/typesense/typesense
+image: https://typesense.org/images/opengraph_banner.png
+---
diff --git a/apps/web/content/oss-friends/windmill.mdx b/apps/web/content/oss-friends/windmill.mdx
new file mode 100644
index 0000000000..7c83450fa7
--- /dev/null
+++ b/apps/web/content/oss-friends/windmill.mdx
@@ -0,0 +1,6 @@
+---
+name: Windmill
+description: Open source developer platform. Build internal tools, workflows, and data pipelines with scripts and low-code builders.
+href: https://windmill.dev
+github: https://github.com/windmill-labs/windmill
+---
diff --git a/apps/web/content/oss-friends/zed.mdx b/apps/web/content/oss-friends/zed.mdx
new file mode 100644
index 0000000000..7002f46667
--- /dev/null
+++ b/apps/web/content/oss-friends/zed.mdx
@@ -0,0 +1,7 @@
+---
+name: Zed
+description: High-performance code editor. Built in Rust for speed with native collaboration and AI features.
+href: https://zed.dev
+github: https://github.com/zed-industries/zed
+image: https://zed.dev/img/home/og.webp
+---
diff --git a/apps/web/src/routes/_view/oss-friends.tsx b/apps/web/src/routes/_view/oss-friends.tsx
index 19c8a91a59..a0e1f44f84 100644
--- a/apps/web/src/routes/_view/oss-friends.tsx
+++ b/apps/web/src/routes/_view/oss-friends.tsx
@@ -97,8 +97,8 @@ function HeroSection() {
 function FriendsSection() {
   return (
     <section>
-      <div className="grid grid-cols-3">
-        {allOssFriends.map((friend, index) => (
+      <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-px bg-neutral-200">
+        {allOssFriends.map((friend) => (
           <a
             key={friend.slug}
             href={friend.href}
@@ -106,28 +106,17 @@ function FriendsSection() {
             rel="noopener noreferrer"
             className={cn([
               "group flex flex-col bg-white overflow-hidden",
-              "border-b border-neutral-200",
-              index % 3 !== 2 && "border-r",
               "hover:bg-stone-50 transition-all",
             ])}
           >
             <div className="aspect-40/21 bg-neutral-100 overflow-hidden">
-              {friend.image ? (
-                <Image
-                  src={friend.image}
-                  alt={friend.name}
-                  className="w-full h-full group-hover:scale-105 transition-transform duration-300"
-                  objectFit="cover"
-                  layout="fullWidth"
-                />
-              ) : (
-                <div className="w-full h-full flex items-center justify-center">
-                  <Icon
-                    icon="mdi:open-source-initiative"
-                    className="text-4xl text-neutral-300"
-                  />
-                </div>
-              )}
+              <Image
+                src={friend.image || "/api/images/hyprnote/default-cover.jpg"}
+                alt={friend.name}
+                className="w-full h-full group-hover:scale-105 transition-transform duration-300"
+                objectFit="cover"
+                layout="fullWidth"
+              />
             </div>
             <div className="p-4 flex-1 flex flex-col">
               <div className="flex items-start justify-between gap-2 mb-2">