diff --git a/app/(landing)/hackathons/preview/[orgId]/[draftId]/page.tsx b/app/(landing)/hackathons/preview/[orgId]/[draftId]/page.tsx
index 2cc8283a..4a13e5e0 100644
--- a/app/(landing)/hackathons/preview/[orgId]/[draftId]/page.tsx
+++ b/app/(landing)/hackathons/preview/[orgId]/[draftId]/page.tsx
@@ -132,7 +132,15 @@ export default function DraftPreviewPage({ params }: PreviewPageProps) {
             timezone: draft.data.timeline?.timezone || 'UTC',
 
             startDate: draft.data.timeline?.startDate || '',
-            endDate: draft.data.timeline?.winnerAnnouncementDate || '',
+            endDate:
+              draft.data.timeline?.winnersAnnouncedAt ||
+              draft.data.timeline?.winnerAnnouncementDate ||
+              draft.data.timeline?.judgingEnd ||
+              draft.data.timeline?.judgingDate ||
+              draft.data.timeline?.judgingStart ||
+              draft.data.timeline?.submissionDeadline ||
+              draft.data.timeline?.startDate ||
+              '',
             submissionDeadline: draft.data.timeline?.submissionDeadline || '',
             registrationDeadline:
               draft.data.participation?.registrationDeadline || '',
diff --git a/app/(landing)/organizations/[id]/hackathons/page.tsx b/app/(landing)/organizations/[id]/hackathons/page.tsx
index 1f0fb3e0..699c3905 100644
--- a/app/(landing)/organizations/[id]/hackathons/page.tsx
+++ b/app/(landing)/organizations/[id]/hackathons/page.tsx
@@ -41,8 +41,7 @@ const calculateDraftCompletion = (draft: HackathonDraft): number => {
     draft.data.information?.categories,
     draft.data.timeline?.startDate,
     draft.data.timeline?.submissionDeadline,
-    draft.data.timeline?.judgingDate,
-    draft.data.timeline?.winnerAnnouncementDate,
+    draft.data.timeline?.judgingStart || draft.data.timeline?.judgingDate,
     draft.data.timeline?.timezone,
     draft.data.participation?.participantType,
     draft.data.rewards?.prizeTiers?.length,
@@ -402,7 +401,12 @@ export default function HackathonsPage() {
                   ? (hackathon as HackathonDraft).data.timeline
                       ?.submissionDeadline ||
                     (hackathon as HackathonDraft).data.timeline
-                      ?.winnerAnnouncementDate
+                      ?.winnersAnnouncedAt ||
+                    (hackathon as HackathonDraft).data.timeline
+                      ?.winnerAnnouncementDate ||
+                    (hackathon as HackathonDraft).data.timeline?.judgingEnd ||
+                    (hackathon as HackathonDraft).data.timeline?.judgingDate ||
+                    (hackathon as HackathonDraft).data.timeline?.judgingStart
                   : (hackathon as Hackathon).submissionDeadline ||
                     (hackathon as Hackathon).endDate;
                 const totalPrize = isDraft
diff --git a/app/sitemap.ts b/app/sitemap.ts
index 7189496d..e5db2450 100644
--- a/app/sitemap.ts
+++ b/app/sitemap.ts
@@ -3,7 +3,7 @@ import { getBlogPosts } from '@/lib/api/blog';
 import { getHackathons } from '@/lib/api/hackathons';
 import { getCrowdfundingProjects } from '@/features/projects/api';
 import type { BlogPost } from '@/types/blog';
-import type { Hackathon } from '@/types/hackathon/core';
+import type { Hackathon as HackathonAPI } from '@/lib/api/hackathons';
 import type { Crowdfunding } from '@/features/projects/types';
 
 // Constants
@@ -173,14 +173,14 @@ async function fetchHackathonsSitemap(): Promise<MetadataRoute.Sitemap> {
     }
 
     return response.data.hackathons
-      .filter((hackathon: Hackathon) => {
+      .filter((hackathon: HackathonAPI) => {
         // Validate required fields
         if (!hackathon.slug) {
           return false;
         }
         return true;
       })
-      .map((hackathon: Hackathon) => ({
+      .map((hackathon: HackathonAPI) => ({
         url: `${SITE_URL}/hackathons/${hackathon.slug}`,
         lastModified: new Date(
           hackathon.updatedAt || hackathon.publishedAt || new Date()
diff --git a/components/organization/hackathons/new/NewHackathonTab.tsx b/components/organization/hackathons/new/NewHackathonTab.tsx
index ffe91b12..41059492 100644
--- a/components/organization/hackathons/new/NewHackathonTab.tsx
+++ b/components/organization/hackathons/new/NewHackathonTab.tsx
@@ -159,7 +159,7 @@ export default function NewHackathonTab({
     onDraftLoadedRef.current = onDraftLoaded;
   }, [onDraftLoaded]);
 
-  const { isPublishing, publish } = useHackathonPublish({
+  const { isPublishing, publish, publishResponse } = useHackathonPublish({
     organizationId: derivedOrgId || '',
     stepData,
     draftId: draftId || '',
@@ -323,6 +323,7 @@ export default function NewHackathonTab({
               isSavingDraft={isSavingDraft}
               organizationId={derivedOrgId}
               draftId={draftId}
+              publishResponse={publishResponse}
             />
           </TabsContent>
         </div>
diff --git a/components/organization/hackathons/new/tabs/ReviewTab.tsx b/components/organization/hackathons/new/tabs/ReviewTab.tsx
index 24dbf922..32681179 100644
--- a/components/organization/hackathons/new/tabs/ReviewTab.tsx
+++ b/components/organization/hackathons/new/tabs/ReviewTab.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { InfoFormData } from './schemas/infoSchema';
 import { TimelineFormData } from './schemas/timelineSchema';
 import { ParticipantFormData } from './schemas/participantSchema';
@@ -22,6 +22,7 @@ import { SectionRenderer } from './components/review/SectionRenderer';
 import { usePrizePoolCalculations } from '@/hooks/use-prize-pool-calculations';
 import { REVIEW_SECTION_CONFIG } from './constants/review-sections';
 import { toast } from 'sonner';
+import type { PublishResponseData } from '@/hooks/use-hackathon-publish';
 
 interface ReviewTabProps {
   allData: {
@@ -37,9 +38,9 @@ interface ReviewTabProps {
   onSaveDraft?: () => Promise<void>;
   isLoading?: boolean;
   isSavingDraft?: boolean;
-  hackathonUrl?: string;
   organizationId?: string;
   draftId?: string | null;
+  publishResponse?: PublishResponseData | null;
 }
 
 export default function ReviewTab({
@@ -49,9 +50,9 @@ export default function ReviewTab({
   onSaveDraft,
   isLoading = false,
   isSavingDraft = false,
-  hackathonUrl,
   organizationId,
   draftId,
+  publishResponse,
 }: ReviewTabProps) {
   const [showDraftModal, setShowDraftModal] = useState(false);
   const [showPublishedModal, setShowPublishedModal] = useState(false);
@@ -60,11 +61,18 @@ export default function ReviewTab({
   const { totalPrizePool, platformFee, totalFunding } =
     usePrizePoolCalculations(allData.rewards);
 
+  // Show published modal only when we have a successful publish response
+  useEffect(() => {
+    if (publishResponse) {
+      setShowPublishedModal(true);
+    }
+  }, [publishResponse]);
+
   const handlePublish = async () => {
     try {
       if (onPublish) {
         await onPublish();
-        setShowPublishedModal(true);
+        // Modal will be shown automatically when publishResponse is set via useEffect
       }
     } catch {
       // Error is handled in the hook, so we don't need to show another toast
@@ -154,7 +162,8 @@ export default function ReviewTab({
       <HackathonPublishedModal
         open={showPublishedModal}
         onOpenChange={setShowPublishedModal}
-        hackathonUrl={hackathonUrl}
+        publishResponse={publishResponse}
+        organizationId={organizationId}
       />
     </div>
   );
diff --git a/components/organization/hackathons/new/tabs/TimelineTab.tsx b/components/organization/hackathons/new/tabs/TimelineTab.tsx
index 0c813066..0d9fc0e7 100644
--- a/components/organization/hackathons/new/tabs/TimelineTab.tsx
+++ b/components/organization/hackathons/new/tabs/TimelineTab.tsx
@@ -3,25 +3,32 @@ import {
   FormControl,
   FormField,
   FormItem,
-  FormLabel,
   FormMessage,
 } from '@/components/ui/form';
-import { useForm } from 'react-hook-form';
+import { useFieldArray, useForm } from 'react-hook-form';
 import React from 'react';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { timelineSchema, TimelineFormData } from './schemas/timelineSchema';
 import { BoundlessButton } from '@/components/buttons';
-import { CalendarIcon } from 'lucide-react';
+import { Plus, Trash2 } from 'lucide-react';
 import { toast } from 'sonner';
-import { format } from 'date-fns';
-import { cn } from '@/lib/utils';
 import { Button } from '@/components/ui/button';
-import { Calendar } from '@/components/ui/calendar';
+import { Switch } from '@/components/ui/switch';
+import { Input } from '@/components/ui/input';
+import { Textarea } from '@/components/ui/textarea';
 import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from '@/components/ui/popover';
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select';
+import FieldLabel from './components/timeline/FieldLabel';
+import DateTimeInput from './components/timeline/DateTimeInput';
+import {
+  TIMELINE_FIELD_TOOLTIPS,
+  TIMEZONES,
+} from './components/timeline/timelineConstants';
 
 interface TimelineTabProps {
   onContinue?: () => void;
@@ -39,14 +46,24 @@ export default function TimelineTab({
     resolver: zodResolver(timelineSchema),
     defaultValues: {
       startDate: initialData?.startDate || undefined,
-      endDate: initialData?.endDate || undefined,
-      registrationDeadline: initialData?.registrationDeadline || undefined,
       submissionDeadline: initialData?.submissionDeadline || undefined,
+      judgingStart: initialData?.judgingStart || undefined,
+      endDate: initialData?.endDate || undefined,
+      judgingEnd: initialData?.judgingEnd || undefined,
+      winnersAnnouncedAt: initialData?.winnersAnnouncedAt || undefined,
       timezone: initialData?.timezone || 'UTC',
       phases: initialData?.phases || [],
     },
   });
 
+  const phasesFieldArray = useFieldArray({
+    control: form.control,
+    name: 'phases',
+  });
+
+  const hasJudgingEnd = !!form.watch('judgingEnd');
+  const hasWinnersAnnouncedAt = !!form.watch('winnersAnnouncedAt');
+
   const onSubmit = async (data: TimelineFormData) => {
     try {
       if (onSave) {
@@ -61,186 +78,344 @@ export default function TimelineTab({
 
   return (
     <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)} className='space-y-8'>
-        <FormField
-          control={form.control}
-          name='startDate'
-          render={({ field }) => (
-            <FormItem className='gap-3'>
-              <FormLabel className='text-sm'>
-                Start Date <span className='text-error-400'>*</span>
-              </FormLabel>
-              <Popover>
-                <PopoverTrigger asChild>
-                  <FormControl>
-                    <Button
-                      variant='outline'
-                      className={cn(
-                        'bg-background-card h-12 w-full rounded-[12px] border border-gray-900 p-4 text-left font-normal',
-                        !field.value && 'text-gray-600'
-                      )}
-                    >
-                      {field.value ? (
-                        format(field.value, 'PPP')
-                      ) : (
-                        <span>When participants can register.</span>
-                      )}
-                      <CalendarIcon className='ml-auto h-4 w-4 text-gray-400' />
-                    </Button>
-                  </FormControl>
-                </PopoverTrigger>
-                <PopoverContent
-                  className='bg-background-card w-auto border-gray-900 p-0 text-white'
-                  align='start'
-                >
-                  <Calendar
-                    mode='single'
-                    selected={field.value}
-                    onSelect={field.onChange}
-                    disabled={date => date < new Date()}
-                    initialFocus
+      <form onSubmit={form.handleSubmit(onSubmit)} className='space-y-10'>
+        <div className='grid gap-6 md:grid-cols-2'>
+          <FormField
+            control={form.control}
+            name='startDate'
+            render={({ field }) => (
+              <FormItem className='gap-3'>
+                <FieldLabel
+                  label='Start Date'
+                  required
+                  tooltip={TIMELINE_FIELD_TOOLTIPS.startDate}
+                />
+                <DateTimeInput
+                  field={field}
+                  placeholder='When participants can register.'
+                />
+                <FormMessage className='text-error-400 text-xs' />
+              </FormItem>
+            )}
+          />
+
+          <FormField
+            control={form.control}
+            name='submissionDeadline'
+            render={({ field }) => (
+              <FormItem className='gap-3'>
+                <FieldLabel
+                  label='Submission Deadline'
+                  required
+                  tooltip={TIMELINE_FIELD_TOOLTIPS.submissionDeadline}
+                />
+                <DateTimeInput
+                  field={field}
+                  placeholder='Final project submission deadline.'
+                />
+                <FormMessage className='text-error-400 text-xs' />
+              </FormItem>
+            )}
+          />
+
+          <FormField
+            control={form.control}
+            name='judgingStart'
+            render={({ field }) => (
+              <FormItem className='gap-3'>
+                <FieldLabel
+                  label='Judging Start'
+                  required
+                  tooltip={TIMELINE_FIELD_TOOLTIPS.judgingStart}
+                />
+                <DateTimeInput
+                  field={field}
+                  placeholder='When judging begins.'
+                />
+                <FormMessage className='text-error-400 text-xs' />
+              </FormItem>
+            )}
+          />
+
+          <FormField
+            control={form.control}
+            name='endDate'
+            render={({ field }) => (
+              <FormItem className='gap-3'>
+                <FieldLabel
+                  label='End Date'
+                  required
+                  tooltip={TIMELINE_FIELD_TOOLTIPS.endDate}
+                />
+                <DateTimeInput
+                  field={field}
+                  placeholder='When the hackathon ends.'
+                />
+                <FormMessage className='text-error-400 text-xs' />
+              </FormItem>
+            )}
+          />
+
+          <FormField
+            control={form.control}
+            name='timezone'
+            render={({ field }) => (
+              <FormItem className='gap-3 md:col-span-2'>
+                <FieldLabel
+                  label='Timezone'
+                  required
+                  tooltip={TIMELINE_FIELD_TOOLTIPS.timezone}
+                />
+                <FormControl>
+                  <Select
+                    value={field.value || ''}
+                    onValueChange={field.onChange}
+                  >
+                    <SelectTrigger className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 px-4 text-sm text-white'>
+                      <SelectValue placeholder='Select a timezone' />
+                    </SelectTrigger>
+                    <SelectContent className='max-h-72'>
+                      {TIMEZONES.map(tz => (
+                        <SelectItem key={tz.value} value={tz.value}>
+                          {tz.label}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </FormControl>
+                <FormMessage className='text-error-400 text-xs' />
+              </FormItem>
+            )}
+          />
+        </div>
+
+        <div className='space-y-6'>
+          <div className='bg-background-card flex items-center justify-between rounded-[12px] border border-gray-900 p-4'>
+            <div className='space-y-1'>
+              <FieldLabel
+                label='Judging End'
+                tooltip={TIMELINE_FIELD_TOOLTIPS.judgingEnd}
+                useFormLabel={false}
+              />
+              <p className='text-xs text-gray-400'>
+                Add an end date for judging.
+              </p>
+            </div>
+            <Switch
+              checked={hasJudgingEnd}
+              onCheckedChange={checked => {
+                if (checked) {
+                  const fallbackDate =
+                    form.getValues('judgingStart') ||
+                    form.getValues('submissionDeadline') ||
+                    new Date();
+                  form.setValue('judgingEnd', fallbackDate, {
+                    shouldValidate: true,
+                  });
+                } else {
+                  form.setValue('judgingEnd', undefined, {
+                    shouldValidate: true,
+                  });
+                }
+              }}
+            />
+          </div>
+
+          {hasJudgingEnd && (
+            <FormField
+              control={form.control}
+              name='judgingEnd'
+              render={({ field }) => (
+                <FormItem className='gap-3'>
+                  <FieldLabel label='Judging End' />
+                  <DateTimeInput
+                    field={field}
+                    placeholder='When judging ends.'
                   />
-                </PopoverContent>
-              </Popover>
-              <FormMessage className='text-error-400 text-xs' />
-            </FormItem>
+                  <FormMessage className='text-error-400 text-xs' />
+                </FormItem>
+              )}
+            />
           )}
-        />
-
-        <FormField
-          control={form.control}
-          name='submissionDeadline'
-          render={({ field }) => (
-            <FormItem className='gap-3'>
-              <FormLabel className='text-sm'>
-                Submission Deadline <span className='text-error-400'>*</span>
-              </FormLabel>
-              <Popover>
-                <PopoverTrigger asChild>
-                  <FormControl>
-                    <Button
-                      variant='outline'
-                      className={cn(
-                        'bg-background-card h-12 w-full rounded-[12px] border border-gray-900 p-4 text-left font-normal',
-                        !field.value && 'text-gray-600'
-                      )}
-                    >
-                      {field.value ? (
-                        format(field.value, 'PPP')
-                      ) : (
-                        <span>Final project submission deadline.</span>
-                      )}
-                      <CalendarIcon className='ml-auto h-4 w-4 text-gray-400' />
-                    </Button>
-                  </FormControl>
-                </PopoverTrigger>
-                <PopoverContent
-                  className='bg-background-card w-auto border-gray-900 p-0 !text-white'
-                  align='start'
-                >
-                  <Calendar
-                    mode='single'
-                    selected={field.value}
-                    onSelect={field.onChange}
-                    disabled={date => date < new Date()}
-                    initialFocus
+        </div>
+
+        <div className='space-y-6'>
+          <div className='bg-background-card flex items-center justify-between rounded-[12px] border border-gray-900 p-4'>
+            <div className='space-y-1'>
+              <FieldLabel
+                label='Winner Announcement'
+                tooltip={TIMELINE_FIELD_TOOLTIPS.winnersAnnouncedAt}
+                useFormLabel={false}
+              />
+              <p className='text-xs text-gray-400'>
+                Set a public results date.
+              </p>
+            </div>
+            <Switch
+              checked={hasWinnersAnnouncedAt}
+              onCheckedChange={checked => {
+                if (checked) {
+                  const fallbackDate =
+                    form.getValues('judgingEnd') ||
+                    form.getValues('judgingStart') ||
+                    new Date();
+                  form.setValue('winnersAnnouncedAt', fallbackDate, {
+                    shouldValidate: true,
+                  });
+                } else {
+                  form.setValue('winnersAnnouncedAt', undefined, {
+                    shouldValidate: true,
+                  });
+                }
+              }}
+            />
+          </div>
+
+          {hasWinnersAnnouncedAt && (
+            <FormField
+              control={form.control}
+              name='winnersAnnouncedAt'
+              render={({ field }) => (
+                <FormItem className='gap-3'>
+                  <FieldLabel label='Winner Announcement' />
+                  <DateTimeInput
+                    field={field}
+                    placeholder='Public results date.'
                   />
-                </PopoverContent>
-              </Popover>
-              <FormMessage className='text-error-400 text-xs' />
-            </FormItem>
+                  <FormMessage className='text-error-400 text-xs' />
+                </FormItem>
+              )}
+            />
           )}
-        />
-
-        <FormField
-          control={form.control}
-          name='endDate'
-          render={({ field }) => (
-            <FormItem className='gap-3'>
-              <FormLabel className='text-sm'>
-                Judging <span className='text-error-400'>*</span>
-              </FormLabel>
-              <Popover>
-                <PopoverTrigger asChild>
-                  <FormControl>
-                    <Button
-                      variant='outline'
-                      className={cn(
-                        'bg-background-card h-12 w-full rounded-[12px] border border-gray-900 p-4 text-left font-normal',
-                        !field.value && 'text-gray-600'
-                      )}
+        </div>
+
+        <div className='space-y-4'>
+          <div className='flex items-center justify-between'>
+            <div className='space-y-1'>
+              <FieldLabel
+                label='Phases'
+                tooltip={TIMELINE_FIELD_TOOLTIPS.phases}
+                useFormLabel={false}
+              />
+              <p className='text-xs text-gray-400'>
+                Optional milestones for the event.
+              </p>
+            </div>
+            <Button
+              type='button'
+              variant='outline'
+              className='border-gray-900'
+              onClick={() =>
+                phasesFieldArray.append({
+                  name: '',
+                  startDate: new Date(),
+                  endDate: new Date(),
+                  description: '',
+                })
+              }
+            >
+              <Plus className='mr-2 h-4 w-4' />
+              Add Phase
+            </Button>
+          </div>
+
+          {phasesFieldArray.fields.length === 0 ? (
+            <div className='bg-background-card rounded-[12px] border border-dashed border-gray-900 p-4 text-xs text-gray-400'>
+              No phases added yet.
+            </div>
+          ) : (
+            <div className='space-y-4'>
+              {phasesFieldArray.fields.map((phase, index) => (
+                <div
+                  key={phase.id}
+                  className='bg-background-card rounded-[16px] border border-gray-900 p-4'
+                >
+                  <div className='mb-4 flex items-center justify-between'>
+                    <p className='text-sm font-medium text-white'>
+                      Phase {index + 1}
+                    </p>
+                    <button
+                      type='button'
+                      onClick={() => phasesFieldArray.remove(index)}
+                      className='flex items-center gap-1 text-xs text-gray-400 transition hover:text-red-400'
                     >
-                      {field.value ? (
-                        format(field.value, 'PPP')
-                      ) : (
-                        <span>When evaluation begins.</span>
+                      <Trash2 className='h-4 w-4' />
+                      Remove
+                    </button>
+                  </div>
+
+                  <div className='grid gap-4 md:grid-cols-2'>
+                    <FormField
+                      control={form.control}
+                      name={`phases.${index}.name`}
+                      render={({ field }) => (
+                        <FormItem className='gap-3'>
+                          <FieldLabel label='Phase Name' required />
+                          <FormControl>
+                            <Input
+                              className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 px-4 text-sm text-white'
+                              placeholder='e.g. Kickoff'
+                              {...field}
+                            />
+                          </FormControl>
+                          <FormMessage className='text-error-400 text-xs' />
+                        </FormItem>
                       )}
-                      <CalendarIcon className='ml-auto h-4 w-4 text-gray-400' />
-                    </Button>
-                  </FormControl>
-                </PopoverTrigger>
-                <PopoverContent
-                  className='bg-background-card w-auto border-gray-900 p-0 !text-white'
-                  align='start'
-                >
-                  <Calendar
-                    mode='single'
-                    selected={field.value}
-                    onSelect={field.onChange}
-                    disabled={date => date < new Date()}
-                    initialFocus
-                  />
-                </PopoverContent>
-              </Popover>
-              <FormMessage className='text-error-400 text-xs' />
-            </FormItem>
-          )}
-        />
-
-        <FormField
-          control={form.control}
-          name='registrationDeadline'
-          render={({ field }) => (
-            <FormItem className='gap-3'>
-              <FormLabel className='text-sm'>
-                Winner Announcement <span className='text-error-400'>*</span>
-              </FormLabel>
-              <Popover>
-                <PopoverTrigger asChild>
-                  <FormControl>
-                    <Button
-                      variant='outline'
-                      className={cn(
-                        'bg-background-card h-12 w-full rounded-[12px] border border-gray-900 p-4 text-left font-normal',
-                        !field.value && 'text-gray-600'
+                    />
+
+                    <FormField
+                      control={form.control}
+                      name={`phases.${index}.startDate`}
+                      render={({ field }) => (
+                        <FormItem className='gap-3'>
+                          <FieldLabel label='Phase Start' required />
+                          <DateTimeInput
+                            field={field}
+                            placeholder='Phase start date.'
+                          />
+                          <FormMessage className='text-error-400 text-xs' />
+                        </FormItem>
                       )}
-                    >
-                      {field.value ? (
-                        format(field.value, 'PPP')
-                      ) : (
-                        <span>Public results date.</span>
+                    />
+
+                    <FormField
+                      control={form.control}
+                      name={`phases.${index}.endDate`}
+                      render={({ field }) => (
+                        <FormItem className='gap-3'>
+                          <FieldLabel label='Phase End' required />
+                          <DateTimeInput
+                            field={field}
+                            placeholder='Phase end date.'
+                          />
+                          <FormMessage className='text-error-400 text-xs' />
+                        </FormItem>
                       )}
-                      <CalendarIcon className='ml-auto h-4 w-4 text-gray-400' />
-                    </Button>
-                  </FormControl>
-                </PopoverTrigger>
-                <PopoverContent
-                  className='bg-background-card w-auto border-gray-900 p-0 !text-white'
-                  align='start'
-                >
-                  <Calendar
-                    mode='single'
-                    selected={field.value}
-                    onSelect={field.onChange}
-                    disabled={date => date < new Date()}
-                    initialFocus
+                    />
+                  </div>
+
+                  <FormField
+                    control={form.control}
+                    name={`phases.${index}.description`}
+                    render={({ field }) => (
+                      <FormItem className='mt-4 gap-3'>
+                        <FieldLabel label='Description' />
+                        <FormControl>
+                          <Textarea
+                            className='bg-background-card rounded-[12px] border border-gray-900 px-4 text-sm text-white'
+                            placeholder='Optional notes for this phase.'
+                            {...field}
+                          />
+                        </FormControl>
+                        <FormMessage className='text-error-400 text-xs' />
+                      </FormItem>
+                    )}
                   />
-                </PopoverContent>
-              </Popover>
-              <FormMessage className='text-error-400 text-xs' />
-            </FormItem>
+                </div>
+              ))}
+            </div>
           )}
-        />
+        </div>
 
         <div className='flex justify-start pt-6'>
           <BoundlessButton type='submit' size='xl' disabled={isLoading}>
diff --git a/components/organization/hackathons/new/tabs/components/review/HackathonPublishedModal.tsx b/components/organization/hackathons/new/tabs/components/review/HackathonPublishedModal.tsx
index f408d1de..6a0153d0 100644
--- a/components/organization/hackathons/new/tabs/components/review/HackathonPublishedModal.tsx
+++ b/components/organization/hackathons/new/tabs/components/review/HackathonPublishedModal.tsx
@@ -7,80 +7,113 @@ import {
   DialogTitle,
 } from '@/components/ui/dialog';
 import { BoundlessButton } from '@/components/buttons';
-import { Check, Building2 } from 'lucide-react';
+import { Check, Building2, ExternalLink } from 'lucide-react';
 import { useRouter } from 'next/navigation';
+import { NETWORKS, getCurrentNetwork } from '@/lib/wallet-utils';
+import type { PublishResponseData } from '@/hooks/use-hackathon-publish';
 
 interface HackathonPublishedModalProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
-  hackathonUrl?: string;
+  publishResponse?: PublishResponseData | null;
+  organizationId?: string;
 }
 
 export default function HackathonPublishedModal({
   open,
   onOpenChange,
-  hackathonUrl,
+  publishResponse,
+  organizationId,
 }: HackathonPublishedModalProps) {
   const router = useRouter();
 
-  const handleOpenInNewTab = () => {
-    if (hackathonUrl) {
-      window.open(hackathonUrl, '_blank', 'noopener,noreferrer');
+  const handleViewHackathon = () => {
+    if (publishResponse?.slug) {
+      onOpenChange(false);
+      router.push(`/hackathons/${publishResponse.slug}`);
     }
   };
 
   const handleGoHome = () => {
     onOpenChange(false);
-    router.push('/');
+    if (organizationId) {
+      router.push(`/organizations/${organizationId}`);
+    } else {
+      router.push('/');
+    }
+  };
+
+  const handleViewEscrow = () => {
+    if (publishResponse?.escrowAddress) {
+      const network = getCurrentNetwork();
+      const explorerUrl = `${NETWORKS[network].explorer}/contract/${publishResponse.escrowAddress}`;
+      window.open(explorerUrl, '_blank', 'noopener,noreferrer');
+    }
   };
 
+  if (!publishResponse) {
+    return null;
+  }
+
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
       <DialogContent
         showCloseButton={false}
-        className='bg-background-card w-full max-w-[500px] border border-gray-900 p-16 text-center'
+        className='bg-background-card w-full max-w-[500px] border border-gray-900 p-8 text-center'
       >
         <DialogHeader className='space-y-6'>
-          {/* Icon with glow effect */}
+          {/* Success Icon */}
           <div className='relative mx-auto'>
-            <div className='bg-success-400/30 absolute inset-0 rounded-full blur-sm' />
-            <div className='relative flex h-20 w-20 items-center justify-center rounded-full'>
+            <div className='bg-success-400/30 absolute inset-0 h-20 w-20 rounded-full blur-xl' />
+            <div className='bg-success-400/10 border-success-400/30 relative mx-auto flex h-20 w-20 items-center justify-center rounded-full border'>
               <Check strokeWidth={1.5} className='text-success-400 h-10 w-10' />
             </div>
           </div>
 
           {/* Title */}
-          <DialogTitle className='text-center text-xl font-medium text-white'>
+          <DialogTitle className='text-center text-2xl font-bold text-white'>
             Hackathon Published Successfully
           </DialogTitle>
 
           {/* Description */}
           <DialogDescription className='text-center leading-relaxed text-gray-500'>
-            Your hackathon is now published. You can{' '}
-            {hackathonUrl && (
-              <>
-                <button
-                  onClick={handleOpenInNewTab}
-                  className='text-primary underline hover:no-underline'
-                >
-                  open it in a new tab
-                </button>{' '}
-                to preview or{' '}
-              </>
-            )}
-            head back home to manage it.
+            Your hackathon is now live and ready for participants to discover
+            and join.
           </DialogDescription>
 
-          {/* Home Button */}
-          <div className='flex items-center justify-center pt-4'>
+          {/* Action Buttons */}
+          <div className='flex flex-col gap-3 pt-4'>
             <BoundlessButton
-              onClick={handleGoHome}
+              onClick={handleViewHackathon}
               size='xl'
               fullWidth
               className='bg-primary hover:bg-primary/90 text-black'
+            >
+              View Hackathon
+            </BoundlessButton>
+
+            {publishResponse.escrowAddress && (
+              <BoundlessButton
+                onClick={handleViewEscrow}
+                size='xl'
+                fullWidth
+                variant='outline'
+                className='border-gray-900'
+              >
+                <ExternalLink className='mr-2 h-4 w-4' />
+                View Escrow Address
+              </BoundlessButton>
+            )}
+
+            <BoundlessButton
+              onClick={handleGoHome}
+              size='xl'
+              fullWidth
+              variant='outline'
+              className='border-gray-900'
             >
               <Building2 className='mr-2 h-4 w-4' />
-              Home
+              Back to Organization
             </BoundlessButton>
           </div>
         </DialogHeader>
diff --git a/components/organization/hackathons/new/tabs/components/review/TimelineSection.tsx b/components/organization/hackathons/new/tabs/components/review/TimelineSection.tsx
index 4a2150ca..66f4860b 100644
--- a/components/organization/hackathons/new/tabs/components/review/TimelineSection.tsx
+++ b/components/organization/hackathons/new/tabs/components/review/TimelineSection.tsx
@@ -10,10 +10,12 @@ interface TimelineSectionProps {
 const formatDateShort = (date: Date | string | undefined): string => {
   if (!date) return 'Not set';
   const d = typeof date === 'string' ? new Date(date) : date;
-  return d.toLocaleDateString('en-US', {
+  return d.toLocaleString('en-US', {
     day: '2-digit',
     month: 'short',
     year: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit',
   });
 };
 
@@ -24,7 +26,7 @@ export default function TimelineSection({
 }: TimelineSectionProps) {
   return (
     <div className='space-y-4'>
-      <div className='grid grid-cols-1 gap-4 md:grid-cols-4'>
+      <div className='grid grid-cols-1 gap-4 md:grid-cols-3'>
         <div className='space-y-1'>
           <p className='text-xs font-medium text-gray-500'>Start Date:</p>
           <p className='text-sm font-medium text-white'>
@@ -40,19 +42,35 @@ export default function TimelineSection({
           </p>
         </div>
         <div className='space-y-1'>
-          <p className='text-xs font-medium text-gray-500'>Judging:</p>
+          <p className='text-xs font-medium text-gray-500'>Judging Start:</p>
           <p className='text-sm font-medium text-white'>
-            {formatDateShort(data.endDate)}
+            {formatDateShort(data.judgingStart)}
           </p>
         </div>
         <div className='space-y-1'>
-          <p className='text-xs font-medium text-gray-500'>
-            Winner Announcement:
-          </p>
+          <p className='text-xs font-medium text-gray-500'>End Date:</p>
           <p className='text-sm font-medium text-white'>
-            {formatDateShort(data.registrationDeadline)}
+            {formatDateShort(data.endDate)}
           </p>
         </div>
+        {data.judgingEnd && (
+          <div className='space-y-1'>
+            <p className='text-xs font-medium text-gray-500'>Judging End:</p>
+            <p className='text-sm font-medium text-white'>
+              {formatDateShort(data.judgingEnd)}
+            </p>
+          </div>
+        )}
+        {data.winnersAnnouncedAt && (
+          <div className='space-y-1'>
+            <p className='text-xs font-medium text-gray-500'>
+              Winner Announcement:
+            </p>
+            <p className='text-sm font-medium text-white'>
+              {formatDateShort(data.winnersAnnouncedAt)}
+            </p>
+          </div>
+        )}
       </div>
       {data.phases && data.phases.length > 0 && (
         <div className='space-y-3 border-t border-gray-800 pt-4'>
diff --git a/components/organization/hackathons/new/tabs/components/timeline/DateTimeInput.tsx b/components/organization/hackathons/new/tabs/components/timeline/DateTimeInput.tsx
new file mode 100644
index 00000000..ae07bfae
--- /dev/null
+++ b/components/organization/hackathons/new/tabs/components/timeline/DateTimeInput.tsx
@@ -0,0 +1,99 @@
+import React from 'react';
+import { FormControl, FormMessage } from '@/components/ui/form';
+import { Button } from '@/components/ui/button';
+import { Calendar } from '@/components/ui/calendar';
+import { Input } from '@/components/ui/input';
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@/components/ui/popover';
+import { CalendarIcon } from 'lucide-react';
+import { cn } from '@/lib/utils';
+import { format } from 'date-fns';
+
+interface DateTimeInputProps {
+  field: {
+    value?: Date;
+    onChange: (value?: Date) => void;
+  };
+  placeholder: string;
+  disabledPast?: boolean;
+}
+
+export default function DateTimeInput({
+  field,
+  placeholder,
+  disabledPast = true,
+}: DateTimeInputProps) {
+  const formatTimeValue = (date?: Date) => {
+    if (!date) return '';
+    const hours = `${date.getHours()}`.padStart(2, '0');
+    const minutes = `${date.getMinutes()}`.padStart(2, '0');
+    return `${hours}:${minutes}`;
+  };
+
+  const applyTimeToDate = (date: Date, timeValue: string) => {
+    const [hours, minutes] = timeValue.split(':').map(Number);
+    const next = new Date(date);
+    next.setHours(hours || 0, minutes || 0, 0, 0);
+    return next;
+  };
+
+  return (
+    <div className='grid gap-3 sm:grid-cols-[minmax(0,1fr)_160px]'>
+      <Popover>
+        <PopoverTrigger asChild>
+          <FormControl>
+            <Button
+              variant='outline'
+              className={cn(
+                'bg-background-card h-12 w-full rounded-[12px] border border-gray-900 p-4 text-left font-normal',
+                !field.value && 'text-gray-600'
+              )}
+            >
+              {field.value ? (
+                format(field.value, 'PPP')
+              ) : (
+                <span>{placeholder}</span>
+              )}
+              <CalendarIcon className='ml-auto h-4 w-4 text-gray-400' />
+            </Button>
+          </FormControl>
+        </PopoverTrigger>
+        <PopoverContent
+          className='bg-background-card w-auto border-gray-900 p-0 !text-white'
+          align='start'
+        >
+          <Calendar
+            mode='single'
+            selected={field.value}
+            onSelect={field.onChange}
+            disabled={
+              disabledPast
+                ? date => {
+                    const today = new Date();
+                    today.setHours(0, 0, 0, 0);
+                    return date < today;
+                  }
+                : undefined
+            }
+            initialFocus
+          />
+        </PopoverContent>
+      </Popover>
+      <FormControl>
+        <Input
+          type='time'
+          className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 px-4 text-sm text-white'
+          value={formatTimeValue(field.value)}
+          onChange={event => {
+            if (!field.value) return;
+            field.onChange(applyTimeToDate(field.value, event.target.value));
+          }}
+          disabled={!field.value}
+        />
+      </FormControl>
+    </div>
+  );
+}
diff --git a/components/organization/hackathons/new/tabs/components/timeline/FieldLabel.tsx b/components/organization/hackathons/new/tabs/components/timeline/FieldLabel.tsx
new file mode 100644
index 00000000..49300df1
--- /dev/null
+++ b/components/organization/hackathons/new/tabs/components/timeline/FieldLabel.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import { FormLabel } from '@/components/ui/form';
+import { Info } from 'lucide-react';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@/components/ui/tooltip';
+
+interface FieldLabelProps {
+  label: string;
+  tooltip?: string;
+  required?: boolean;
+  useFormLabel?: boolean;
+}
+
+export default function FieldLabel({
+  label,
+  tooltip,
+  required,
+  useFormLabel = true,
+}: FieldLabelProps) {
+  return (
+    <div className='flex items-center gap-2'>
+      {useFormLabel ? (
+        <FormLabel className='text-sm font-medium text-white'>
+          {label} {required && <span className='text-error-400'>*</span>}
+        </FormLabel>
+      ) : (
+        <p className='text-sm font-medium text-white'>
+          {label} {required && <span className='text-error-400'>*</span>}
+        </p>
+      )}
+      {tooltip && (
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <button
+              type='button'
+              className='rounded-full text-gray-500 transition hover:text-gray-300'
+            >
+              <Info className='h-4 w-4' />
+            </button>
+          </TooltipTrigger>
+          <TooltipContent side='right' sideOffset={6} className='max-w-xs'>
+            {tooltip}
+          </TooltipContent>
+        </Tooltip>
+      )}
+    </div>
+  );
+}
diff --git a/components/organization/hackathons/new/tabs/components/timeline/timelineConstants.ts b/components/organization/hackathons/new/tabs/components/timeline/timelineConstants.ts
new file mode 100644
index 00000000..b7019dfe
--- /dev/null
+++ b/components/organization/hackathons/new/tabs/components/timeline/timelineConstants.ts
@@ -0,0 +1,64 @@
+export const TIMELINE_FIELD_TOOLTIPS = {
+  startDate:
+    'The date and time when the hackathon officially begins. Participants can join from this date onward (if registration is open).',
+  endDate:
+    'The date and time when the hackathon officially ends. This marks the conclusion of the entire event.',
+  submissionDeadline:
+    'The final date and time when teams can submit their projects. Submissions after this deadline will not be accepted.',
+  timezone:
+    'The timezone used for all dates and times in this hackathon. All deadlines and phases are interpreted in this timezone.',
+  judgingStart:
+    'Optional. The date and time when judges begin reviewing and scoring submitted projects. Must be after the submission deadline.',
+  judgingEnd:
+    'Optional. The date and time when the judging period concludes. If set, judgingStart is required and must be before this date.',
+  winnersAnnouncedAt:
+    'Optional. The date and time when winning projects and prize recipients are publicly announced. Must be after judging ends (or after the event end date if judging is not used).',
+  phases:
+    'Optional. Define custom lifecycle phases (e.g., "Kickoff", "Development", "Final Submissions") with specific start/end dates to structure the hackathon timeline.',
+};
+
+// Common timezones organized by region
+export const TIMEZONES = [
+  // UTC
+  { label: 'UTC (Coordinated Universal Time)', value: 'UTC' },
+  // Americas - North America
+  { label: 'EST (Eastern Standard Time)', value: 'America/New_York' },
+  { label: 'US Central Standard Time (CST)', value: 'America/Chicago' },
+  { label: 'MST (Mountain Standard Time)', value: 'America/Denver' },
+  { label: 'PST (Pacific Standard Time)', value: 'America/Los_Angeles' },
+  { label: 'AKST (Alaska Standard Time)', value: 'America/Anchorage' },
+  { label: 'HST (Hawaii Standard Time)', value: 'Pacific/Honolulu' },
+
+  // Americas - Central & South America
+  { label: 'BRT (Brasília Time)', value: 'America/Sao_Paulo' },
+  { label: 'ART (Argentina Time)', value: 'America/Argentina/Buenos_Aires' },
+  { label: 'CLT (Chile Standard Time)', value: 'America/Santiago' },
+  { label: 'COT (Colombia Time)', value: 'America/Bogota' },
+
+  // Europe
+  { label: 'GMT (Greenwich Mean Time)', value: 'Europe/London' },
+  { label: 'CET (Central European Time)', value: 'Europe/Paris' },
+  { label: 'EET (Eastern European Time)', value: 'Europe/Athens' },
+  { label: 'MSK (Moscow Standard Time)', value: 'Europe/Moscow' },
+
+  // Middle East & Africa
+  { label: 'EAT (East Africa Time)', value: 'Africa/Nairobi' },
+  { label: 'WAT (West Africa Time)', value: 'Africa/Lagos' },
+  { label: 'SAST (South Africa Standard Time)', value: 'Africa/Johannesburg' },
+  { label: 'GST (Gulf Standard Time)', value: 'Asia/Dubai' },
+
+  // Asia
+  { label: 'ICT (Indochina Time)', value: 'Asia/Bangkok' },
+  { label: 'IST (India Standard Time)', value: 'Asia/Kolkata' },
+  { label: 'SGT (Singapore Time)', value: 'Asia/Singapore' },
+  { label: 'HKT (Hong Kong Time)', value: 'Asia/Hong_Kong' },
+  { label: 'China Standard Time (CST)', value: 'Asia/Shanghai' },
+  { label: 'JST (Japan Standard Time)', value: 'Asia/Tokyo' },
+  { label: 'KST (Korea Standard Time)', value: 'Asia/Seoul' },
+
+  // Oceania
+  { label: 'AEST (Australian Eastern Time)', value: 'Australia/Sydney' },
+  { label: 'AWST (Australian Western Time)', value: 'Australia/Perth' },
+  { label: 'NZST (New Zealand Standard Time)', value: 'Pacific/Auckland' },
+  { label: 'FIJI (Fiji Time)', value: 'Pacific/Fiji' },
+];
diff --git a/components/organization/hackathons/new/tabs/schemas/timelineSchema.ts b/components/organization/hackathons/new/tabs/schemas/timelineSchema.ts
index fbd4c54a..98468025 100644
--- a/components/organization/hackathons/new/tabs/schemas/timelineSchema.ts
+++ b/components/organization/hackathons/new/tabs/schemas/timelineSchema.ts
@@ -6,18 +6,22 @@ export const timelineSchema = z
       message: 'Start date is required',
     }),
 
-    endDate: z.date({
-      message: 'Judging date is required',
+    submissionDeadline: z.date({
+      message: 'Submission deadline is required',
     }),
 
-    registrationDeadline: z.date({
-      message: 'Winner announcement date is required',
+    judgingStart: z.date({
+      message: 'Judging start date is required',
     }),
 
-    submissionDeadline: z.date({
-      message: 'Submission deadline is required',
+    endDate: z.date({
+      message: 'End date is required',
     }),
 
+    judgingEnd: z.date().optional(),
+
+    winnersAnnouncedAt: z.date().optional(),
+
     timezone: z.string().min(1, 'Timezone is required'),
 
     phases: z
@@ -44,21 +48,48 @@ export const timelineSchema = z
       });
     }
 
-    if (data.endDate <= data.submissionDeadline) {
+    if (data.judgingStart <= data.submissionDeadline) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Judging must start after submission deadline',
+        path: ['judgingStart'],
+      });
+    }
+
+    if (data.endDate <= data.judgingStart) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
-        message: 'Judging must be after submission deadline',
+        message: 'End date must be after judging start',
         path: ['endDate'],
       });
     }
 
-    if (data.registrationDeadline <= data.endDate) {
+    if (data.judgingEnd && data.judgingEnd <= data.judgingStart) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Judging end must be after judging start',
+        path: ['judgingEnd'],
+      });
+    }
+
+    if (data.judgingEnd && data.judgingEnd >= data.endDate) {
       ctx.addIssue({
         code: z.ZodIssueCode.custom,
-        message: 'Winner announcement must be after judging',
-        path: ['registrationDeadline'],
+        message: 'Judging end must be before hackathon end date',
+        path: ['judgingEnd'],
       });
     }
+
+    if (data.winnersAnnouncedAt) {
+      const judgingEnd = data.judgingEnd ?? data.judgingStart;
+      if (data.winnersAnnouncedAt <= judgingEnd) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: 'Winner announcement must be after judging',
+          path: ['winnersAnnouncedAt'],
+        });
+      }
+    }
   });
 
 export type TimelineFormData = z.infer<typeof timelineSchema>;
diff --git a/components/organization/hackathons/settings/TimelineSettingsTab.tsx b/components/organization/hackathons/settings/TimelineSettingsTab.tsx
index bc0209f8..6e2cd260 100644
--- a/components/organization/hackathons/settings/TimelineSettingsTab.tsx
+++ b/components/organization/hackathons/settings/TimelineSettingsTab.tsx
@@ -26,7 +26,16 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from '@/components/ui/popover';
+import { Switch } from '@/components/ui/switch';
 import { Input } from '@/components/ui/input';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select';
+import { TIMEZONES } from '@/components/organization/hackathons/new/tabs/components/timeline/timelineConstants';
 
 interface TimelineSettingsTabProps {
   organizationId?: string;
@@ -45,14 +54,33 @@ export default function TimelineSettingsTab({
     resolver: zodResolver(timelineSchema),
     defaultValues: {
       startDate: initialData?.startDate || undefined,
-      endDate: initialData?.endDate || undefined,
-      registrationDeadline: initialData?.registrationDeadline || undefined,
       submissionDeadline: initialData?.submissionDeadline || undefined,
+      judgingStart: initialData?.judgingStart || undefined,
+      endDate: initialData?.endDate || undefined,
+      judgingEnd: initialData?.judgingEnd || undefined,
+      winnersAnnouncedAt: initialData?.winnersAnnouncedAt || undefined,
       timezone: initialData?.timezone || 'UTC',
       phases: initialData?.phases || [],
     },
   });
 
+  const hasJudgingEnd = !!form.watch('judgingEnd');
+  const hasWinnersAnnouncedAt = !!form.watch('winnersAnnouncedAt');
+
+  const formatTimeValue = (date?: Date) => {
+    if (!date) return '';
+    const hours = `${date.getHours()}`.padStart(2, '0');
+    const minutes = `${date.getMinutes()}`.padStart(2, '0');
+    return `${hours}:${minutes}`;
+  };
+
+  const applyTimeToDate = (date: Date, timeValue: string) => {
+    const [hours, minutes] = timeValue.split(':').map(Number);
+    const next = new Date(date);
+    next.setHours(hours || 0, minutes || 0, 0, 0);
+    return next;
+  };
+
   const onSubmit = async (data: TimelineFormData) => {
     if (onSave) {
       await onSave(data);
@@ -112,6 +140,20 @@ export default function TimelineSettingsTab({
                       />
                     </PopoverContent>
                   </Popover>
+                  <FormControl>
+                    <Input
+                      type='time'
+                      className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 px-4 text-sm text-white'
+                      value={formatTimeValue(field.value)}
+                      onChange={event => {
+                        if (!field.value) return;
+                        field.onChange(
+                          applyTimeToDate(field.value, event.target.value)
+                        );
+                      }}
+                      disabled={!field.value}
+                    />
+                  </FormControl>
                   <FormMessage className='text-error-400 text-xs' />
                 </FormItem>
               )}
@@ -157,6 +199,20 @@ export default function TimelineSettingsTab({
                       />
                     </PopoverContent>
                   </Popover>
+                  <FormControl>
+                    <Input
+                      type='time'
+                      className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 px-4 text-sm text-white'
+                      value={formatTimeValue(field.value)}
+                      onChange={event => {
+                        if (!field.value) return;
+                        field.onChange(
+                          applyTimeToDate(field.value, event.target.value)
+                        );
+                      }}
+                      disabled={!field.value}
+                    />
+                  </FormControl>
                   <FormMessage className='text-error-400 text-xs' />
                 </FormItem>
               )}
@@ -164,11 +220,11 @@ export default function TimelineSettingsTab({
 
             <FormField
               control={form.control}
-              name='endDate'
+              name='judgingStart'
               render={({ field }) => (
                 <FormItem className='gap-3'>
                   <FormLabel className='text-sm'>
-                    Judging Date <span className='text-error-400'>*</span>
+                    Judging Start <span className='text-error-400'>*</span>
                   </FormLabel>
                   <Popover>
                     <PopoverTrigger asChild>
@@ -183,7 +239,7 @@ export default function TimelineSettingsTab({
                           {field.value ? (
                             format(field.value, 'PPP')
                           ) : (
-                            <span>Select judging date</span>
+                            <span>Select judging start</span>
                           )}
                           <CalendarIcon className='ml-auto h-4 w-4 text-gray-400' />
                         </Button>
@@ -201,6 +257,20 @@ export default function TimelineSettingsTab({
                       />
                     </PopoverContent>
                   </Popover>
+                  <FormControl>
+                    <Input
+                      type='time'
+                      className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 px-4 text-sm text-white'
+                      value={formatTimeValue(field.value)}
+                      onChange={event => {
+                        if (!field.value) return;
+                        field.onChange(
+                          applyTimeToDate(field.value, event.target.value)
+                        );
+                      }}
+                      disabled={!field.value}
+                    />
+                  </FormControl>
                   <FormMessage className='text-error-400 text-xs' />
                 </FormItem>
               )}
@@ -208,12 +278,11 @@ export default function TimelineSettingsTab({
 
             <FormField
               control={form.control}
-              name='registrationDeadline'
+              name='endDate'
               render={({ field }) => (
                 <FormItem className='gap-3'>
                   <FormLabel className='text-sm'>
-                    Winner Announcement{' '}
-                    <span className='text-error-400'>*</span>
+                    End Date <span className='text-error-400'>*</span>
                   </FormLabel>
                   <Popover>
                     <PopoverTrigger asChild>
@@ -228,7 +297,7 @@ export default function TimelineSettingsTab({
                           {field.value ? (
                             format(field.value, 'PPP')
                           ) : (
-                            <span>Select announcement date</span>
+                            <span>Select end date</span>
                           )}
                           <CalendarIcon className='ml-auto h-4 w-4 text-gray-400' />
                         </Button>
@@ -246,12 +315,204 @@ export default function TimelineSettingsTab({
                       />
                     </PopoverContent>
                   </Popover>
+                  <FormControl>
+                    <Input
+                      type='time'
+                      className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 px-4 text-sm text-white'
+                      value={formatTimeValue(field.value)}
+                      onChange={event => {
+                        if (!field.value) return;
+                        field.onChange(
+                          applyTimeToDate(field.value, event.target.value)
+                        );
+                      }}
+                      disabled={!field.value}
+                    />
+                  </FormControl>
                   <FormMessage className='text-error-400 text-xs' />
                 </FormItem>
               )}
             />
           </div>
 
+          <div className='space-y-4'>
+            <div className='bg-background-card flex items-center justify-between rounded-[12px] border border-gray-900 p-4'>
+              <div>
+                <p className='text-sm font-medium text-white'>Judging End</p>
+                <p className='text-xs text-gray-400'>
+                  Add an end date for judging.
+                </p>
+              </div>
+              <Switch
+                checked={hasJudgingEnd}
+                onCheckedChange={checked => {
+                  if (checked) {
+                    const fallbackDate =
+                      form.getValues('judgingStart') ||
+                      form.getValues('submissionDeadline') ||
+                      new Date();
+                    form.setValue('judgingEnd', fallbackDate, {
+                      shouldValidate: true,
+                    });
+                  } else {
+                    form.setValue('judgingEnd', undefined, {
+                      shouldValidate: true,
+                    });
+                  }
+                }}
+              />
+            </div>
+
+            {hasJudgingEnd && (
+              <FormField
+                control={form.control}
+                name='judgingEnd'
+                render={({ field }) => (
+                  <FormItem className='gap-3'>
+                    <FormLabel className='text-sm'>Judging End</FormLabel>
+                    <Popover>
+                      <PopoverTrigger asChild>
+                        <FormControl>
+                          <Button
+                            variant='outline'
+                            className={cn(
+                              'bg-background-card h-12 w-full rounded-[12px] border border-gray-900 p-4 text-left font-normal',
+                              !field.value && 'text-gray-600'
+                            )}
+                          >
+                            {field.value ? (
+                              format(field.value, 'PPP')
+                            ) : (
+                              <span>Select judging end</span>
+                            )}
+                            <CalendarIcon className='ml-auto h-4 w-4 text-gray-400' />
+                          </Button>
+                        </FormControl>
+                      </PopoverTrigger>
+                      <PopoverContent
+                        className='bg-background-card w-auto border-gray-900 p-0 text-white'
+                        align='start'
+                      >
+                        <Calendar
+                          mode='single'
+                          selected={field.value}
+                          onSelect={field.onChange}
+                          initialFocus
+                        />
+                      </PopoverContent>
+                    </Popover>
+                    <FormControl>
+                      <Input
+                        type='time'
+                        className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 px-4 text-sm text-white'
+                        value={formatTimeValue(field.value)}
+                        onChange={event => {
+                          if (!field.value) return;
+                          field.onChange(
+                            applyTimeToDate(field.value, event.target.value)
+                          );
+                        }}
+                        disabled={!field.value}
+                      />
+                    </FormControl>
+                    <FormMessage className='text-error-400 text-xs' />
+                  </FormItem>
+                )}
+              />
+            )}
+          </div>
+
+          <div className='space-y-4'>
+            <div className='bg-background-card flex items-center justify-between rounded-[12px] border border-gray-900 p-4'>
+              <div>
+                <p className='text-sm font-medium text-white'>
+                  Winner Announcement
+                </p>
+                <p className='text-xs text-gray-400'>
+                  Set a public results date.
+                </p>
+              </div>
+              <Switch
+                checked={hasWinnersAnnouncedAt}
+                onCheckedChange={checked => {
+                  if (checked) {
+                    const fallbackDate =
+                      form.getValues('judgingEnd') ||
+                      form.getValues('judgingStart') ||
+                      new Date();
+                    form.setValue('winnersAnnouncedAt', fallbackDate, {
+                      shouldValidate: true,
+                    });
+                  } else {
+                    form.setValue('winnersAnnouncedAt', undefined, {
+                      shouldValidate: true,
+                    });
+                  }
+                }}
+              />
+            </div>
+
+            {hasWinnersAnnouncedAt && (
+              <FormField
+                control={form.control}
+                name='winnersAnnouncedAt'
+                render={({ field }) => (
+                  <FormItem className='gap-3'>
+                    <FormLabel className='text-sm'>
+                      Winner Announcement
+                    </FormLabel>
+                    <Popover>
+                      <PopoverTrigger asChild>
+                        <FormControl>
+                          <Button
+                            variant='outline'
+                            className={cn(
+                              'bg-background-card h-12 w-full rounded-[12px] border border-gray-900 p-4 text-left font-normal',
+                              !field.value && 'text-gray-600'
+                            )}
+                          >
+                            {field.value ? (
+                              format(field.value, 'PPP')
+                            ) : (
+                              <span>Select announcement date</span>
+                            )}
+                            <CalendarIcon className='ml-auto h-4 w-4 text-gray-400' />
+                          </Button>
+                        </FormControl>
+                      </PopoverTrigger>
+                      <PopoverContent
+                        className='bg-background-card w-auto border-gray-900 p-0 text-white'
+                        align='start'
+                      >
+                        <Calendar
+                          mode='single'
+                          selected={field.value}
+                          onSelect={field.onChange}
+                          initialFocus
+                        />
+                      </PopoverContent>
+                    </Popover>
+                    <FormControl>
+                      <Input
+                        type='time'
+                        className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 px-4 text-sm text-white'
+                        value={formatTimeValue(field.value)}
+                        onChange={event => {
+                          if (!field.value) return;
+                          field.onChange(
+                            applyTimeToDate(field.value, event.target.value)
+                          );
+                        }}
+                        disabled={!field.value}
+                      />
+                    </FormControl>
+                    <FormMessage className='text-error-400 text-xs' />
+                  </FormItem>
+                )}
+              />
+            )}
+          </div>
+
           <FormField
             control={form.control}
             name='timezone'
@@ -261,12 +522,21 @@ export default function TimelineSettingsTab({
                   Timezone <span className='text-error-400'>*</span>
                 </FormLabel>
                 <FormControl>
-                  <Input
-                    {...field}
-                    type='text'
-                    placeholder='UTC'
-                    className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 p-4 placeholder:text-gray-600 focus-visible:ring-0 focus-visible:ring-offset-0'
-                  />
+                  <Select
+                    value={field.value || ''}
+                    onValueChange={field.onChange}
+                  >
+                    <SelectTrigger className='bg-background-card h-12 w-full rounded-[12px] border border-gray-900 placeholder:text-gray-600 focus-visible:ring-0 focus-visible:ring-offset-0'>
+                      <SelectValue placeholder='Select a timezone' />
+                    </SelectTrigger>
+                    <SelectContent className='max-h-72'>
+                      {TIMEZONES.map(tz => (
+                        <SelectItem key={tz.value} value={tz.value}>
+                          {tz.label}
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
                 </FormControl>
                 <FormMessage className='text-error-400 text-xs' />
               </FormItem>
diff --git a/hooks/use-hackathon-publish.ts b/hooks/use-hackathon-publish.ts
index fa09a500..c4cb0e89 100644
--- a/hooks/use-hackathon-publish.ts
+++ b/hooks/use-hackathon-publish.ts
@@ -30,6 +30,15 @@ interface UseHackathonPublishProps {
   ) => Promise<Hackathon>;
 }
 
+export interface PublishResponseData {
+  id: string;
+  slug: string;
+  publishedAt: string;
+  message: string;
+  escrowAddress: string;
+  transactionHash: string | null;
+}
+
 export const useHackathonPublish = ({
   organizationId,
   stepData,
@@ -39,11 +48,13 @@ export const useHackathonPublish = ({
   const router = useRouter();
   const { walletAddress } = useWalletContext();
   const [isPublishing, setIsPublishing] = useState(false);
+  const [publishResponse, setPublishResponse] =
+    useState<PublishResponseData | null>(null);
 
-  const publish = async () => {
+  const publish = async (): Promise<PublishResponseData | null> => {
     if (!organizationId) {
       toast.error('Organization ID is required');
-      return;
+      return null;
     }
 
     if (
@@ -55,12 +66,12 @@ export const useHackathonPublish = ({
       !stepData.collaboration
     ) {
       toast.error('Please complete all steps before publishing');
-      return;
+      return null;
     }
 
     if (!walletAddress) {
       toast.error('Please connect your wallet first');
-      return;
+      return null;
     }
 
     if (
@@ -68,18 +79,18 @@ export const useHackathonPublish = ({
       stepData.rewards.prizeTiers.length === 0
     ) {
       toast.error('Please add at least one prize tier before publishing');
-      return;
+      return null;
     }
 
     const totalPrizeAmount = getTotalPrizePoolForFunding(stepData.rewards);
     if (totalPrizeAmount === 0) {
       toast.error('Total prize amount must be greater than zero');
-      return;
+      return null;
     }
 
     if (!draftId) {
       toast.error('Draft ID is required');
-      return;
+      return null;
     }
 
     setIsPublishing(true);
@@ -87,17 +98,34 @@ export const useHackathonPublish = ({
     try {
       toast.info('Publishing hackathon...');
       // The backend now handles the custodial wallet and escrow logic
-      const hackathon = await publishDraftAction(draftId, organizationId);
+      const response = await publishDraftAction(draftId, organizationId);
 
-      toast.success('Hackathon published successfully!');
+      // Handle different response formats
+      // Could be: { success, message, data: {...} } or direct Hackathon object
+      let hackathon = response;
 
-      if (organizationId && hackathon.id) {
-        setTimeout(() => {
-          router.push(
-            `/organizations/${organizationId}/hackathons/${hackathon.id}`
-          );
-        }, 1500);
+      if (!hackathon || !hackathon.id) {
+        throw new Error('Invalid publish response: missing hackathon ID');
       }
+
+      // Prepare response data from hackathon object
+      const responseData: PublishResponseData = {
+        id: hackathon.id,
+        slug: hackathon.slug || '',
+        publishedAt: hackathon.publishedAt || new Date().toISOString(),
+        message: hackathon.message || 'Hackathon published successfully',
+        escrowAddress: hackathon.escrowAddress || '',
+        transactionHash: hackathon.transactionHash || null,
+      };
+
+      setPublishResponse(responseData);
+
+      // Show success toast with hackathon ID
+      toast.success(`Hackathon published! ID: ${responseData.id}`, {
+        duration: 4000,
+      });
+
+      return responseData;
     } catch (error) {
       let errorMessage = 'Failed to publish hackathon';
 
@@ -115,5 +143,6 @@ export const useHackathonPublish = ({
   return {
     isPublishing,
     publish,
+    publishResponse,
   };
 };
diff --git a/hooks/use-hackathons.ts b/hooks/use-hackathons.ts
index c4f00d13..9679b970 100644
--- a/hooks/use-hackathons.ts
+++ b/hooks/use-hackathons.ts
@@ -450,14 +450,22 @@ export function useHackathons(
 
       try {
         const response = await publishDraft(draftId, organizationId);
-        setHackathons(prev => [response.data, ...prev]);
-        setCurrentHackathon(response.data);
+
+        // Extract data from API response wrapper if it exists
+        const hackathon = response?.data || response;
+
+        if (!hackathon || !hackathon.id) {
+          throw new Error('Invalid publish response: missing hackathon ID');
+        }
+
+        setHackathons(prev => [hackathon, ...prev]);
+        setCurrentHackathon(hackathon);
         // Optionally remove from drafts if it was a draft
         if (currentDraft) {
           setDrafts(prev => prev.filter(d => d.id !== currentDraft.id));
           setCurrentDraft(null);
         }
-        return response.data;
+        return hackathon;
       } catch (error) {
         const errorMessage =
           error instanceof Error
diff --git a/lib/api/hackathons.ts b/lib/api/hackathons.ts
index 2b792cc7..59c8f0ef 100644
--- a/lib/api/hackathons.ts
+++ b/lib/api/hackathons.ts
@@ -75,8 +75,13 @@ export interface HackathonPhase {
 export interface HackathonTimeline {
   startDate: string; // ISO 8601 date
   submissionDeadline: string; // ISO 8601 date
-  judgingDate: string; // ISO 8601 date
-  winnerAnnouncementDate: string; // ISO 8601 date
+  judgingStart: string; // ISO 8601 date
+  endDate: string; // ISO 8601 date
+  judgingEnd?: string; // ISO 8601 date
+  winnersAnnouncedAt?: string; // ISO 8601 date
+  // Legacy fields for backward compatibility
+  judgingDate?: string; // ISO 8601 date
+  winnerAnnouncementDate?: string; // ISO 8601 date
   timezone: string;
   phases?: HackathonPhase[];
 }
@@ -439,7 +444,8 @@ export type Hackathon = {
 
   contractId?: string;
   escrowAddress?: string;
-  transactionHash?: string;
+  transactionHash?: string | null;
+  message?: string;
   escrowDetails?: object;
 };
 
diff --git a/lib/utils/hackathon-form-transforms.ts b/lib/utils/hackathon-form-transforms.ts
index cf32b298..6ee9e93f 100644
--- a/lib/utils/hackathon-form-transforms.ts
+++ b/lib/utils/hackathon-form-transforms.ts
@@ -63,9 +63,14 @@ export const transformToApiFormat = (stepData: {
     timeline: {
       startDate: timeline?.startDate?.toISOString() || '',
       submissionDeadline: timeline?.submissionDeadline?.toISOString() || '',
-      judgingDate: timeline?.endDate?.toISOString() || '',
-      winnerAnnouncementDate:
-        timeline?.registrationDeadline?.toISOString() || '',
+      judgingStart: timeline?.judgingStart?.toISOString() || '',
+      endDate: timeline?.endDate?.toISOString() || '',
+      ...(timeline?.judgingEnd
+        ? { judgingEnd: timeline.judgingEnd.toISOString() }
+        : {}),
+      ...(timeline?.winnersAnnouncedAt
+        ? { winnersAnnouncedAt: timeline.winnersAnnouncedAt.toISOString() }
+        : {}),
       timezone: timeline?.timezone || 'UTC',
       phases: timeline?.phases?.map(phase => ({
         name: phase.name,
@@ -175,15 +180,23 @@ export const transformFromApiFormat = (draft: HackathonDraft) => {
     } as InfoFormData,
     timeline: {
       startDate: timeline?.startDate ? new Date(timeline.startDate) : undefined,
-      endDate: timeline?.judgingDate
-        ? new Date(timeline.judgingDate)
-        : undefined,
-      registrationDeadline: timeline?.winnerAnnouncementDate
-        ? new Date(timeline.winnerAnnouncementDate)
-        : undefined,
       submissionDeadline: timeline?.submissionDeadline
         ? new Date(timeline.submissionDeadline)
         : undefined,
+      judgingStart: timeline?.judgingStart
+        ? new Date(timeline.judgingStart)
+        : timeline?.judgingDate
+          ? new Date(timeline.judgingDate)
+          : undefined,
+      endDate: timeline?.endDate ? new Date(timeline.endDate) : undefined,
+      judgingEnd: timeline?.judgingEnd
+        ? new Date(timeline.judgingEnd)
+        : undefined,
+      winnersAnnouncedAt: timeline?.winnersAnnouncedAt
+        ? new Date(timeline.winnersAnnouncedAt)
+        : timeline?.winnerAnnouncementDate
+          ? new Date(timeline.winnerAnnouncementDate)
+          : undefined,
       timezone: timeline?.timezone || 'UTC',
       phases:
         timeline?.phases?.map(phase => ({
diff --git a/lib/utils/hackathon-step-validation.ts b/lib/utils/hackathon-step-validation.ts
index 8d6fe770..0bba746b 100644
--- a/lib/utils/hackathon-step-validation.ts
+++ b/lib/utils/hackathon-step-validation.ts
@@ -98,8 +98,7 @@ export const isStepDataValid = (
       return !!(
         timeline.startDate &&
         timeline.submissionDeadline &&
-        timeline.endDate &&
-        timeline.registrationDeadline
+        timeline.judgingStart
       );
     }
     case 'participation': {
diff --git a/lib/utils/hackathon-timeline.ts b/lib/utils/hackathon-timeline.ts
index e878264c..f46af423 100644
--- a/lib/utils/hackathon-timeline.ts
+++ b/lib/utils/hackathon-timeline.ts
@@ -109,40 +109,45 @@ export const calculateTimelineStatus = (
       'Participants are submitting their projects for review before the deadline.',
   });
 
-  // Judging phase (from submissionDeadline to judgingDate)
-  phases.push({
-    name: 'Judging',
-    startDate: timeline.submissionDeadline,
-    endDate: timeline.judgingDate,
-    status: isPhaseCompleted(timeline.judgingDate, currentDate)
-      ? 'completed'
-      : isPhaseActive(
-            timeline.submissionDeadline,
-            timeline.judgingDate,
-            currentDate
-          )
-        ? 'active'
-        : 'upcoming',
-    description:
-      'Judges are currently reviewing and scoring all submitted projects.',
-  });
+  const judgingStart = timeline.judgingStart || timeline.judgingDate;
+  const judgingEnd = timeline.judgingEnd || judgingStart;
+  const winnersAnnouncedAt =
+    timeline.winnersAnnouncedAt ||
+    timeline.winnerAnnouncementDate ||
+    judgingEnd;
 
-  // Winner Announcement phase (from judgingDate to winnerAnnouncementDate)
-  phases.push({
-    name: 'Winner Announcement',
-    startDate: timeline.judgingDate,
-    endDate: timeline.winnerAnnouncementDate,
-    status: isPhaseCompleted(timeline.winnerAnnouncementDate, currentDate)
-      ? 'completed'
-      : isPhaseActive(
-            timeline.judgingDate,
-            timeline.winnerAnnouncementDate,
-            currentDate
-          )
-        ? 'active'
-        : 'upcoming',
-    description: 'Final results published and prizes distributed to winners.',
-  });
+  // Judging phase (from judgingStart to judgingEnd)
+  // Only create if explicitly set and has non-zero duration
+  if (judgingStart && judgingEnd && judgingStart !== judgingEnd) {
+    phases.push({
+      name: 'Judging',
+      startDate: judgingStart,
+      endDate: judgingEnd,
+      status: isPhaseCompleted(judgingEnd, currentDate)
+        ? 'completed'
+        : isPhaseActive(judgingStart, judgingEnd, currentDate)
+          ? 'active'
+          : 'upcoming',
+      description:
+        'Judges are currently reviewing and scoring all submitted projects.',
+    });
+  }
+
+  // Winner Announcement phase (from judgingEnd to winnersAnnouncedAt)
+  // Only create if explicitly set and has non-zero duration
+  if (judgingEnd && winnersAnnouncedAt && judgingEnd !== winnersAnnouncedAt) {
+    phases.push({
+      name: 'Winner Announcement',
+      startDate: judgingEnd,
+      endDate: winnersAnnouncedAt,
+      status: isPhaseCompleted(winnersAnnouncedAt, currentDate)
+        ? 'completed'
+        : isPhaseActive(judgingEnd, winnersAnnouncedAt, currentDate)
+          ? 'active'
+          : 'upcoming',
+      description: 'Final results published and prizes distributed to winners.',
+    });
+  }
 
   // Find current active phase
   const currentPhase = phases.find(phase => phase.status === 'active') || null;
diff --git a/types/hackathon/core.ts b/types/hackathon/core.ts
index efa05a49..a609a2cf 100644
--- a/types/hackathon/core.ts
+++ b/types/hackathon/core.ts
@@ -70,8 +70,13 @@ export interface HackathonPhase {
 export interface HackathonTimeline {
   startDate: string; // ISO 8601 date
   submissionDeadline: string; // ISO 8601 date
-  judgingDate: string; // ISO 8601 date
-  winnerAnnouncementDate: string; // ISO 8601 date
+  judgingStart: string; // ISO 8601 date
+  endDate: string; // ISO 8601 date
+  judgingEnd?: string; // ISO 8601 date
+  winnersAnnouncedAt?: string; // ISO 8601 date
+  // Legacy fields for backward compatibility
+  judgingDate?: string; // ISO 8601 date
+  winnerAnnouncementDate?: string; // ISO 8601 date
   timezone: string;
   phases?: HackathonPhase[];
 }