diff --git a/apps/web/src/views/boards/components/NewBoardForm.tsx b/apps/web/src/views/boards/components/NewBoardForm.tsx
index 16af6a22..696ef465 100644
--- a/apps/web/src/views/boards/components/NewBoardForm.tsx
+++ b/apps/web/src/views/boards/components/NewBoardForm.tsx
@@ -39,6 +39,13 @@ export function NewBoardForm({ isTemplate }: { isTemplate?: boolean }) {
     { enabled: !!workspace.publicId },
   );
 
+  const formattedTemplates = templates?.map((template) => ({
+    id: template.publicId,
+    name: template.name,
+    lists: template.lists.map((list) => list.name),
+    labels: template.labels.map((label) => label.name),
+  }));
+
   const {
     register,
     handleSubmit,
@@ -114,6 +121,7 @@ export function NewBoardForm({ isTemplate }: { isTemplate?: boolean }) {
         currentBoard={currentTemplate}
         setCurrentBoard={(t) => setValue("template", t)}
         showTemplates={showTemplates}
+        customTemplates={formattedTemplates ?? []}
       />
       <div className="mt-12 flex items-center justify-end border-t border-light-600 px-5 pb-5 pt-5 dark:border-dark-600">
         {!isTemplate && (
diff --git a/apps/web/src/views/boards/components/TemplateBoards.tsx b/apps/web/src/views/boards/components/TemplateBoards.tsx
index bdba9d5f..37cdbd5c 100644
--- a/apps/web/src/views/boards/components/TemplateBoards.tsx
+++ b/apps/web/src/views/boards/components/TemplateBoards.tsx
@@ -88,16 +88,18 @@ export default function TemplateBoards({
   currentBoard,
   setCurrentBoard,
   showTemplates,
+  customTemplates,
 }: {
   currentBoard: Template | null;
   setCurrentBoard: (board: Template | null) => void;
   showTemplates: boolean;
+  customTemplates: Template[] | null;
 }) {
   const [showFade, setShowFade] = useState(false);
   const [showTopFade, setShowTopFade] = useState(false);
   const scrollRef = useRef<HTMLDivElement>(null);
 
-  const templates = getTemplates();
+  const templates = [...(customTemplates ?? []), ...getTemplates()];
 
   const handleScroll = () => {
     if (!scrollRef.current) return;
diff --git a/packages/db/src/repository/board.repo.ts b/packages/db/src/repository/board.repo.ts
index 0481c7e1..200fa9f2 100644
--- a/packages/db/src/repository/board.repo.ts
+++ b/packages/db/src/repository/board.repo.ts
@@ -25,6 +25,23 @@ export const getAllByWorkspaceId = (
       publicId: true,
       name: true,
     },
+    with: {
+      lists: {
+        columns: {
+          publicId: true,
+          name: true,
+          index: true,
+        },
+        orderBy: [asc(lists.index)],
+      },
+      labels: {
+        columns: {
+          publicId: true,
+          name: true,
+          colourCode: true,
+        },
+      },
+    },
     where: and(
       eq(boards.workspaceId, workspaceId),
       isNull(boards.deletedAt),