diff --git a/README.md b/README.md
index ea4527f9f..588f8fb7a 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,12 @@
   <a href="https://github.com/kanbn/kan/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/badge/license-AGPLv3-purple"></a>
 </div>
 
+## Fork Information 🍴
+
+- Added Calendar View for Items w/ Due Dates
+- Added Sorting for Cards for Items w/ Due Dates
+
+
 ## Features 💫
 
 - 👁️ **Board Visibility**: Control who can view and edit your boards
@@ -27,6 +33,8 @@
 - 🔍 **Labels & Filters**: Organise and find cards quickly
 - 💬 **Comments**: Discuss and collaborate with your team
 - 📝 **Activity Log**: Track all card changes with detailed activity history
+- 📅 **Board Calendar**: View cards with due dates on a month calendar
+- ↕️ **List Sorting**: Sort cards in each column by due date to surface what’s coming next
 - 🎨 **Templates** : Save time with reusable custom board templates
 - ⚡️ **Integrations (coming soon)** : Connect your favourite tools
 
diff --git a/apps/web/src/views/board/components/BoardCalendarView.tsx b/apps/web/src/views/board/components/BoardCalendarView.tsx
new file mode 100644
index 000000000..146470e71
--- /dev/null
+++ b/apps/web/src/views/board/components/BoardCalendarView.tsx
@@ -0,0 +1,279 @@
+import Link from "next/link";
+import { t } from "@lingui/core/macro";
+import {
+  addMonths,
+  eachDayOfInterval,
+  endOfMonth,
+  endOfWeek,
+  format,
+  isSameDay,
+  isSameMonth,
+  isToday,
+  startOfMonth,
+  startOfWeek,
+  subMonths,
+} from "date-fns";
+import { useMemo, useState } from "react";
+import { HiChevronLeft, HiChevronRight } from "react-icons/hi2";
+import { twMerge } from "tailwind-merge";
+
+import Avatar from "~/components/Avatar";
+import LabelIcon from "~/components/LabelIcon";
+import { useLocalisation } from "~/hooks/useLocalisation";
+import { getAvatarUrl } from "~/utils/helpers";
+
+interface CalendarCard {
+  publicId: string;
+  title: string;
+  dueDate: Date;
+  listName: string;
+  labels: { name: string; colourCode: string | null }[];
+  members: {
+    publicId: string;
+    email: string;
+    user: { name: string | null; email: string; image: string | null } | null;
+  }[];
+}
+
+interface BoardCalendarViewProps {
+  boardPublicId: string;
+  isTemplate: boolean;
+  lists: {
+    publicId: string;
+    name: string;
+    cards: {
+      publicId: string;
+      title: string;
+      dueDate: Date | null;
+      labels: { name: string; colourCode: string | null }[];
+      members: {
+        publicId: string;
+        email: string;
+        user: {
+          name: string | null;
+          email: string;
+          image: string | null;
+        } | null;
+      }[];
+    }[];
+  }[];
+}
+
+export function BoardCalendarView({
+  boardPublicId,
+  isTemplate,
+  lists,
+}: BoardCalendarViewProps) {
+  const { dateLocale } = useLocalisation();
+  const [currentMonth, setCurrentMonth] = useState<Date>(() =>
+    startOfMonth(new Date()),
+  );
+
+  const cardsWithDueDate = useMemo<CalendarCard[]>(() => {
+    return lists
+      .flatMap((list) =>
+        list.cards
+          .filter(
+            (
+              card,
+            ): card is typeof card & {
+              dueDate: Date;
+            } => card.dueDate !== null,
+          )
+          .map((card) => ({
+            publicId: card.publicId,
+            title: card.title,
+            dueDate: card.dueDate,
+            listName: list.name,
+            labels: card.labels,
+            members: card.members,
+          })),
+      )
+      .sort((a, b) => a.dueDate.getTime() - b.dueDate.getTime());
+  }, [lists]);
+
+  const cardsByDay = useMemo(() => {
+    return cardsWithDueDate.reduce<Record<string, CalendarCard[]>>(
+      (acc, card) => {
+        const key = format(card.dueDate, "yyyy-MM-dd");
+        acc[key] = acc[key] ? [...acc[key], card] : [card];
+        return acc;
+      },
+      {},
+    );
+  }, [cardsWithDueDate]);
+
+  const dayHeaders = useMemo(() => {
+    const weekStart = startOfWeek(new Date(), { weekStartsOn: 1 });
+    return eachDayOfInterval({
+      start: weekStart,
+      end: new Date(weekStart.getTime() + 6 * 24 * 60 * 60 * 1000),
+    }).map((date) => format(date, "EEEEEE", { locale: dateLocale }));
+  }, [dateLocale]);
+
+  const days = useMemo(() => {
+    const monthStart = startOfMonth(currentMonth);
+    const monthEnd = endOfMonth(currentMonth);
+    const calendarStart = startOfWeek(monthStart, { weekStartsOn: 1 });
+    const calendarEnd = endOfWeek(monthEnd, { weekStartsOn: 1 });
+
+    return eachDayOfInterval({ start: calendarStart, end: calendarEnd });
+  }, [currentMonth]);
+
+  const weeksInView = days.length / 7;
+
+  const moveMonth = (direction: "next" | "prev") => {
+    setCurrentMonth((prev) =>
+      direction === "next" ? addMonths(prev, 1) : subMonths(prev, 1),
+    );
+  };
+
+  if (!cardsWithDueDate.length) {
+    return (
+      <div className="z-10 flex h-full w-full flex-col items-center justify-center space-y-2 pb-[150px]">
+        <p className="text-[14px] font-bold text-light-1000 dark:text-dark-950">
+          {t`No due dates yet`}
+        </p>
+        <p className="text-[14px] text-light-900 dark:text-dark-900">
+          {t`Add due dates to cards to see them in calendar view.`}
+        </p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="z-10 mx-6 mb-6 flex h-[calc(100vh-220px)] min-h-[520px] flex-col rounded-xl border border-light-300 bg-light-50 p-4 shadow-sm dark:border-dark-300 dark:bg-dark-100 md:mx-8 md:p-5">
+      <div className="mb-4 flex items-center justify-between">
+        <button
+          type="button"
+          onClick={() => moveMonth("prev")}
+          className="rounded-md p-2 text-light-800 hover:bg-light-200 dark:text-dark-800 dark:hover:bg-dark-200"
+          aria-label={t`Previous month`}
+        >
+          <HiChevronLeft className="h-5 w-5" />
+        </button>
+        <div className="text-sm font-semibold text-light-1000 dark:text-dark-1000">
+          {format(currentMonth, "MMMM yyyy", { locale: dateLocale })}
+        </div>
+        <button
+          type="button"
+          onClick={() => moveMonth("next")}
+          className="rounded-md p-2 text-light-800 hover:bg-light-200 dark:text-dark-800 dark:hover:bg-dark-200"
+          aria-label={t`Next month`}
+        >
+          <HiChevronRight className="h-5 w-5" />
+        </button>
+      </div>
+
+      <div className="grid grid-cols-7 gap-2 text-center text-xs font-semibold text-light-900 dark:text-dark-900">
+        {dayHeaders.map((day, index) => (
+          <div key={`${day}-${index}`}>{day}</div>
+        ))}
+      </div>
+
+      <div
+        className="mt-2 grid min-h-0 flex-1 grid-cols-7 gap-2"
+        style={{
+          gridTemplateRows: `repeat(${weeksInView}, minmax(0, 1fr))`,
+        }}
+      >
+        {days.map((day) => {
+          const key = format(day, "yyyy-MM-dd");
+          const dueCards = cardsByDay[key] ?? [];
+
+          return (
+            <div
+              key={key}
+              className={twMerge(
+                "min-h-0 overflow-hidden rounded-lg border p-1.5",
+                isSameMonth(day, currentMonth)
+                  ? "border-light-300 bg-light-100 dark:border-dark-300 dark:bg-dark-200"
+                  : "border-light-200 bg-light-50/50 dark:border-dark-200 dark:bg-dark-100/50",
+                isToday(day) &&
+                  "border-light-800 ring-1 ring-light-700/20 dark:border-dark-700 dark:ring-dark-700/30",
+              )}
+            >
+              <div
+                className={twMerge(
+                  "mb-2 text-xs font-semibold",
+                  isSameMonth(day, currentMonth)
+                    ? "text-light-1000 dark:text-dark-1000"
+                    : "text-light-700 dark:text-dark-700",
+                )}
+              >
+                {format(day, "d")}
+              </div>
+              <div className="space-y-1">
+                {dueCards.slice(0, 2).map((card) => (
+                  <Link
+                    key={card.publicId}
+                    href={
+                      isTemplate
+                        ? `/templates/${boardPublicId}/cards/${card.publicId}`
+                        : `/cards/${card.publicId}`
+                    }
+                    className={twMerge(
+                      "block rounded px-1.5 py-1",
+                      isSameDay(card.dueDate, new Date())
+                        ? "bg-blue-200 text-blue-900 dark:bg-blue-500/30 dark:text-blue-100"
+                        : "bg-light-200 text-light-1000 hover:bg-light-300 dark:bg-dark-300 dark:text-dark-1000 dark:hover:bg-dark-400",
+                    )}
+                    title={`${card.title} (${card.listName})`}
+                  >
+                    <p className="truncate text-[11px] font-medium">
+                      {card.title}
+                    </p>
+                    <div className="mt-1 flex items-center justify-between gap-1">
+                      <div className="-space-x-0.5 flex items-center">
+                        {card.labels.slice(0, 3).map((label, index) => (
+                          <span
+                            key={`${card.publicId}-label-${index}`}
+                            className="inline-flex h-3.5 w-3.5 items-center justify-center rounded-full bg-light-50 dark:bg-dark-100"
+                            title={label.name}
+                          >
+                            <LabelIcon colourCode={label.colourCode} />
+                          </span>
+                        ))}
+                        {card.labels.length > 3 ? (
+                          <span className="pl-1 text-[9px] text-light-900 dark:text-dark-900">
+                            +{card.labels.length - 3}
+                          </span>
+                        ) : null}
+                      </div>
+
+                      <div className="-space-x-1 flex items-center">
+                        {card.members.slice(0, 2).map((member) => (
+                          <Avatar
+                            key={`${card.publicId}-${member.publicId}`}
+                            size="xs"
+                            name={member.user?.name ?? ""}
+                            email={member.user?.email ?? member.email}
+                            imageUrl={
+                              member.user?.image
+                                ? getAvatarUrl(member.user.image)
+                                : undefined
+                            }
+                          />
+                        ))}
+                        {card.members.length > 2 ? (
+                          <span className="pl-1 text-[9px] text-light-900 dark:text-dark-900">
+                            +{card.members.length - 2}
+                          </span>
+                        ) : null}
+                      </div>
+                    </div>
+                  </Link>
+                ))}
+                {dueCards.length > 2 ? (
+                  <p className="px-2 text-[11px] text-light-800 dark:text-dark-800">
+                    +{dueCards.length - 2} {t`more`}
+                  </p>
+                ) : null}
+              </div>
+            </div>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/views/board/components/List.tsx b/apps/web/src/views/board/components/List.tsx
index 258436b9d..7a29e1cb8 100644
--- a/apps/web/src/views/board/components/List.tsx
+++ b/apps/web/src/views/board/components/List.tsx
@@ -4,6 +4,7 @@ import { Draggable } from "react-beautiful-dnd";
 import { useForm } from "react-hook-form";
 import {
   HiEllipsisHorizontal,
+  HiOutlineClock,
   HiOutlinePlusSmall,
   HiOutlineSquaresPlus,
   HiOutlineTrash,
@@ -21,6 +22,8 @@ interface ListProps {
   children: ReactNode;
   index: number;
   list: List;
+  sortMode: ListSortMode;
+  onSortModeChange: (sortMode: ListSortMode) => void;
   setSelectedPublicListId: (publicListId: PublicListId) => void;
 }
 
@@ -36,11 +39,14 @@ interface FormValues {
 }
 
 type PublicListId = string;
+type ListSortMode = "manual" | "due-date";
 
 export default function List({
   children,
   index,
   list,
+  sortMode,
+  onSortModeChange,
   setSelectedPublicListId,
 }: ListProps) {
   const { openModal } = useModal();
@@ -130,6 +136,17 @@ export default function List({
               </Tooltip>
               {(() => {
                 const dropdownItems = [
+                  {
+                    label:
+                      sortMode === "due-date"
+                        ? t`Show manual order`
+                        : t`Sort by due date`,
+                    action: () =>
+                      onSortModeChange(
+                        sortMode === "due-date" ? "manual" : "due-date",
+                      ),
+                    icon: <HiOutlineClock className="h-[18px] w-[18px] text-dark-900" />,
+                  },
                   ...(canCreateCard
                     ? [
                         {
diff --git a/apps/web/src/views/board/index.tsx b/apps/web/src/views/board/index.tsx
index 8d25696a7..41abdbee3 100644
--- a/apps/web/src/views/board/index.tsx
+++ b/apps/web/src/views/board/index.tsx
@@ -48,6 +48,7 @@ import { CardContextMoveListModal } from "./components/CardContextMoveListModal"
 import { DeleteBoardConfirmation } from "./components/DeleteBoardConfirmation";
 import { DeleteListConfirmation } from "./components/DeleteListConfirmation";
 import Filters from "./components/Filters";
+import { BoardCalendarView } from "./components/BoardCalendarView";
 import List from "./components/List";
 import { NewCardForm } from "./components/NewCardForm";
 import { NewListForm } from "./components/NewListForm";
@@ -57,6 +58,39 @@ import { UpdateBoardSlugForm } from "./components/UpdateBoardSlugForm";
 import VisibilityButton from "./components/VisibilityButton";
 
 type PublicListId = string;
+type BoardViewMode = "kanban" | "calendar";
+type ListSortMode = "manual" | "due-date";
+
+interface SortableCard {
+  dueDate?: Date | null;
+}
+
+function getSortedCards<T extends SortableCard>(
+  cards: T[],
+  sortMode: ListSortMode,
+) {
+  if (sortMode === "manual") {
+    return cards;
+  }
+
+  return [...cards]
+    .map((card, originalIndex) => ({ card, originalIndex }))
+    .sort((left, right) => {
+      const leftDueDate = left.card.dueDate
+        ? new Date(left.card.dueDate).getTime()
+        : Number.POSITIVE_INFINITY;
+      const rightDueDate = right.card.dueDate
+        ? new Date(right.card.dueDate).getTime()
+        : Number.POSITIVE_INFINITY;
+
+      if (leftDueDate !== rightDueDate) {
+        return leftDueDate - rightDueDate;
+      }
+
+      return left.originalIndex - right.originalIndex;
+    })
+    .map(({ card }) => card);
+}
 
 export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
   const params = useParams() as { boardId: string | string[] } | null;
@@ -68,6 +102,10 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
     useModal();
   const [selectedPublicListId, setSelectedPublicListId] =
     useState<PublicListId>("");
+  const [boardViewMode, setBoardViewMode] = useState<BoardViewMode>("kanban");
+  const [listSortModes, setListSortModes] = useState<
+    Record<PublicListId, ListSortMode>
+  >({});
   const [isInitialLoading, setIsInitialLoading] = useState(true);
 
   const [contextMenu, setContextMenu] = useState<{
@@ -171,6 +209,20 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
 
   const isLoading = isInitialLoading || isQueryLoading;
 
+  const getListSortMode = (publicListId: PublicListId): ListSortMode => {
+    return listSortModes[publicListId] ?? "manual";
+  };
+
+  const setListSortMode = (
+    publicListId: PublicListId,
+    sortMode: ListSortMode,
+  ) => {
+    setListSortModes((prev) => ({
+      ...prev,
+      [publicListId]: sortMode,
+    }));
+  };
+
   useScrollRestore(
     boardId,
     scrollRef,
@@ -566,6 +618,30 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
                 {t`Template`}
               </div>
             )}
+            <div className="inline-flex rounded-md border border-light-300 bg-light-50 p-1 dark:border-dark-300 dark:bg-dark-100">
+              <button
+                type="button"
+                onClick={() => setBoardViewMode("kanban")}
+                className={`rounded px-2 py-1 text-xs font-semibold ${
+                  boardViewMode === "kanban"
+                    ? "bg-light-1000 text-light-50 dark:bg-dark-1000 dark:text-dark-50"
+                    : "text-light-900 hover:bg-light-200 dark:text-dark-900 dark:hover:bg-dark-200"
+                }`}
+              >
+                {t`Board`}
+              </button>
+              <button
+                type="button"
+                onClick={() => setBoardViewMode("calendar")}
+                className={`rounded px-2 py-1 text-xs font-semibold ${
+                  boardViewMode === "calendar"
+                    ? "bg-light-1000 text-light-50 dark:bg-dark-1000 dark:text-dark-50"
+                    : "text-light-900 hover:bg-light-200 dark:text-dark-900 dark:hover:bg-dark-200"
+                }`}
+              >
+                {t`Calendar`}
+              </button>
+            </div>
             {!isTemplate && (
               <>
                 <UpdateBoardSlugButton
@@ -644,7 +720,13 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
             </div>
           ) : boardData ? (
             <>
-              {boardData.lists.length === 0 ? (
+              {boardViewMode === "calendar" ? (
+                <BoardCalendarView
+                  boardPublicId={boardId ?? ""}
+                  isTemplate={!!isTemplate}
+                  lists={boardData.lists}
+                />
+              ) : boardData.lists.length === 0 ? (
                 <div className="z-10 flex h-full w-full flex-col items-center justify-center space-y-8 pb-[150px]">
                   <div className="flex flex-col items-center">
                     <HiOutlineSquare3Stack3D className="h-10 w-10 text-light-800 dark:text-dark-800" />
@@ -689,8 +771,12 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
                         {boardData.lists.map((list, index) => (
                           <List
                             index={index}
-                            key={index}
+                            key={list.publicId}
                             list={list}
+                            sortMode={getListSortMode(list.publicId)}
+                            onSortModeChange={(sortMode) =>
+                              setListSortMode(list.publicId, sortMode)
+                            }
                             setSelectedPublicListId={(publicListId) =>
                               setSelectedPublicListId(publicListId)
                             }
@@ -705,12 +791,19 @@ export default function BoardPage({ isTemplate }: { isTemplate?: boolean }) {
                                   {...provided.droppableProps}
                                   className="scrollbar-track-rounded-[4px] scrollbar-thumb-rounded-[4px] scrollbar-w-[8px] z-10 h-full max-h-[calc(100vh-225px)] min-h-[2rem] overflow-y-auto pr-1 scrollbar dark:scrollbar-track-dark-100 dark:scrollbar-thumb-dark-600"
                                 >
-                                  {list.cards.map((card, index) => (
+                                  {getSortedCards(
+                                    list.cards,
+                                    getListSortMode(list.publicId),
+                                  ).map((card, index) => (
                                     <Draggable
                                       key={card.publicId}
                                       draggableId={card.publicId}
                                       index={index}
-                                      isDragDisabled={!canEditCard}
+                                      isDragDisabled={
+                                        !canEditCard ||
+                                        getListSortMode(list.publicId) ===
+                                          "due-date"
+                                      }
                                     >
                                       {(provided) => (
                                         <Link
diff --git a/cloud/docker-compose.yml b/cloud/docker-compose.yml
index fba057b47..775df7416 100644
--- a/cloud/docker-compose.yml
+++ b/cloud/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   migrator:
-    image: ghcr.io/kanbn/kan-migrate:latest
+    image: ghcr.io/lordofthecorgis/kan-migrate:latest
     container_name: ${MIGRATOR_CONTAINER_NAME:-kan-migrate}
     build:
       context: ..
@@ -13,7 +13,7 @@ services:
     restart: "no"
 
   web:
-    image: ghcr.io/kanbn/kan:latest
+    image: ghcr.io/lordofthecorgis/kan:latest
     container_name: ${CONTAINER_NAME:-kan-web}
     ports:
       - "${WEB_PORT:-3000}:3000"
diff --git a/docker-compose.yml b/docker-compose.yml
index f731cebe6..c00b6f877 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   migrate:
-    image: ghcr.io/kanbn/kan-migrate:latest
+    image: ghcr.io/lordofthecorgis/kan-migrate:latest
     container_name: ${CONTAINER_NAME:-kan-migrate}
     networks:
       - kan-network
@@ -16,7 +16,7 @@ services:
     restart: "no"
 
   web:
-    image: ghcr.io/kanbn/kan:latest
+    image: ghcr.io/lordofthecorgis/kan:latest
     container_name: ${CONTAINER_NAME:-kan-web}
     ports:
       - "${WEB_PORT:-3000}:3000"