diff --git a/apps/edr-passenger-api/prisma/migrations/20260608061918_make_passenger_userid_nullable/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260608061918_make_passenger_userid_nullable/migration.sql
index a9fa8190b..657479139 100644
--- a/apps/edr-passenger-api/prisma/migrations/20260608061918_make_passenger_userid_nullable/migration.sql
+++ b/apps/edr-passenger-api/prisma/migrations/20260608061918_make_passenger_userid_nullable/migration.sql
@@ -1,11 +1,11 @@
 -- DropForeignKey
-ALTER TABLE "Passenger" DROP CONSTRAINT "Passenger_userId_fkey";
+ALTER TABLE "Passenger" DROP CONSTRAINT IF EXISTS "Passenger_userId_fkey";
 
 -- AlterTable
 ALTER TABLE "Passenger" ALTER COLUMN "userId" DROP NOT NULL;
 
--- CreateTable
-CREATE TABLE "TicketSeat" (
+-- CreateTable (TicketSeat already exists from init; IF NOT EXISTS makes this idempotent)
+CREATE TABLE IF NOT EXISTS "TicketSeat" (
     "id" TEXT NOT NULL,
     "ticketId" TEXT NOT NULL,
     "seatId" TEXT NOT NULL,
@@ -15,16 +15,19 @@ CREATE TABLE "TicketSeat" (
 );
 
 -- CreateIndex
-CREATE INDEX "TicketSeat_ticketId_idx" ON "TicketSeat"("ticketId");
+CREATE INDEX IF NOT EXISTS "TicketSeat_ticketId_idx" ON "TicketSeat"("ticketId");
 
 -- CreateIndex
-CREATE INDEX "TicketSeat_seatId_idx" ON "TicketSeat"("seatId");
+CREATE INDEX IF NOT EXISTS "TicketSeat_seatId_idx" ON "TicketSeat"("seatId");
 
 -- AddForeignKey
+ALTER TABLE "Passenger" DROP CONSTRAINT IF EXISTS "Passenger_userId_fkey";
 ALTER TABLE "Passenger" ADD CONSTRAINT "Passenger_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
 
 -- AddForeignKey
+ALTER TABLE "TicketSeat" DROP CONSTRAINT IF EXISTS "TicketSeat_ticketId_fkey";
 ALTER TABLE "TicketSeat" ADD CONSTRAINT "TicketSeat_ticketId_fkey" FOREIGN KEY ("ticketId") REFERENCES "Ticket"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
+ALTER TABLE "TicketSeat" DROP CONSTRAINT IF EXISTS "TicketSeat_seatId_fkey";
 ALTER TABLE "TicketSeat" ADD CONSTRAINT "TicketSeat_seatId_fkey" FOREIGN KEY ("seatId") REFERENCES "Seat"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/apps/edr-passenger-api/prisma/migrations/20260623073543_config/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260623073543_config/migration.sql
index 7e086e649..959f74281 100644
--- a/apps/edr-passenger-api/prisma/migrations/20260623073543_config/migration.sql
+++ b/apps/edr-passenger-api/prisma/migrations/20260623073543_config/migration.sql
@@ -127,8 +127,8 @@ ALTER TABLE "TripStopTime" DROP CONSTRAINT "TripStopTime_scheduleId_fkey";
 -- DropForeignKey
 ALTER TABLE "WalletLedgerEntry" DROP CONSTRAINT "WalletLedgerEntry_walletId_fkey";
 
--- DropIndex
-DROP INDEX "Journey_bookingId_idx";
+-- DropIndex (created later in 20260627_add_journey_booking_id; IF EXISTS guards against ordering)
+DROP INDEX IF EXISTS "Journey_bookingId_idx";
 
 -- AlterTable
 ALTER TABLE "FaydaVerificationSession" ALTER COLUMN "purpose" SET DEFAULT 'VERIFY';
@@ -239,8 +239,7 @@ ALTER TABLE "SupportMessage" ADD CONSTRAINT "SupportMessage_conversationId_fkey"
 -- AddForeignKey
 ALTER TABLE "SavedRoute" ADD CONSTRAINT "SavedRoute_passengerId_fkey" FOREIGN KEY ("passengerId") REFERENCES "Passenger"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
--- AddForeignKey
-ALTER TABLE "Journey" ADD CONSTRAINT "Journey_bookingId_fkey" FOREIGN KEY ("bookingId") REFERENCES "Booking"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+-- Journey_bookingId_fkey moved to 20260627_add_journey_booking_id (column added there)
 
 -- AddForeignKey
 ALTER TABLE "JourneySegment" ADD CONSTRAINT "JourneySegment_journeyId_fkey" FOREIGN KEY ("journeyId") REFERENCES "Journey"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/apps/edr-passenger-api/prisma/migrations/20260627_add_journey_booking_id/migration.sql b/apps/edr-passenger-api/prisma/migrations/20260627_add_journey_booking_id/migration.sql
index 3f824b335..12f4a0eb7 100644
--- a/apps/edr-passenger-api/prisma/migrations/20260627_add_journey_booking_id/migration.sql
+++ b/apps/edr-passenger-api/prisma/migrations/20260627_add_journey_booking_id/migration.sql
@@ -5,6 +5,13 @@ ALTER TABLE "passenger"."Journey"
 CREATE UNIQUE INDEX IF NOT EXISTS "Journey_bookingId_key" ON "passenger"."Journey"("bookingId");
 CREATE INDEX IF NOT EXISTS "Journey_bookingId_idx" ON "passenger"."Journey"("bookingId");
 
+-- AddForeignKey (column created above; FK was misplaced in 20260623073543_config)
+ALTER TABLE "passenger"."Journey"
+  DROP CONSTRAINT IF EXISTS "Journey_bookingId_fkey";
+ALTER TABLE "passenger"."Journey"
+  ADD CONSTRAINT "Journey_bookingId_fkey"
+  FOREIGN KEY ("bookingId") REFERENCES "passenger"."Booking"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
 -- Ensure JourneySegment cascades on Journey delete
 ALTER TABLE "passenger"."JourneySegment"
   DROP CONSTRAINT IF EXISTS "JourneySegment_journeyId_fkey";