diff --git a/client/components/tickets/ticket-create.tsx b/client/components/tickets/ticket-create.tsx
index 340914d..1fe4890 100644
--- a/client/components/tickets/ticket-create.tsx
+++ b/client/components/tickets/ticket-create.tsx
@@ -17,7 +17,7 @@ export interface TicketCreateProps {
 export default function TicketCreate({ onCancel, onCreate }: TicketCreateProps) {
   const { addToast } = useToast();
   const { mutate: createTicket } = useCreateTicket();
-  const [formData, setFormData] = useState<Partial<Ticket>>({
+  const [formData, setFormData] = useState<Omit<Partial<Ticket>, "deadline"> & { deadline?: string }>({
     status: "Open",
     title: "",
     description: "",
@@ -26,6 +26,7 @@ export default function TicketCreate({ onCancel, onCreate }: TicketCreateProps)
     createdBy: "techsquad@digitalnest.org",
     site: "Watsonville",
     category: "Hardware",
+    deadline: "",
   });
 
   const [isSaving, setIsSaving] = useState(false);
@@ -54,17 +55,25 @@ export default function TicketCreate({ onCancel, onCreate }: TicketCreateProps)
     setIsSaving(true);
 
     try {
-      createTicket(formData, {
-        onSuccess: (ticket) => {
-          onCreate(ticket);
-          addToast("New ticket created successfully!", "Success", 3500);
-        },
-        onError: (err) => {
-          console.error("Error creating ticket:", err);
-          addToast("An unexpected error occurred. Please try again.", "Error", 5000);
-        },
-        onSettled: () => setIsSaving(false),
-      });
+      // Prepare the ticket data, converting deadline string to Date and excluding empty deadline
+            const { deadline, ...rest } = formData;
+            const ticketData: Partial<Ticket> = { ...rest } as Partial<Ticket>;
+      
+            if (deadline && deadline !== "") {
+              ticketData.deadline = new Date(deadline);
+            }
+      
+            createTicket(ticketData, {
+              onSuccess: (ticket) => {
+                onCreate(ticket);
+                addToast("New ticket created successfully!", "Success", 3500);
+              },
+              onError: (err) => {
+                console.error("Error creating ticket:", err);
+                addToast("An unexpected error occurred. Please try again.", "Error", 5000);
+              },
+              onSettled: () => setIsSaving(false),
+            });
     } catch (error) {
       console.error("Unexpected error:", error);
       setIsSaving(false);
@@ -168,6 +177,17 @@ export default function TicketCreate({ onCancel, onCreate }: TicketCreateProps)
             </select>
           </div>
         </div>
+        {/* Deadline input with date and time */}
+        <div className="mb-2">
+          <label className="block mb-1 font-medium text-gray-700 dark:text-gray-300">Deadline (Date & Time)</label>
+          <input
+            className="w-full rounded border bg-white dark:bg-gray-800 px-3 py-2 text-sm text-gray-700 dark:text-gray-300"
+            type="datetime-local"
+            name="deadline"
+            value={formData.deadline || ""}
+            onChange={(e) => setFormData((prev) => ({ ...prev, deadline: e.target.value }))}
+          />
+        </div>
         <div className="mt-6 flex justify-end gap-3">
           <Button
             type="button"
diff --git a/client/components/tickets/ticket-detail.tsx b/client/components/tickets/ticket-detail.tsx
index 5f40eb2..5d64ca7 100644
--- a/client/components/tickets/ticket-detail.tsx
+++ b/client/components/tickets/ticket-detail.tsx
@@ -64,8 +64,50 @@ export default function TicketDetail({ ticketId, onDismiss, onUpdate }: TicketDe
     );
   }
 
-  const ticketCreatedAt = new Date(ticket.createdOn).toDateString();
-  const ticketUpdatedAt = new Date(ticket.updatedAt).toDateString();
+  const ticketCreatedAt = new Date(ticket.createdOn).toLocaleString(undefined, {
+    year: 'numeric',
+    month: 'numeric',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit',
+    hour12: true
+  });
+  const ticketUpdatedAt = new Date(ticket.updatedAt).toLocaleString(undefined, {
+    year: 'numeric',
+    month: 'numeric',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit',
+    hour12: true
+  });
+
+  // helper: format datetime strings with both date and time (no seconds)
+  const formatDateTime = (raw?: string | Date | null) => {
+    if (!raw) return null;
+    try {
+      const date = new Date(raw);
+      if (isNaN(date.getTime())) return null;
+      return date.toLocaleString(undefined, {
+        year: 'numeric',
+        month: 'numeric',
+        day: 'numeric',
+        hour: 'numeric',
+        minute: '2-digit',
+        hour12: true
+      });
+    } catch {
+      return null;
+    }
+  };
+
+  // screenshot: ensure absolute URL when server returns relative path
+  const makeScreenshotUrl = (path?: string | null) => {
+    if (!path) return null;
+    if (path.startsWith("http://") || path.startsWith("https://")) return path;
+    const base = process.env.NEXT_PUBLIC_API_URL ?? "";
+    // build with or without trailing slash cleanly
+    return `${base.replace(/\/$/, "")}${path.startsWith("/") ? "" : "/"}${path}`;
+  };
 
   const TicketCreatedBy = ({ createdBy }: { createdBy: string }) => {
     return (
@@ -94,6 +136,22 @@ export default function TicketDetail({ ticketId, onDismiss, onUpdate }: TicketDe
     setTimeout(onUpdate, 300);
   };
 
+  // compute deadline display and overdue
+  // ticket may not have the `deadline` property on the inferred Ticket type,
+  // so read it into a local variable with a narrow/known type to avoid TS errors.
+  const deadline = (ticket as any).deadline as string | Date | null | undefined;
+  const deadlineDisplay = formatDateTime(deadline);
+  const isOverdue = (() => {
+    if (!deadline) return false;
+    try {
+      const deadlineDate = new Date(deadline);
+      const now = new Date();
+      return deadlineDate.getTime() < now.getTime();
+    } catch {
+      return false;
+    }
+  })();
+  
   return (
     <div className="p-4 bg-gray-50 dark:bg-gray-800">
       <div className="flex justify-between">
@@ -159,12 +217,25 @@ export default function TicketDetail({ ticketId, onDismiss, onUpdate }: TicketDe
             </td>
             <td className="text-gray-800 dark:text-gray-300">{ticketCreatedAt}</td>
           </tr>
+
+          {/* Deadline row */}
+          <tr>
+            <td className={labelStyles}>
+              <LabeledIcon icon={<Calendar className="w-4" />} label="Deadline" />
+            </td>
+            <td className="text-gray-800 dark:text-gray-300">
+              {deadlineDisplay ?? <span className="text-gray-500">None</span>}
+              {isOverdue && <span className="ml-2 text-red-600 font-bold">Overdue</span>}
+            </td>
+          </tr>
+
           <tr>
             <td className={labelStyles}>
               <LabeledIcon icon={<Calendar className="w-4" />} label="Last Modified" />
             </td>
             <td className="text-gray-800 dark:text-gray-300">{ticketUpdatedAt}</td>
           </tr>
+          
         </tbody>
       </table>
     </div>
diff --git a/client/components/tickets/ticket-edit.tsx b/client/components/tickets/ticket-edit.tsx
index 43c2a74..97e3387 100644
--- a/client/components/tickets/ticket-edit.tsx
+++ b/client/components/tickets/ticket-edit.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { Building, Tag, User } from "lucide-react";
-import { FormEvent, useState } from "react";
+import { FormEvent, useEffect, useState } from "react";
 
 import { useTicket, useUpdateTicket } from "@/lib/hooks/queries/use-tickets";
 import { useToast } from "@/lib/hooks/use-toast";
@@ -20,9 +20,36 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
   const { data: ticket } = useTicket(ticketId);
   const { mutate: updateTicket } = useUpdateTicket();
 
-  const [formData, setFormData] = useState<Partial<Ticket>>(ticket || {});
+  const [formData, setFormData] = useState<Partial<Ticket> & { deadline?: string | Date }>(ticket || {});
   const [isSaving, setIsSaving] = useState(false);
 
+  useEffect(() => {
+    if (ticket) {
+      setFormData((prev) => {
+        // Format deadline for datetime-local input (YYYY-MM-DDTHH:MM)
+        let deadlineString = "";
+        if (ticket.deadline) {
+          const deadlineDate = new Date(ticket.deadline);
+          if (!isNaN(deadlineDate.getTime())) {
+            // Convert to local datetime string format for datetime-local input
+            const year = deadlineDate.getFullYear();
+            const month = String(deadlineDate.getMonth() + 1).padStart(2, '0');
+            const day = String(deadlineDate.getDate()).padStart(2, '0');
+            const hours = String(deadlineDate.getHours()).padStart(2, '0');
+            const minutes = String(deadlineDate.getMinutes()).padStart(2, '0');
+            deadlineString = `${year}-${month}-${day}T${hours}:${minutes}`;
+          }
+        }
+        
+        return {
+          ...prev,
+          ...ticket,
+          deadline: deadlineString,
+        } as Partial<Ticket> & { deadline?: string };
+      });
+    }
+  }, [ticket]);
+
   if (!ticket) {
     let layout = <></>;
 
@@ -66,8 +93,21 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
     setIsSaving(true);
 
     try {
-      updateTicket({ id: ticketId, updates: formData });
-      onSave(formData);
+      // Prepare the updates, converting deadline string to Date if needed
+      const { deadline, ...rest } = formData;
+      const updates: Partial<Ticket> = { ...rest } as Partial<Ticket>;
+      
+      // If deadline is provided as a string, convert it to Date
+      if (deadline && deadline !== "") {
+        if (typeof deadline === "string") {
+          updates.deadline = new Date(deadline);
+        } else {
+          updates.deadline = deadline;
+        }
+      }
+
+      updateTicket({ id: ticketId, updates });
+      onSave(updates);
       addToast("Ticket updated successfully.", "Info", 2500);
     } catch (error) {
       console.error("Error updating ticket:", error);
@@ -184,6 +224,17 @@ export default function TicketEdit({ ticketId, onCancel, onSave }: TicketEditPro
             </select>
           </div>
         </div>
+        {/* Deadline input with date and time */}
+        <div className="mb-4">
+          <label className="block text-sm font-medium text-gray-800 dark:text-gray-300 mb-1">Deadline (Date & Time)</label>
+          <input
+            type="datetime-local"
+            name="deadline"
+            value={(formData as any).deadline ?? ""}
+            onChange={(e) => setFormData((prev) => ({ ...(prev as any), deadline: e.target.value }))}
+            className="w-full p-2 border border-gray-300 dark:border-gray-600 text-gray-800 dark:text-gray-300 rounded-md"
+          />
+        </div>
         <div className="mt-6 flex justify-end gap-3">
           <Button
             type="button"
diff --git a/client/components/tickets/tickets-table-row.tsx b/client/components/tickets/tickets-table-row.tsx
index 7665900..bdde0d0 100644
--- a/client/components/tickets/tickets-table-row.tsx
+++ b/client/components/tickets/tickets-table-row.tsx
@@ -9,7 +9,14 @@ export interface TicketsTableRowProps {
 }
 
 export default function TicketTableRow({ ticket, onClick }: TicketsTableRowProps) {
-  const ticketUpdatedAt = new Date(ticket.updatedAt).toDateString();
+  const ticketUpdatedAt = new Date(ticket.updatedAt).toLocaleString(undefined, {
+    year: 'numeric',
+    month: 'numeric',
+    day: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit',
+    hour12: true
+  });
   const columnStyles = "px-4 py-4 text-left text-gray-700 dark:text-gray-300";
 
   let statusStyle: string;
diff --git a/client/components/tickets/tickets-table.tsx b/client/components/tickets/tickets-table.tsx
index c31b80c..edcda1a 100644
--- a/client/components/tickets/tickets-table.tsx
+++ b/client/components/tickets/tickets-table.tsx
@@ -25,11 +25,77 @@ export default function TicketsTable({ tickets, onClick }: TicketsTableProps) {
             <th className={`${commonStyles}`}>Title</th>
             <th className={`${commonStyles} hidden md:block`}>Assigned To</th>
             <th className={`${commonStyles}`}>Status</th>
-            <th className={`${commonStyles} hidden sm:block`}>Last Modified</th>
+
+            {/* Deadline (separate column) */}
+            <th className={`${commonStyles} hidden sm:table-cell`}>Deadline</th>
+
+            {/* Last Modified */}
+            <th className={`${commonStyles} hidden sm:table-cell`}>Last Modified</th>
           </tr>
         </thead>
+
         <tbody className="divide-y divide-gray-200 dark:divide-gray-900 text-sm">
-          <TicketRows />
+          {tickets.map((ticket) => {
+            // Format deadline with both date and time (no seconds)
+            const deadline = (ticket as any).deadline;
+            const deadlineDisplay = deadline ? (() => {
+              try {
+                const date = new Date(deadline);
+                return isNaN(date.getTime()) ? null : date.toLocaleString(undefined, {
+                  year: 'numeric',
+                  month: 'numeric',
+                  day: 'numeric',
+                  hour: 'numeric',
+                  minute: '2-digit',
+                  hour12: true
+                });
+              } catch {
+                return null;
+              }
+            })() : null;
+
+            // Check if deadline is overdue
+            const isOverdue = deadline ? (() => {
+              try {
+                const deadlineDate = new Date(deadline);
+                const now = new Date();
+                return deadlineDate.getTime() < now.getTime();
+              } catch {
+                return false;
+              }
+            })() : false;
+
+            return (
+              <tr key={ticket.id} className="hover:bg-gray-50 dark:hover:bg-gray-700" onClick={() => onClick(ticket)}>
+                <td className={commonStyles}>P{ticket.priority ?? "—"}</td>
+                <td className={`${commonStyles} hidden md:table-cell`}>{ticket.category ?? "—"}</td>
+                <td className={commonStyles}>{ticket.title}</td>
+                <td className={`${commonStyles} hidden md:table-cell`}>{ticket.assignedTo ?? "—"}</td>
+                <td className={commonStyles}>{ticket.status ?? "—"}</td>
+
+                {/* Deadline cell with date and time */}
+                <td className={`${commonStyles} hidden sm:table-cell`}>
+                  {deadlineDisplay ? (
+                    <div className="flex items-center gap-2">
+                      <span>{deadlineDisplay}</span>
+                      {isOverdue && <span className="text-xs text-red-600 font-bold">Overdue</span>}
+                    </div>
+                  ) : <span className="text-gray-500">—</span>}
+                </td>
+
+                <td className={`${commonStyles} hidden sm:table-cell`}>
+                  {ticket.updatedAt ? new Date(ticket.updatedAt).toLocaleString(undefined, {
+                    year: 'numeric',
+                    month: 'numeric',
+                    day: 'numeric',
+                    hour: 'numeric',
+                    minute: '2-digit',
+                    hour12: true
+                  }) : "—"}
+                </td>
+              </tr>
+            );
+          })}
         </tbody>
       </table>
     </div>
diff --git a/client/lib/types/ticket.ts b/client/lib/types/ticket.ts
index af6456e..8d1c7ee 100644
--- a/client/lib/types/ticket.ts
+++ b/client/lib/types/ticket.ts
@@ -10,6 +10,7 @@ export default interface Ticket {
   status: Status;
   createdOn: Date;
   updatedAt: Date;
+  deadline?: Date;
 }
 
 export const Sites = ["Salinas", "Watsonville", "HQ", "Gilroy", "Modesto", "Stockton"] as const;
diff --git a/server/internal/models/ticket.go b/server/internal/models/ticket.go
index 0b5a018..f42a8c4 100644
--- a/server/internal/models/ticket.go
+++ b/server/internal/models/ticket.go
@@ -9,17 +9,18 @@ import (
 
 // Ticket represents an IT ticket with associated metadata
 type Ticket struct {
-	ID          string    `json:"id" bson:"_id"`
-	Title       string    `json:"title"`
-	Description string    `json:"description"`
-	Site        string    `json:"site"`
-	Category    string    `json:"category"`
-	AssignedTo  string    `json:"assignedTo"`
-	CreatedBy   string    `json:"createdBy"`
-	Priority    int       `json:"priority"`
-	Status      string    `json:"status"`
-	CreatedOn   time.Time `json:"createdOn"`
-	UpdatedAt   time.Time `json:"updatedAt"`
+	ID          string     `json:"id" bson:"_id"`
+	Title       string     `json:"title"`
+	Description string     `json:"description"`
+	Site        string     `json:"site"`
+	Category    string     `json:"category"`
+	AssignedTo  string     `json:"assignedTo"`
+	CreatedBy   string     `json:"createdBy"`
+	Priority    int        `json:"priority"`
+	Status      string     `json:"status"`
+	CreatedOn   time.Time  `json:"createdOn"`
+	UpdatedAt   time.Time  `json:"updatedAt"`
+	Deadline    *time.Time `json:"deadline,omitempty"`
 }
 
 // UnmarshalBSON provides a custom unmarshal implementation for Ticket, enabling
@@ -28,17 +29,18 @@ func (t *Ticket) UnmarshalBSON(data []byte) error {
 	var (
 		buffer bytes.Buffer
 		result struct {
-			ID          string    `json:"id" bson:"_id"`
-			Title       string    `json:"title"`
-			Description string    `json:"description"`
-			Site        string    `json:"site"`
-			Category    string    `json:"category"`
-			AssignedTo  string    `json:"assignedTo"`
-			CreatedBy   string    `json:"createdBy"`
-			Priority    int       `json:"priority"`
-			Status      string    `json:"status"`
-			CreatedOn   time.Time `json:"createdOn"`
-			UpdatedAt   time.Time `json:"updatedAt"`
+			ID          string     `json:"id" bson:"_id"`
+			Title       string     `json:"title"`
+			Description string     `json:"description"`
+			Site        string     `json:"site"`
+			Category    string     `json:"category"`
+			AssignedTo  string     `json:"assignedTo"`
+			CreatedBy   string     `json:"createdBy"`
+			Priority    int        `json:"priority"`
+			Status      string     `json:"status"`
+			CreatedOn   time.Time  `json:"createdOn"`
+			UpdatedAt   time.Time  `json:"updatedAt"`
+			Deadline    *time.Time `json:"deadline,omitempty"`
 		}
 	)
 	_, _ = buffer.Write(data)
@@ -62,6 +64,7 @@ func (t *Ticket) UnmarshalBSON(data []byte) error {
 		Status:      result.Status,
 		CreatedOn:   result.CreatedOn,
 		UpdatedAt:   result.UpdatedAt,
+		Deadline:    result.Deadline,
 	}
 
 	return nil
diff --git a/server/internal/storage/storage.go b/server/internal/storage/storage.go
index 42bd96e..2213694 100644
--- a/server/internal/storage/storage.go
+++ b/server/internal/storage/storage.go
@@ -65,6 +65,11 @@ func (s *TicketStore) CreateTicket(ctx context.Context, ticket models.Ticket) (i
 		}
 	)
 
+	// Add deadline if it's provided
+	if ticket.Deadline != nil {
+		doc = append(doc, bson.E{Key: "deadline", Value: *ticket.Deadline})
+	}
+
 	res, err := s.collection.InsertOne(ctx, doc)
 	if err != nil {
 		return "", err
@@ -168,6 +173,25 @@ func (s *TicketStore) UpdateTicket(ctx context.Context, id string, updates map[s
 		updatesDoc = append(updatesDoc, bson.E{Key: "status", Value: status})
 	}
 
+	if deadline, ok := updates["deadline"].(string); ok {
+		var parsedDeadline time.Time
+		var err error
+
+		// Try datetime-local format first (YYYY-MM-DDTHH:MM)
+		if parsedDeadline, err = time.Parse("2006-01-02T15:04", deadline); err != nil {
+			// Try date-only format (YYYY-MM-DD)
+			if parsedDeadline, err = time.Parse("2006-01-02", deadline); err != nil {
+				// Try RFC3339 format as fallback
+				if parsedDeadline, err = time.Parse(time.RFC3339, deadline); err != nil {
+					sugar.Debugw("failed to parse deadline", "error", err, "value", deadline)
+					return nil, err
+				}
+			}
+		}
+
+		updatesDoc = append(updatesDoc, bson.E{Key: "deadline", Value: parsedDeadline})
+	}
+
 	if len(updates) > 0 {
 		updatesDoc = append(updatesDoc, bson.E{Key: "updatedAt", Value: time.Now()})
 	}