diff --git a/apps/web/app/(public)/(projects)/projects/[id]/markdown-content.tsx b/apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/markdown-content.tsx
similarity index 100%
rename from apps/web/app/(public)/(projects)/projects/[id]/markdown-content.tsx
rename to apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/markdown-content.tsx
diff --git a/apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/page.tsx b/apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/page.tsx
new file mode 100644
index 00000000..dcf74980
--- /dev/null
+++ b/apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/page.tsx
@@ -0,0 +1,11 @@
+import ProjectPage from './project-page';
+
+export default async function Page({
+  params,
+}: {
+  params: Promise<{ provider: string; org: string; repo: string }>;
+}) {
+  const { provider, org, repo } = await params;
+
+  return <ProjectPage provider={provider} org={org} repoId={repo} />;
+}
diff --git a/apps/web/app/(public)/(projects)/projects/[id]/project-description.tsx b/apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/project-description.tsx
similarity index 96%
rename from apps/web/app/(public)/(projects)/projects/[id]/project-description.tsx
rename to apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/project-description.tsx
index d41eb749..a8595227 100644
--- a/apps/web/app/(public)/(projects)/projects/[id]/project-description.tsx
+++ b/apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/project-description.tsx
@@ -13,10 +13,12 @@ export default function ProjectDescription({
   repo,
   project,
   isOwner,
+  isNotInDatabase,
 }: {
   repo: ProjectData;
   project: ProjectWithRelations;
   isOwner: boolean;
+  isNotInDatabase: boolean;
 }) {
   const getAvatarImage = (): string => {
     if (repo && repo.owner && typeof repo.owner.avatar_url === 'string') {
@@ -41,12 +43,14 @@ export default function ProjectDescription({
             repoOwnerName={repo?.owner?.name || repo?.namespace?.name || ''}
             className="h-12 w-12 flex-shrink-0 rounded-none md:h-16 md:w-16"
           />
+
           <div className="w-full flex-1">
             <ProjectTitleAndTicks
               project={project}
               className="truncate text-lg font-bold text-white sm:text-2xl md:text-xl"
+              isNotInDatabase={isNotInDatabase}
             />
-            <StatusBadges project={project} />
+            {!isNotInDatabase && <StatusBadges project={project} />}
           </div>
         </div>
 
@@ -110,17 +114,19 @@ function StatusBadges({ project }: { project: ProjectWithRelations }) {
 function ProjectTitleAndTicks({
   project,
   className,
+  isNotInDatabase,
 }: {
   project: ProjectWithRelations;
   className: string;
+  isNotInDatabase: boolean;
 }) {
   return (
     <div className="flex items-center justify-between gap-2 md:gap-3">
       <div className="flex items-center gap-2 md:gap-3">
         <h1 className={className}>{project?.name}</h1>
-        <ProjectTicks project={project} />
+        {!isNotInDatabase && <ProjectTicks project={project} />}
       </div>
-      <SocialLinks project={project} />
+      {!isNotInDatabase && <SocialLinks project={project} />}
     </div>
   );
 }
diff --git a/apps/web/app/(public)/(projects)/projects/[id]/project-page.tsx b/apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/project-page.tsx
similarity index 81%
rename from apps/web/app/(public)/(projects)/projects/[id]/project-page.tsx
rename to apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/project-page.tsx
index b296b076..32f1bd4e 100644
--- a/apps/web/app/(public)/(projects)/projects/[id]/project-page.tsx
+++ b/apps/web/app/(public)/(projects)/[provider]/[org]/[repo]/project-page.tsx
@@ -21,12 +21,12 @@ import {
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@workspace/ui/components/tabs';
 import { ClaimProjectDialog } from '@/components/project/claim-project-dialog';
 import { ContributorData, ProjectWithRelations } from '@workspace/api';
+import ProjectErrorPage from '../../../projects/project-error-page';
 import { Separator } from '@workspace/ui/components/separator';
 import { useQueries, useQuery } from '@tanstack/react-query';
 import { projectProviderEnum } from '@workspace/db/schema';
 import LoadingSpinner from '@/components/loading-spinner';
 import ProjectDescription from './project-description';
-import ProjectErrorPage from '../project-error-page';
 import { MarkdownContent } from './markdown-content';
 import { authClient } from '@workspace/auth/client';
 import { useEffect, useState, useRef } from 'react';
@@ -93,6 +93,17 @@ interface Repository {
   id?: string;
   name?: string;
   url?: string;
+  description?: string;
+  homepage?: string;
+  isPrivate?: boolean;
+  private?: boolean;
+  topics?: string[];
+  owner?: {
+    avatar_url?: string;
+  };
+  namespace?: {
+    avatar_url?: string;
+  };
 }
 
 interface RepoData {
@@ -101,53 +112,53 @@ interface RepoData {
   pullRequestsCount?: number;
 }
 
-interface Project {
-  id: string;
-  ownerId: string | null;
-  logoUrl: string | null;
-  gitRepoUrl: string | null;
-  gitHost: string | null;
-  name: string;
-  description: string | null;
-  socialLinks: {
-    twitter?: string;
-    discord?: string;
-    linkedin?: string;
-    website?: string;
-    [key: string]: string | undefined;
-  } | null;
-  approvalStatus: 'pending' | 'approved' | 'rejected';
-  isPinned: boolean;
-  hasBeenAcquired: boolean;
-  isLookingForContributors: boolean;
-  isLookingForInvestors: boolean;
-  isHiring: boolean;
-  isPublic: boolean;
-  isRepoPrivate: boolean;
-  acquiredBy: string | null;
-  createdAt: Date;
-  updatedAt: Date;
-  statusId: string;
-  typeId: string;
-  deletedAt: Date | null;
-  status?: {
-    id: string;
-    name: string;
-    displayName?: string;
-  };
-  type?: {
-    id: string;
-    name: string;
-    displayName?: string;
-  };
-  tagRelations?: Array<{
-    tag?: {
-      id?: string;
-      name: string;
-      displayName?: string;
-    };
-  }>;
-}
+// interface Project {
+//   id: string;
+//   ownerId: string | null;
+//   logoUrl: string | null;
+//   gitRepoUrl: string | null;
+//   gitHost: string | null;
+//   name: string;
+//   description: string | null;
+//   socialLinks: {
+//     twitter?: string;
+//     discord?: string;
+//     linkedin?: string;
+//     website?: string;
+//     [key: string]: string | undefined;
+//   } | null;
+//   approvalStatus: 'pending' | 'approved' | 'rejected';
+//   isPinned: boolean;
+//   hasBeenAcquired: boolean;
+//   isLookingForContributors: boolean;
+//   isLookingForInvestors: boolean;
+//   isHiring: boolean;
+//   isPublic: boolean;
+//   isRepoPrivate: boolean;
+//   acquiredBy: string | null;
+//   createdAt: Date;
+//   updatedAt: Date;
+//   statusId: string;
+//   typeId: string;
+//   deletedAt: Date | null;
+//   status?: {
+//     id: string;
+//     name: string;
+//     displayName?: string;
+//   };
+//   type?: {
+//     id: string;
+//     name: string;
+//     displayName?: string;
+//   };
+//   tagRelations?: Array<{
+//     tag?: {
+//       id?: string;
+//       name: string;
+//       displayName?: string;
+//     };
+//   }>;
+// }
 
 const isValidProvider = (
   provider: string | null | undefined,
@@ -155,19 +166,35 @@ const isValidProvider = (
   return provider === 'github' || provider === 'gitlab';
 };
 
-function useProject(id: string) {
+function useProject(provider: string, org: string, repo: string) {
   const trpc = useTRPC();
-  const query = useQuery(trpc.projects.getProject.queryOptions({ id }, { retry: false }));
+  const query = useQuery(
+    trpc.projects.getProjectByRepo.queryOptions({ provider, org, repo }, { retry: false }),
+  );
 
   return {
-    project: query.data as ProjectWithRelations | undefined,
+    project: query.data as ProjectWithRelations | null | undefined,
     isLoading: query.isLoading,
     error: query.error,
+    isNotInDatabase: query.data === null,
   };
 }
 
-export default function ProjectPage({ id }: { id: string }) {
-  const { project, isLoading: projectLoading, error: projectError } = useProject(id);
+export default function ProjectPage({
+  provider,
+  org,
+  repoId,
+}: {
+  provider: string;
+  org: string;
+  repoId: string;
+}) {
+  const {
+    project,
+    isLoading: projectLoading,
+    error: projectError,
+    isNotInDatabase,
+  } = useProject(provider, org, repoId);
   const { data: session } = authClient.useSession();
   const user = session?.user;
   const [showShadow, setShowShadow] = useState(false);
@@ -183,7 +210,6 @@ export default function ProjectPage({ id }: { id: string }) {
     return () => window.removeEventListener('scroll', handleScroll);
   }, []);
 
-  // Scroll active tab into view on smaller screens
   useEffect(() => {
     if (tabsListRef.current) {
       const activeTabElement = tabsListRef.current.querySelector(
@@ -209,14 +235,17 @@ export default function ProjectPage({ id }: { id: string }) {
 
   const trpc = useTRPC();
 
+  const normalizedProvider = provider === 'gh' ? 'github' : provider === 'gl' ? 'gitlab' : provider;
+  const gitRepoUrl = `${org}/${repoId}`;
+
   const repoQuery = useQuery(
     trpc.repository.getRepo.queryOptions(
       {
-        url: project?.gitRepoUrl as string,
-        provider: project?.gitHost as (typeof projectProviderEnum.enumValues)[number],
+        url: gitRepoUrl,
+        provider: normalizedProvider as (typeof projectProviderEnum.enumValues)[number],
       },
       {
-        enabled: !!project?.gitRepoUrl && isValidProvider(project?.gitHost),
+        enabled: (!!project?.gitRepoUrl || isNotInDatabase) && isValidProvider(normalizedProvider),
         retry: false,
       },
     ),
@@ -225,11 +254,14 @@ export default function ProjectPage({ id }: { id: string }) {
   const repoDataQuery = useQuery(
     trpc.repository.getRepoData.queryOptions(
       {
-        url: project?.gitRepoUrl as string,
-        provider: project?.gitHost as (typeof projectProviderEnum.enumValues)[number],
+        url: gitRepoUrl,
+        provider: normalizedProvider as (typeof projectProviderEnum.enumValues)[number],
       },
       {
-        enabled: !!repoQuery.data && !!project?.gitRepoUrl && isValidProvider(project?.gitHost),
+        enabled:
+          !!repoQuery.data &&
+          (!!project?.gitRepoUrl || isNotInDatabase) &&
+          isValidProvider(normalizedProvider),
         retry: false,
       },
     ),
@@ -239,61 +271,79 @@ export default function ProjectPage({ id }: { id: string }) {
     queries: [
       trpc.repository.getIssues.queryOptions(
         {
-          url: project?.gitRepoUrl as string,
-          provider: project?.gitHost as (typeof projectProviderEnum.enumValues)[number],
+          url: gitRepoUrl,
+          provider: normalizedProvider as (typeof projectProviderEnum.enumValues)[number],
         },
         {
-          enabled: !!repoQuery.data && !!project?.gitRepoUrl && isValidProvider(project?.gitHost),
+          enabled:
+            !!repoQuery.data &&
+            (!!project?.gitRepoUrl || isNotInDatabase) &&
+            isValidProvider(normalizedProvider),
           retry: false,
         },
       ),
       trpc.repository.getPullRequests.queryOptions(
         {
-          url: project?.gitRepoUrl as string,
-          provider: project?.gitHost as (typeof projectProviderEnum.enumValues)[number],
+          url: gitRepoUrl,
+          provider: normalizedProvider as (typeof projectProviderEnum.enumValues)[number],
         },
         {
-          enabled: !!repoQuery.data && !!project?.gitRepoUrl && isValidProvider(project?.gitHost),
+          enabled:
+            !!repoQuery.data &&
+            (!!project?.gitRepoUrl || isNotInDatabase) &&
+            isValidProvider(normalizedProvider),
           retry: false,
         },
       ),
       trpc.repository.getReadme.queryOptions(
         {
-          url: project?.gitRepoUrl as string,
-          provider: project?.gitHost as (typeof projectProviderEnum.enumValues)[number],
+          url: gitRepoUrl,
+          provider: normalizedProvider as (typeof projectProviderEnum.enumValues)[number],
         },
         {
-          enabled: !!repoQuery.data && !!project?.gitRepoUrl && isValidProvider(project?.gitHost),
+          enabled:
+            !!repoQuery.data &&
+            (!!project?.gitRepoUrl || isNotInDatabase) &&
+            isValidProvider(normalizedProvider),
           retry: false,
         },
       ),
       trpc.repository.getContributing.queryOptions(
         {
-          url: project?.gitRepoUrl as string,
-          provider: project?.gitHost as (typeof projectProviderEnum.enumValues)[number],
+          url: gitRepoUrl,
+          provider: normalizedProvider as (typeof projectProviderEnum.enumValues)[number],
         },
         {
-          enabled: !!repoQuery.data && !!project?.gitRepoUrl && isValidProvider(project?.gitHost),
+          enabled:
+            !!repoQuery.data &&
+            (!!project?.gitRepoUrl || isNotInDatabase) &&
+            isValidProvider(normalizedProvider),
           retry: false,
         },
       ),
       trpc.repository.getCodeOfConduct.queryOptions(
         {
-          url: project?.gitRepoUrl as string,
-          provider: project?.gitHost as (typeof projectProviderEnum.enumValues)[number],
+          url: gitRepoUrl,
+          provider: normalizedProvider as (typeof projectProviderEnum.enumValues)[number],
         },
         {
-          enabled: !!repoQuery.data && !!project?.gitRepoUrl && isValidProvider(project?.gitHost),
+          enabled:
+            !!repoQuery.data &&
+            (!!project?.gitRepoUrl || isNotInDatabase) &&
+            isValidProvider(normalizedProvider),
           retry: false,
         },
       ),
-      trpc.projects.getContributors.queryOptions(
+      trpc.repository.getContributors.queryOptions(
         {
-          url: project?.gitRepoUrl as string,
-          provider: project?.gitHost as (typeof projectProviderEnum.enumValues)[number],
+          url: gitRepoUrl,
+          provider: normalizedProvider as (typeof projectProviderEnum.enumValues)[number],
         },
         {
-          enabled: !!repoQuery.data && !!project?.gitRepoUrl && isValidProvider(project?.gitHost),
+          enabled:
+            !!repoQuery.data &&
+            (!!project?.gitRepoUrl || isNotInDatabase) &&
+            isValidProvider(normalizedProvider),
           retry: false,
         },
       ),
@@ -308,14 +358,10 @@ export default function ProjectPage({ id }: { id: string }) {
     );
   }
 
-  if (projectError || !project) {
+  if (projectError && !isNotInDatabase) {
     return <ProjectErrorPage type="projectNotFound" />;
   }
 
-  if (!project.gitRepoUrl) {
-    return <ProjectErrorPage type="repoNotAvailable" />;
-  }
-
   if (repoQuery.isLoading) {
     return (
       <div className="flex min-h-[calc(100vh-200px)] w-full items-center justify-center px-4 sm:px-6 lg:px-8">
@@ -328,14 +374,58 @@ export default function ProjectPage({ id }: { id: string }) {
     return <ProjectErrorPage type="repoNotFound" onTryAgain={() => repoQuery.refetch()} />;
   }
 
-  const isUnclaimed = !project.ownerId;
-  const isOwner = user?.id === project.ownerId;
   const repoData = repoQuery.data as Repository;
+
+  const projectData: ProjectWithRelations = isNotInDatabase
+    ? {
+        id: `virtual-${normalizedProvider}-${org}-${repoId}`,
+        ownerId: null,
+        logoUrl: repoData.owner?.avatar_url || repoData.namespace?.avatar_url || null,
+        gitRepoUrl: gitRepoUrl,
+        gitHost: normalizedProvider as (typeof projectProviderEnum.enumValues)[number],
+        name: repoData.name || repoId,
+        description: repoData.description || null,
+        socialLinks: repoData.homepage ? { website: repoData.homepage } : null,
+        approvalStatus: 'approved' as const,
+        isPinned: false,
+        hasBeenAcquired: false,
+        isLookingForContributors:
+          repoData.topics?.includes('help-wanted') ||
+          repoData.topics?.includes('good-first-issue') ||
+          false,
+        isLookingForInvestors:
+          repoData.topics?.includes('seeking-funding') ||
+          repoData.topics?.includes('investment') ||
+          false,
+        isHiring: repoData.topics?.includes('hiring') || repoData.topics?.includes('jobs') || false,
+        isPublic: true,
+        isRepoPrivate: repoData.isPrivate || repoData.private || false,
+        acquiredBy: null,
+        createdAt: repoData.created_at ? new Date(repoData.created_at) : new Date(),
+        updatedAt: repoData.updated_at ? new Date(repoData.updated_at) : new Date(),
+        statusId: '',
+        typeId: '',
+        deletedAt: null,
+        status: undefined,
+        type: undefined,
+        tagRelations:
+          repoData.topics?.map((topic: string) => ({
+            tag: {
+              id: topic,
+              name: topic,
+              displayName: topic,
+            },
+          })) || [],
+      }
+    : project!;
+
+  const isUnclaimed = !projectData.ownerId;
+  const isOwner = user?.id === projectData.ownerId;
   const repo = {
     ...repoData,
     id: repoData.html_url || repoData.web_url || '',
-    name: project.gitRepoUrl?.split('/').pop() || '',
-    url: repoData.html_url || repoData.web_url || project.gitRepoUrl || '',
+    name: projectData.gitRepoUrl?.split('/').pop() || '',
+    url: repoData.html_url || repoData.web_url || projectData.gitRepoUrl || '',
   };
   const repoStats = repoDataQuery.data as RepoData | undefined;
   const issuesCount = repoStats?.issuesCount || 0;
@@ -356,15 +446,26 @@ export default function ProjectPage({ id }: { id: string }) {
       />
       <div className="fixed top-0 right-0 left-0 z-10 h-[32px] bg-[#101010]" />
       <div className="mx-auto max-w-[1080px] py-4">
-        <ClaimProjectSection
-          isUnclaimed={isUnclaimed}
-          user={user}
-          project={project}
-          className="mt-0 mb-4 w-full rounded-none border border-neutral-800 bg-neutral-900/50 p-2"
-        />
+        {!isNotInDatabase ? (
+          <ClaimProjectSection
+            isUnclaimed={isUnclaimed}
+            user={user}
+            project={projectData}
+            className="mt-0 mb-4 w-full rounded-none border border-neutral-800 bg-neutral-900/50 p-2"
+          />
+        ) : (
+          <div className="mb-4 w-full rounded-none border border-neutral-800 bg-neutral-900/50 p-2">
+            <p className="text-sm text-neutral-400">This repo has not yet been added to oss.now.</p>
+          </div>
+        )}
         <div className="grid gap-4 lg:grid-cols-3">
           <div className="flex min-w-0 flex-col gap-4 overflow-hidden lg:col-span-2">
-            <ProjectDescription isOwner={isOwner} project={project} repo={repo} />
+            <ProjectDescription
+              isOwner={isOwner}
+              project={projectData}
+              repo={repo}
+              isNotInDatabase={isNotInDatabase}
+            />
 
             <div className="">
               <Tabs defaultValue="readme" className="w-full" onValueChange={setActiveTab}>
@@ -493,7 +594,7 @@ export default function ProjectPage({ id }: { id: string }) {
                                     <Link
                                       href={issue.html_url || issue.web_url || '#'}
                                       event="project_page_issue_link_clicked"
-                                      eventObject={{ projectId: project.id }}
+                                      eventObject={{ projectId: projectData.id }}
                                       target="_blank"
                                       className="mt-2 block text-sm font-medium text-neutral-300 transition-colors hover:text-white"
                                     >
@@ -550,17 +651,17 @@ export default function ProjectPage({ id }: { id: string }) {
                           {issuesCount > 10 && (
                             <Link
                               href={
-                                project?.gitHost === 'github'
+                                projectData.gitHost === 'github'
                                   ? `${repo?.html_url}/issues?q=is%3Aopen`
                                   : `${repo?.web_url}/-/issues?state=opened`
                               }
                               target="_blank"
                               event="project_page_issues_link_clicked"
-                              eventObject={{ projectId: project.id }}
+                              eventObject={{ projectId: projectData.id }}
                               className="block pt-2 text-center text-sm text-neutral-400 transition-colors hover:text-white"
                             >
                               View all {issuesCount} open issues on{' '}
-                              {project?.gitHost === 'github' ? 'GitHub' : 'GitLab'} →
+                              {projectData.gitHost === 'github' ? 'GitHub' : 'GitLab'} →
                             </Link>
                           )}
                         </div>
@@ -574,7 +675,7 @@ export default function ProjectPage({ id }: { id: string }) {
                   <TabsContent value="pull-requests">
                     {otherQueries[1].isLoading ? (
                       <div className="flex w-full justify-center py-4">
-                        <LoadingSpinner/>
+                        <LoadingSpinner />
                       </div>
                     ) : pullRequests ? (
                       pullRequests.length === 0 ? (
@@ -621,7 +722,7 @@ export default function ProjectPage({ id }: { id: string }) {
                                       href={pr.html_url || pr.web_url || '#'}
                                       target="_blank"
                                       event="project_page_pull_request_link_clicked"
-                                      eventObject={{ projectId: project.id }}
+                                      eventObject={{ projectId: projectData.id }}
                                       className="mt-2 block text-sm font-medium text-neutral-300 transition-colors hover:text-white"
                                     >
                                       {pr.title}
@@ -672,7 +773,7 @@ export default function ProjectPage({ id }: { id: string }) {
                                   <Link
                                     href={pr.html_url || pr.web_url || '#'}
                                     event="project_page_pull_request_link_clicked"
-                                    eventObject={{ projectId: project.id }}
+                                    eventObject={{ projectId: projectData.id }}
                                     target="_blank"
                                     className="text-neutral-400 transition-colors hover:text-white"
                                   >
@@ -684,17 +785,17 @@ export default function ProjectPage({ id }: { id: string }) {
                           {pullRequestsCount > 10 && (
                             <Link
                               href={
-                                project?.gitHost === 'github'
+                                projectData.gitHost === 'github'
                                   ? `${repo?.html_url}/pulls?q=is%3Apr+is%3Aopen`
                                   : `${repo?.web_url}/-/merge_requests?state=opened`
                               }
                               target="_blank"
                               event="project_page_pull_requests_link_clicked"
-                              eventObject={{ projectId: project.id }}
+                              eventObject={{ projectId: projectData.id }}
                               className="block pt-2 text-center text-sm text-neutral-400 transition-colors hover:text-white"
                             >
                               View all {pullRequestsCount} open pull requests on{' '}
-                              {project?.gitHost === 'github' ? 'GitHub' : 'GitLab'} →
+                              {projectData.gitHost === 'github' ? 'GitHub' : 'GitLab'} →
                             </Link>
                           )}
                         </div>
@@ -780,10 +881,13 @@ export default function ProjectPage({ id }: { id: string }) {
                             <Link
                               rel="noopener noreferrer"
                               key={contributor.id}
-                              href={`https://${project?.gitHost === 'github' ? 'github.com' : 'gitlab.com'}/${contributor.username}`}
+                              href={`https://${projectData.gitHost === 'github' ? 'github.com' : 'gitlab.com'}/${contributor.username}`}
                               target="_blank"
                               event="project_page_contributor_link_clicked"
-                              eventObject={{ projectId: project.id, contributorId: contributor.id }}
+                              eventObject={{
+                                projectId: projectData.id,
+                                contributorId: contributor.id,
+                              }}
                               className={`flex items-center gap-3 rounded-none border p-3 transition-all hover:bg-neutral-800/50 ${
                                 contributor.pullRequestsCount !== undefined &&
                                 contributor.pullRequestsCount >= 500
@@ -902,7 +1006,7 @@ export default function ProjectPage({ id }: { id: string }) {
               <div>
                 <h3 className="mb-3 text-sm font-medium text-neutral-300">About</h3>
                 <div className="space-y-2 text-sm">
-                  {project?.createdAt && (
+                  {projectData?.createdAt && (
                     <div className="flex items-center justify-between">
                       <span className="text-neutral-400">Created</span>
                       <span className="text-neutral-300">
@@ -910,7 +1014,7 @@ export default function ProjectPage({ id }: { id: string }) {
                       </span>
                     </div>
                   )}
-                  {project?.updatedAt && (
+                  {projectData?.updatedAt && (
                     <div className="flex items-center justify-between">
                       <span className="text-neutral-400">Updated</span>
                       <span className="text-neutral-300">
@@ -918,40 +1022,42 @@ export default function ProjectPage({ id }: { id: string }) {
                       </span>
                     </div>
                   )}
-                  {project?.gitHost && (
+                  {projectData?.gitHost && (
                     <div className="flex items-center justify-between">
                       <span className="text-neutral-400">Host</span>
-                      <span className="text-neutral-300 capitalize">{project?.gitHost}</span>
+                      <span className="text-neutral-300 capitalize">{projectData?.gitHost}</span>
                     </div>
                   )}
                   <div className="flex items-center justify-between">
                     <span className="text-neutral-400">Visibility</span>
                     <span className="text-neutral-300">
-                      {project?.isPublic ? 'Public' : 'Private'}
+                      {projectData?.isPublic ? 'Public' : 'Private'}
                     </span>
                   </div>
                 </div>
               </div>
             </div>
 
-            <div className="border border-neutral-800 bg-neutral-900/50 p-4 md:p-6">
-              <h2 className="mb-4 flex items-center gap-2 text-lg font-semibold text-white">
-                <Tag className="h-5 w-5" />
-                Tags
-              </h2>
-              <div className="flex flex-wrap gap-1.5 md:gap-2">
-                {project?.tagRelations?.map((relation, index: number) => (
-                  <span
-                    key={index}
-                    className="rounded-none bg-neutral-800 px-2.5 py-1 text-xs text-neutral-300 transition-colors hover:bg-neutral-700"
-                  >
-                    {relation.tag?.displayName || relation.tag?.name}
-                  </span>
-                ))}
+            {!isNotInDatabase && (
+              <div className="border border-neutral-800 bg-neutral-900/50 p-4 md:p-6">
+                <h2 className="mb-4 flex items-center gap-2 text-lg font-semibold text-white">
+                  <Tag className="h-5 w-5" />
+                  Tags
+                </h2>
+                <div className="flex flex-wrap gap-1.5 md:gap-2">
+                  {projectData?.tagRelations?.map((relation, index: number) => (
+                    <span
+                      key={index}
+                      className="rounded-none bg-neutral-800 px-2.5 py-1 text-xs text-neutral-300 transition-colors hover:bg-neutral-700"
+                    >
+                      {relation.tag?.displayName || relation.tag?.name}
+                    </span>
+                  ))}
+                </div>
               </div>
-            </div>
+            )}
 
-            {project?.hasBeenAcquired && project?.acquiredBy && (
+            {projectData?.hasBeenAcquired && projectData?.acquiredBy && (
               <div className="border border-yellow-500/20 bg-yellow-500/5 p-4 md:p-6">
                 <div className="flex items-center gap-2 text-yellow-400">
                   <Building className="h-5 w-5" />
@@ -960,13 +1066,13 @@ export default function ProjectPage({ id }: { id: string }) {
                 <p className="mt-2 text-sm text-neutral-300">This project has been acquired</p>
               </div>
             )}
-            {(project?.isLookingForContributors ||
-              project?.isLookingForInvestors ||
-              project?.isHiring) && (
+            {(projectData?.isLookingForContributors ||
+              projectData?.isLookingForInvestors ||
+              projectData?.isHiring) && (
               <div className="border border-neutral-800 bg-neutral-900/50 p-4 md:p-6">
                 <h2 className="mb-4 text-lg font-semibold text-white">Opportunities</h2>
                 <div className="space-y-3">
-                  {project?.isLookingForContributors && (
+                  {projectData?.isLookingForContributors && (
                     <div className="flex items-start gap-3 rounded-none border border-[#00BC7D]/10 bg-[#00BC7D]/10 p-3 text-[#00D492]">
                       <Users className="mt-0.5 h-5 w-5 text-emerald-400" />
                       <div>
@@ -977,7 +1083,7 @@ export default function ProjectPage({ id }: { id: string }) {
                       </div>
                     </div>
                   )}
-                  {project?.isLookingForInvestors && (
+                  {projectData?.isLookingForInvestors && (
                     <div className="flex items-start gap-3 rounded-none border border-blue-500/30 bg-blue-500/10 p-3">
                       <DollarSign className="mt-0.5 h-5 w-5 text-blue-400" />
                       <div>
@@ -988,7 +1094,7 @@ export default function ProjectPage({ id }: { id: string }) {
                       </div>
                     </div>
                   )}
-                  {project?.isHiring && (
+                  {projectData?.isHiring && (
                     <div className="flex items-start gap-3 rounded-none border border-purple-500/20 bg-purple-500/10 p-3">
                       <Briefcase className="mt-0.5 h-5 w-5 text-purple-400" />
                       <div>
diff --git a/apps/web/app/(public)/(projects)/projects/[id]/page.tsx b/apps/web/app/(public)/(projects)/projects/[id]/page.tsx
deleted file mode 100644
index 9cac419f..00000000
--- a/apps/web/app/(public)/(projects)/projects/[id]/page.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import ProjectPage from './project-page';
-
-export default async function Page({ params }: { params: Promise<{ id: string }> }) {
-  const { id } = await params;
-
-  return <ProjectPage id={id} />;
-}
diff --git a/apps/web/app/(public)/(projects)/projects/project-card.tsx b/apps/web/app/(public)/(projects)/projects/project-card.tsx
index dce97e04..70a77103 100644
--- a/apps/web/app/(public)/(projects)/projects/project-card.tsx
+++ b/apps/web/app/(public)/(projects)/projects/project-card.tsx
@@ -27,9 +27,14 @@ export default function ProjectCard({ project }: { project: Project }) {
 
   if (isError) return <div>Error</div>;
 
+  const normalizedProvider =
+    project.gitHost === 'github' ? 'gh' : project.gitHost === 'gitlab' ? 'gl' : project.gitHost;
+
+  const href = `/${normalizedProvider}/${project.gitRepoUrl}`;
+
   return (
     <Link
-      href={`/projects/${project.id}`}
+      href={href}
       event="project_card_link_clicked"
       eventObject={{ projectId: project.id }}
       className="group/project relative flex h-full flex-col bg-[#171717] p-1"
@@ -51,24 +56,24 @@ export default function ProjectCard({ project }: { project: Project }) {
             <div className="h-[78px] w-[78px] animate-pulse bg-neutral-900" />
           )}
           <div className="min-w-0 flex-1">
-            <div className="flex items-center justify-between gap-2 mb-1">
-            <h3 className="truncate text-sm font-semibold text-white md:text-base">
-              {project.name}
-            </h3>
-            {(project.isLookingForContributors || project.hasBeenAcquired) && (
-              <div className="flex flex-wrap gap-1 md:gap-1.5">
-                {project.isLookingForContributors && (
-                  <span className="rounded-none border border-[#00BC7D]/10 bg-[#00BC7D]/10 px-1.5 py-0.5 text-xs font-medium text-[#00D492] md:px-2">
-                    Open to contributors
-                  </span>
-                )}
-                {project.hasBeenAcquired && (
-                  <span className="rounded-none bg-yellow-500/10 px-1.5 py-0.5 text-xs font-medium text-yellow-400 md:px-2">
-                    Acquired
-                  </span>
-                )}
-              </div>
-            )}
+            <div className="mb-1 flex items-center justify-between gap-2">
+              <h3 className="truncate text-sm font-semibold text-white md:text-base">
+                {project.name}
+              </h3>
+              {(project.isLookingForContributors || project.hasBeenAcquired) && (
+                <div className="flex flex-wrap gap-1 md:gap-1.5">
+                  {project.isLookingForContributors && (
+                    <span className="rounded-none border border-[#00BC7D]/10 bg-[#00BC7D]/10 px-1.5 py-0.5 text-xs font-medium text-[#00D492] md:px-2">
+                      Open to contributors
+                    </span>
+                  )}
+                  {project.hasBeenAcquired && (
+                    <span className="rounded-none bg-yellow-500/10 px-1.5 py-0.5 text-xs font-medium text-yellow-400 md:px-2">
+                      Acquired
+                    </span>
+                  )}
+                </div>
+              )}
             </div>
             <p className="line-clamp-2 text-xs leading-relaxed text-neutral-400 md:text-sm">
               {project.description}
diff --git a/apps/web/app/(public)/launches/[id]/components/launch-sidebar.tsx b/apps/web/app/(public)/launches/[id]/components/launch-sidebar.tsx
index 18411d3c..a3f436c2 100644
--- a/apps/web/app/(public)/launches/[id]/components/launch-sidebar.tsx
+++ b/apps/web/app/(public)/launches/[id]/components/launch-sidebar.tsx
@@ -9,16 +9,16 @@ import {
   Star,
   Users,
 } from 'lucide-react';
-import { Separator } from '@workspace/ui/components/separator';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { Separator } from '@workspace/ui/components/separator';
 import { projectProviderEnum } from '@workspace/db/schema';
 import { Button } from '@workspace/ui/components/button';
+import { useRouter, usePathname } from 'next/navigation';
 import { authClient } from '@workspace/auth/client';
 import Link from '@workspace/ui/components/link';
 import { formatDistanceToNow } from 'date-fns';
 import { useTRPC } from '@/hooks/use-trpc';
 import { toast } from 'sonner';
-import { useRouter, usePathname } from 'next/navigation';
 
 const isValidProvider = (
   provider: string | null | undefined,
@@ -102,6 +102,9 @@ export default function LaunchSidebar({ launch, project, projectId }: LaunchSide
   const issuesCount = repoStats?.issuesCount || 0;
   const pullRequestsCount = repoStats?.pullRequestsCount || 0;
 
+  const provider = project.gitHost === 'github' ? 'gh' : 'gl';
+  const href = `/${provider}/${repoData?.owner.login}/${repoData?.name}`;
+
   return (
     <div className="flex flex-col gap-4 lg:col-span-1">
       {/* Main Info Card */}
@@ -216,7 +219,7 @@ export default function LaunchSidebar({ launch, project, projectId }: LaunchSide
 
         <div>
           <Button variant="outline" className="w-full gap-2 rounded-none" asChild>
-            <Link href={`/projects/${projectId}`}>
+            <Link href={href}>
               <ExternalLink className="h-4 w-4" />
               View Project
             </Link>
diff --git a/packages/api/src/driver/github.ts b/packages/api/src/driver/github.ts
index 54b5c9a2..a21efa5b 100644
--- a/packages/api/src/driver/github.ts
+++ b/packages/api/src/driver/github.ts
@@ -364,10 +364,6 @@ export class GithubManager implements GitManager {
       isOwner = true;
       ownershipType = 'repository owner';
     } else if (repoData.owner.type === 'Organization') {
-      console.log(
-        `Checking org ownership for ${currentUser.username} in org ${repoData.owner.login}`,
-      );
-
       try {
         const { data: repoPermissions } =
           await this.octokit.rest.repos.getCollaboratorPermissionLevel({
@@ -376,10 +372,6 @@ export class GithubManager implements GitManager {
             username: currentUser.username,
           });
 
-        console.log(
-          `User ${currentUser.username} has ${repoPermissions.permission} permission on the repository`,
-        );
-
         if (repoPermissions.permission === 'admin') {
           try {
             const { data: membership } = await this.octokit.rest.orgs.getMembershipForUser({
@@ -387,26 +379,16 @@ export class GithubManager implements GitManager {
               username: currentUser.username,
             });
 
-            console.log(
-              `User ${currentUser.username} has role '${membership.role}' in org with state '${membership.state}'`,
-            );
-
             if (membership.role === 'admin' && membership.state === 'active') {
               isOwner = true;
               ownershipType = 'organization owner';
             }
           } catch (orgError) {
-            console.log('Error checking org membership:', orgError);
             isOwner = true;
             ownershipType = 'repository admin';
           }
         }
       } catch (error) {
-        console.log(
-          'User does not have collaborator access to the repository:',
-          error instanceof Error ? error.message : String(error),
-        );
-
         try {
           const { data: membership } = await this.octokit.rest.orgs.getMembershipForUser({
             org: repoData.owner.login,
@@ -418,13 +400,12 @@ export class GithubManager implements GitManager {
             ownershipType = 'organization owner';
           }
         } catch (orgError) {
-          console.log('User is not a member of the organization');
+          // TODO: handle error
         }
       }
     }
 
     if (!isOwner) {
-      console.log(`Claim denied for user ${currentUser.username} on repo ${owner}/${repo}`);
       await ctx.db.insert(projectClaim).values({
         projectId,
         userId: ctx.session!.userId,
@@ -445,8 +426,6 @@ export class GithubManager implements GitManager {
       });
     }
 
-    console.log(`Claim approved: ${currentUser.username} is ${ownershipType} for ${owner}/${repo}`);
-
     const updatedProject = await ctx.db
       .update(project)
       .set({
@@ -782,11 +761,7 @@ export class GithubManager implements GitManager {
             let hasMore = true;
             const maxContributorPages = 10;
 
-            console.log(`Starting contributors API fetch for ${owner}/${repo}`);
-
             while (hasMore && page <= maxContributorPages) {
-              console.log(`Fetching contributors page ${page}...`);
-
               const { data: contributors } = await this.octokit.rest.repos.listContributors({
                 owner,
                 repo,
@@ -794,25 +769,16 @@ export class GithubManager implements GitManager {
                 page: page,
               });
 
-              console.log(`Page ${page}: received ${contributors?.length || 0} contributors`);
-
               if (contributors && contributors.length > 0) {
                 allContributors.push(...contributors);
                 page++;
                 if (contributors.length < 100) {
-                  console.log(
-                    `Reached end of contributors at page ${page - 1} (got ${contributors.length} contributors)`,
-                  );
                   hasMore = false;
                 }
                 if (allContributors.length >= 1000) {
-                  console.log(
-                    `Early termination: reached ${allContributors.length} contributors via API`,
-                  );
                   break;
                 }
               } else {
-                console.log(`No contributors found on page ${page}, stopping`);
                 hasMore = false;
               }
             }
@@ -826,18 +792,11 @@ export class GithubManager implements GitManager {
                 }))
                 .slice(0, 500);
 
-              console.log(
-                `Successfully found ${allContributors.length} total contributors, returning ${contributorData.length} via contributors API`,
-              );
               return contributorData;
-            } else {
-              console.log('Contributors API returned no results, falling back to PR analysis');
             }
           } catch (contributorsApiError) {
-            console.log(
-              'Contributors API failed, falling back to PR analysis:',
-              contributorsApiError,
-            );
+            // TODO: handle error
+            console.error('Error fetching GitHub contributors:', contributorsApiError);
           }
           const contributorMap = new Map<string, ContributorData>();
           let page = 1;
@@ -885,7 +844,6 @@ export class GithubManager implements GitManager {
             page++;
 
             if (contributorMap.size >= 500) {
-              console.log('Early termination: reached 500 contributors');
               break;
             }
           }
@@ -895,11 +853,9 @@ export class GithubManager implements GitManager {
 
           const limitedContributors = contributors.slice(0, 500);
 
-          console.log(
-            `Found ${limitedContributors.length} unique contributors from ${processedPRs} PRs`,
-          );
           return limitedContributors;
         } catch (error) {
+          // TODO: handle error
           console.error('Error fetching GitHub contributors:', error);
           throw new TRPCError({
             code: 'INTERNAL_SERVER_ERROR',
diff --git a/packages/api/src/driver/gitlab.ts b/packages/api/src/driver/gitlab.ts
index eb8b471e..168c5ab7 100644
--- a/packages/api/src/driver/gitlab.ts
+++ b/packages/api/src/driver/gitlab.ts
@@ -629,10 +629,6 @@ export class GitlabManager implements GitManager {
       isOwner = true;
       ownershipType = 'repository owner';
     } else if (repoData.owner.type === 'Organization') {
-      console.log(
-        `Checking org ownership for ${currentUser.username} in org ${repoData.owner.login}`,
-      );
-
       try {
         const repoPermissions = await this.getRepoPermissions(identifier);
 
@@ -659,19 +655,17 @@ export class GitlabManager implements GitManager {
               }
             }
           } catch (orgError) {
-            console.log('User is not a member of the group or group check failed:', orgError);
+            // TODO: handle error
+            console.error('Error checking GitLab group membership:', orgError);
           }
         }
       } catch (error) {
-        console.log(
-          'User does not have collaborator access to the repository:',
-          error instanceof Error ? error.message : String(error),
-        );
+        // TODO: handle error
+        console.error('Error checking GitLab repository permissions:', error);
       }
     }
 
     if (!isOwner) {
-      console.log(`Claim denied for user ${currentUser.username} on repo ${owner}/${repo}`);
       await ctx.db.insert(projectClaim).values({
         projectId,
         userId: ctx.session!.userId,
@@ -692,8 +686,6 @@ export class GitlabManager implements GitManager {
       });
     }
 
-    console.log(`Claim approved: ${currentUser.username} is ${ownershipType} for ${owner}/${repo}`);
-
     const updatedProject = await ctx.db
       .update(project)
       .set({
diff --git a/packages/api/src/routers/projects.ts b/packages/api/src/routers/projects.ts
index 7c85128a..0bb6fe9e 100644
--- a/packages/api/src/routers/projects.ts
+++ b/packages/api/src/routers/projects.ts
@@ -482,6 +482,35 @@ export const projectsRouter = createTRPCRouter({
       },
     });
   }),
+
+  getProjectByRepo: publicProcedure
+    .input(z.object({ provider: z.string(), org: z.string(), repo: z.string() }))
+    .query(async ({ ctx, input }) => {
+      let provider = input.provider;
+      if (provider === 'gh') {
+        provider = 'github';
+      } else if (provider === 'gl') {
+        provider = 'gitlab';
+      }
+
+      const repo = await ctx.db.query.project.findFirst({
+        where: and(
+          eq(project.gitHost, provider as (typeof projectProviderEnum.enumValues)[number]),
+          eq(project.gitRepoUrl, `${input.org}/${input.repo}`),
+        ),
+        with: {
+          status: true,
+          type: true,
+          tagRelations: {
+            with: {
+              tag: true,
+            },
+          },
+        },
+      });
+
+      return repo || null;
+    }),
   addProject: protectedProcedure.input(createProjectInput).mutation(async ({ ctx, input }) => {
     const { statusId, typeId, tagIds } = await resolveAllIds(ctx.db, {
       status: input.status,