diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Confirmation/confirmation.module.css b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.module.css
similarity index 61%
rename from apps/scandic-web/components/HotelReservation/BookingConfirmation/Confirmation/confirmation.module.css
rename to apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.module.css
index e3d91663e..528a447cf 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Confirmation/confirmation.module.css
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.module.css
@@ -19,3 +19,26 @@
     padding-top: var(--Spacing-x9);
   }
 }
+
+.booking {
+  display: flex;
+  flex-direction: column;
+  gap: var(--Spacing-x5);
+  grid-area: booking;
+  padding-bottom: var(--Spacing-x9);
+}
+
+.aside {
+  display: none;
+}
+
+@media screen and (min-width: 1367px) {
+  .mobileReceipt {
+    display: none;
+  }
+
+  .aside {
+    display: grid;
+    grid-area: receipt;
+  }
+}
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.tsx
index 2e9ab9faa..0cc1b897c 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.tsx
@@ -1,14 +1,84 @@
+import { notFound } from "next/navigation"
+
 import { getBookingConfirmation } from "@/lib/trpc/memoizedRequests"
 
-import BookingConfirmation from "@/components/HotelReservation/BookingConfirmation"
+import Alerts from "@/components/HotelReservation/BookingConfirmation/Alerts"
+import Header from "@/components/HotelReservation/BookingConfirmation/Header"
+import HotelDetails from "@/components/HotelReservation/BookingConfirmation/HotelDetails"
+import PaymentDetails from "@/components/HotelReservation/BookingConfirmation/PaymentDetails"
+import Promos from "@/components/HotelReservation/BookingConfirmation/Promos"
+import Receipt from "@/components/HotelReservation/BookingConfirmation/Receipt"
+import Rooms from "@/components/HotelReservation/BookingConfirmation/Rooms"
+import Tracking from "@/components/HotelReservation/BookingConfirmation/Tracking"
+import { mapRoomState } from "@/components/HotelReservation/BookingConfirmation/utils"
+import SidePanel from "@/components/HotelReservation/SidePanel"
+import Divider from "@/components/TempDesignSystem/Divider"
+import { getIntl } from "@/i18n"
+import BookingConfirmationProvider from "@/providers/BookingConfirmationProvider"
+
+import styles from "./page.module.css"
 
 import type { LangParams, PageArgs } from "@/types/params"
 
 export default async function BookingConfirmationPage({
+  params,
   searchParams,
-}: PageArgs<LangParams, { confirmationNumber: string }>) {
-  void getBookingConfirmation(searchParams.confirmationNumber)
+}: PageArgs<LangParams, { RefId?: string }>) {
+  const refId = searchParams.RefId
+
+  if (!refId) {
+    notFound()
+  }
+
+  const bookingConfirmation = await getBookingConfirmation(refId, params.lang)
+
+  if (!bookingConfirmation) {
+    notFound()
+  }
+
+  const { booking, hotelData, room } = bookingConfirmation
+  const { hotel } = hotelData
+
+  const intl = await getIntl()
+
   return (
-    <BookingConfirmation confirmationNumber={searchParams.confirmationNumber} />
+    <BookingConfirmationProvider
+      bookingCode={booking.bookingCode}
+      currencyCode={booking.currencyCode}
+      fromDate={booking.checkInDate}
+      toDate={booking.checkOutDate}
+      rooms={[
+        mapRoomState(booking, room, intl),
+        // null represents "known but not yet fetched rooms" and is used to render placeholders correctly
+        ...Array(booking.linkedReservations.length).fill(null),
+      ]}
+      vat={booking.vatPercentage}
+    >
+      <main className={styles.main}>
+        <Header booking={booking} hotel={hotel} refId={refId} />
+        <div className={styles.booking}>
+          <Alerts booking={booking} />
+          <Rooms
+            booking={booking}
+            checkInTime={hotel.hotelFacts.checkin.checkInTime}
+            checkOutTime={hotel.hotelFacts.checkin.checkOutTime}
+            mainRoom={room}
+          />
+          <PaymentDetails />
+          <Divider color="primaryLightSubtle" />
+          <HotelDetails hotel={hotel} />
+          <Promos refId={refId} hotelId={hotel.operaId} />
+          <div className={styles.mobileReceipt}>
+            <Receipt />
+          </div>
+        </div>
+        <aside className={styles.aside}>
+          <SidePanel variant="receipt">
+            <Receipt />
+          </SidePanel>
+        </aside>
+      </main>
+      <Tracking bookingConfirmation={bookingConfirmation} />
+    </BookingConfirmationProvider>
   )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/gla-payment-callback/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/gla-payment-callback/page.tsx
index 571a44d89..951141819 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/gla-payment-callback/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/gla-payment-callback/page.tsx
@@ -6,10 +6,12 @@ import {
 } from "@/constants/booking"
 import { myStay } from "@/constants/routes/myStay"
 import { serverClient } from "@/lib/trpc/server"
+import { createCounter } from "@/server/telemetry"
 
 import GuaranteeCallback from "@/components/HotelReservation/MyStay/Ancillaries/GuaranteeCallback"
 import TrackGuarantee from "@/components/HotelReservation/MyStay/TrackGuarantee"
 import LoadingSpinner from "@/components/LoadingSpinner"
+import { setLang } from "@/i18n/serverContext"
 
 import type { LangParams, PageArgs } from "@/types/params"
 
@@ -19,45 +21,56 @@ export default async function GuaranteePaymentCallbackPage({
 }: PageArgs<
   LangParams,
   {
-    status: PaymentCallbackStatusEnum
-    RefId: string
+    status?: PaymentCallbackStatusEnum
+    RefId?: string
     confirmationNumber?: string
     ancillary?: string
   }
 >) {
-  console.log(`[gla-payment-callback] callback started`)
   const lang = params.lang
   const status = searchParams.status
-  const confirmationNumber = searchParams.confirmationNumber
   const refId = searchParams.RefId
-  if (!refId) {
-    notFound()
-  }
+  const confirmationNumber = searchParams.confirmationNumber
   const isAncillaryFlow = searchParams.ancillary
 
+  setLang(params.lang)
+
+  if (!status || !confirmationNumber || !refId) {
+    notFound()
+  }
+
+  const glaSuccessCounter = createCounter("gla", "success")
+  const metricsGlaSuccess = glaSuccessCounter.init({
+    confirmationNumber,
+  })
+
+  metricsGlaSuccess.start()
+
   const myStayUrl = `${myStay[lang]}?RefId=${encodeURIComponent(refId)}`
-  const searchObject = new URLSearchParams()
 
   if (status === PaymentCallbackStatusEnum.Success && confirmationNumber) {
     if (isAncillaryFlow) {
       return (
         <GuaranteeCallback
           returnUrl={myStayUrl}
+          refId={refId}
           confirmationNumber={confirmationNumber}
           lang={lang}
         />
       )
     }
-    console.log(`[gla-payment-callback] redirecting to: ${myStayUrl}`)
+
     return <TrackGuarantee status={status} redirectUrl={myStayUrl} />
   }
 
   let errorMessage = undefined
 
   if (confirmationNumber) {
+    const searchObject = new URLSearchParams()
+
     try {
       const bookingStatus = await serverClient().booking.status({
-        confirmationNumber,
+        refId,
       })
 
       const error = bookingStatus.errors.find((e) => e.errorCode)
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/_page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/_page.tsx
deleted file mode 100644
index 74984d9e0..000000000
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/_page.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import {
-  BOOKING_CONFIRMATION_NUMBER,
-  BookingErrorCodeEnum,
-  PaymentCallbackStatusEnum,
-} from "@/constants/booking"
-import {
-  bookingConfirmation,
-  details,
-} from "@/constants/routes/hotelReservation"
-import { serverClient } from "@/lib/trpc/server"
-
-import HandleErrorCallback from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleErrorCallback"
-import HandleSuccessCallback from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback"
-
-import type { LangParams, PageArgs } from "@/types/params"
-
-export default async function PaymentCallbackPage({
-  params,
-  searchParams,
-}: PageArgs<
-  LangParams,
-  {
-    status: PaymentCallbackStatusEnum
-    confirmationNumber?: string
-    hotel?: string
-  }
->) {
-  console.log(`[payment-callback] callback started`)
-  const lang = params.lang
-  const status = searchParams.status
-  const confirmationNumber = searchParams.confirmationNumber
-
-  if (status === PaymentCallbackStatusEnum.Success && confirmationNumber) {
-    const confirmationUrl = `${bookingConfirmation(lang)}?${BOOKING_CONFIRMATION_NUMBER}=${confirmationNumber}`
-    console.log(
-      `[payment-callback] rendering success callback with confirmation number: ${confirmationNumber}`
-    )
-
-    return (
-      <HandleSuccessCallback
-        confirmationNumber={confirmationNumber}
-        successRedirectUrl={confirmationUrl}
-      />
-    )
-  }
-
-  const returnUrl = details(lang)
-  const searchObject = new URLSearchParams()
-
-  let errorMessage = undefined
-
-  if (confirmationNumber) {
-    try {
-      const bookingStatus = await serverClient().booking.status({
-        confirmationNumber,
-      })
-
-      // TODO: how to handle errors for multiple rooms?
-      const error = bookingStatus.errors.find((e) => e.errorCode)
-
-      errorMessage =
-        error?.description ??
-        `No error message found for booking ${confirmationNumber}, status: ${status}`
-
-      searchObject.set(
-        "errorCode",
-        error
-          ? error.errorCode.toString()
-          : BookingErrorCodeEnum.TransactionFailed
-      )
-    } catch {
-      console.error(
-        `[payment-callback] failed to get booking status for ${confirmationNumber}, status: ${status}`
-      )
-      if (status === PaymentCallbackStatusEnum.Cancel) {
-        searchObject.set("errorCode", BookingErrorCodeEnum.TransactionCancelled)
-      }
-      if (status === PaymentCallbackStatusEnum.Error) {
-        searchObject.set("errorCode", BookingErrorCodeEnum.TransactionFailed)
-        errorMessage = `Failed to get booking status for ${confirmationNumber}, status: ${status}`
-      }
-    }
-  }
-
-  return (
-    <HandleErrorCallback
-      returnUrl={returnUrl.toString()}
-      searchObject={searchObject}
-      status={status}
-      errorMessage={errorMessage}
-    />
-  )
-}
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/cancel/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/cancel/page.tsx
index 7cbfd8aec..773da8fc6 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/cancel/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/cancel/page.tsx
@@ -8,7 +8,7 @@ import HandleErrorCallback from "@/components/HotelReservation/EnterDetails/Paym
 
 import type { LangParams, PageArgs } from "@/types/params"
 
-export default async function PaymentCallbackPage({
+export default async function PaymentCallbackCancelPage({
   params,
 }: PageArgs<LangParams>) {
   console.log(`[payment-callback] cancel callback started`)
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/error/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/error/page.tsx
index 425882235..3dc556d5e 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/error/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/error/page.tsx
@@ -6,10 +6,11 @@ import { details } from "@/constants/routes/hotelReservation"
 import { serverClient } from "@/lib/trpc/server"
 
 import HandleErrorCallback from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleErrorCallback"
+import { calculateRefId } from "@/utils/refId"
 
 import type { LangParams, PageArgs } from "@/types/params"
 
-export default async function PaymentCallbackPage({
+export default async function PaymentCallbackErrorPage({
   params,
   searchParams,
 }: PageArgs<
@@ -19,6 +20,7 @@ export default async function PaymentCallbackPage({
   }
 >) {
   console.log(`[payment-callback] error callback started`)
+
   const lang = params.lang
   const confirmationNumber = searchParams.confirmationNumber
 
@@ -28,9 +30,11 @@ export default async function PaymentCallbackPage({
   let errorMessage = undefined
 
   if (confirmationNumber) {
+    const refId = calculateRefId(confirmationNumber, "")
+
     try {
-      const bookingStatus = await serverClient().booking.status({
-        confirmationNumber,
+      const bookingStatus = await serverClient().booking.confirmationError({
+        refId,
       })
 
       // TODO: how to handle errors for multiple rooms?
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/success/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/success/page.tsx
index a25f2a58d..fa6185a71 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/success/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/success/page.tsx
@@ -1,33 +1,44 @@
-import { BOOKING_CONFIRMATION_NUMBER } from "@/constants/booking"
+import { notFound } from "next/navigation"
+
 import { bookingConfirmation } from "@/constants/routes/hotelReservation"
+import { createCounter } from "@/server/telemetry"
 
 import HandleSuccessCallback from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback"
+import { setLang } from "@/i18n/serverContext"
+import { calculateRefId } from "@/utils/refId"
 
 import type { LangParams, PageArgs } from "@/types/params"
 
-export default async function PaymentCallbackPage({
+export default async function PaymentCallbackSuccessPage({
   params,
   searchParams,
 }: PageArgs<
   LangParams,
   {
-    confirmationNumber: string
+    confirmationNumber?: string
   }
 >) {
-  console.log(`[payment-callback] success callback started`)
-  const lang = params.lang
-
   const confirmationNumber = searchParams.confirmationNumber
 
-  const confirmationUrl = `${bookingConfirmation(lang)}?${BOOKING_CONFIRMATION_NUMBER}=${confirmationNumber}`
-  console.log(
-    `[payment-callback] rendering success callback with confirmation number: ${confirmationNumber}`
-  )
+  setLang(params.lang)
+
+  if (!confirmationNumber) {
+    notFound()
+  }
+
+  const paymentSuccessCounter = createCounter("payment", "success")
+  const metricsPaymentSuccess = paymentSuccessCounter.init({
+    confirmationNumber,
+  })
+
+  metricsPaymentSuccess.start()
+
+  const refId = calculateRefId(confirmationNumber, "")
 
   return (
     <HandleSuccessCallback
-      confirmationNumber={confirmationNumber}
-      successRedirectUrl={confirmationUrl}
+      refId={refId}
+      successRedirectUrl={bookingConfirmation(params.lang)}
     />
   )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/my-stay/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/my-stay/page.tsx
index 3308028c0..06574a7c2 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/my-stay/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/my-stay/page.tsx
@@ -13,7 +13,6 @@ import {
   getProfileSafely,
   getSavedPaymentCardsSafely,
 } from "@/lib/trpc/memoizedRequests"
-import { decrypt } from "@/server/routers/utils/encryption"
 
 import AdditionalInfoForm from "@/components/HotelReservation/FindMyBooking/AdditionalInfoForm"
 import accessBooking, {
@@ -32,6 +31,7 @@ import Image from "@/components/Image"
 import { getIntl } from "@/i18n"
 import { setLang } from "@/i18n/serverContext"
 import MyStayProvider from "@/providers/MyStay"
+import { parseRefId } from "@/utils/refId"
 import { getCurrentWebUrl } from "@/utils/url"
 
 import styles from "./page.module.css"
@@ -44,29 +44,26 @@ export default async function MyStay({
   searchParams,
 }: PageArgs<LangParams, { RefId?: string }>) {
   setLang(params.lang)
+
   const refId = searchParams.RefId
 
   if (!refId) {
     notFound()
   }
 
-  const value = decrypt(refId)
-  if (!value) {
-    return notFound()
-  }
-
-  const [confirmationNumber, lastName] = value.split(",")
-  const bookingConfirmation = await getBookingConfirmation(confirmationNumber)
+  const bookingConfirmation = await getBookingConfirmation(refId, params.lang)
   if (!bookingConfirmation) {
     return notFound()
   }
 
-  const { additionalData, booking, hotel, roomCategories } = bookingConfirmation
+  const { booking, hotelData } = bookingConfirmation
+  const { hotel } = hotelData
 
   const user = await getProfileSafely()
   const bv = cookies().get("bv")?.value
   const intl = await getIntl()
 
+  const { lastName } = parseRefId(refId)
   const access = accessBooking(booking.guest, lastName, user, bv)
 
   if (access === ACCESS_GRANTED) {
@@ -74,9 +71,7 @@ export default async function MyStay({
     const fromDate = dt(booking.checkInDate).format("YYYY-MM-DD")
     const toDate = dt(booking.checkOutDate).format("YYYY-MM-DD")
 
-    const linkedReservationsPromise = getLinkedReservations({
-      rooms: booking.linkedReservations,
-    })
+    const linkedReservationsPromise = getLinkedReservations(refId, params.lang)
 
     const packagesInput = {
       adults: booking.adults,
@@ -121,7 +116,7 @@ export default async function MyStay({
 
     const imageSrc =
       hotel.hotelContent.images.imageSizes.large ??
-      additionalData.gallery?.heroImages[0]?.imageSizes.large ??
+      hotelData.additionalData.gallery?.heroImages[0]?.imageSizes.large ??
       hotel.galleryImages[0]?.imageSizes.large
 
     const baseUrl = env.PUBLIC_URL || "https://www.scandichotels.com"
@@ -138,7 +133,7 @@ export default async function MyStay({
         lang={params.lang}
         linkedReservationsPromise={linkedReservationsPromise}
         refId={refId}
-        roomCategories={roomCategories}
+        roomCategories={hotelData.roomCategories}
         savedCreditCards={savedCreditCards}
       >
         <main className={styles.main}>
@@ -197,10 +192,7 @@ export default async function MyStay({
     return (
       <main className={styles.main}>
         <div className={styles.form}>
-          <AdditionalInfoForm
-            confirmationNumber={confirmationNumber}
-            lastName={lastName}
-          />
+          <AdditionalInfoForm refId={refId} lastName={lastName} />
         </div>
       </main>
     )
diff --git a/apps/scandic-web/app/[lang]/(no-layout)/hotelreservation/my-stay/receipt/loading.tsx b/apps/scandic-web/app/[lang]/(no-layout)/hotelreservation/my-stay/receipt/loading.tsx
new file mode 100644
index 000000000..4b9d47ee6
--- /dev/null
+++ b/apps/scandic-web/app/[lang]/(no-layout)/hotelreservation/my-stay/receipt/loading.tsx
@@ -0,0 +1 @@
+export { MyStaySkeleton } from "@/components/HotelReservation/MyStay/myStaySkeleton"
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Receipt/receipt.module.css b/apps/scandic-web/app/[lang]/(no-layout)/hotelreservation/my-stay/receipt/page.module.css
similarity index 100%
rename from apps/scandic-web/components/HotelReservation/MyStay/Receipt/receipt.module.css
rename to apps/scandic-web/app/[lang]/(no-layout)/hotelreservation/my-stay/receipt/page.module.css
diff --git a/apps/scandic-web/app/[lang]/(no-layout)/hotelreservation/my-stay/receipt/page.tsx b/apps/scandic-web/app/[lang]/(no-layout)/hotelreservation/my-stay/receipt/page.tsx
index a5a66c0e0..5c6890136 100644
--- a/apps/scandic-web/app/[lang]/(no-layout)/hotelreservation/my-stay/receipt/page.tsx
+++ b/apps/scandic-web/app/[lang]/(no-layout)/hotelreservation/my-stay/receipt/page.tsx
@@ -1,20 +1,177 @@
+import { cookies } from "next/headers"
 import { notFound } from "next/navigation"
-import { Suspense } from "react"
 
-import { MyStaySkeleton } from "@/components/HotelReservation/MyStay/myStaySkeleton"
-import { Receipt } from "@/components/HotelReservation/MyStay/Receipt"
+import ScandicLogoIcon from "@scandic-hotels/design-system/Icons/ScandicLogoIcon"
+import { Typography } from "@scandic-hotels/design-system/Typography"
 
+import { dt } from "@/lib/dt"
+import {
+  getAncillaryPackages,
+  getBookingConfirmation,
+  getProfileSafely,
+} from "@/lib/trpc/memoizedRequests"
+
+import AdditionalInfoForm from "@/components/HotelReservation/FindMyBooking/AdditionalInfoForm"
+import accessBooking, {
+  ACCESS_GRANTED,
+  ERROR_BAD_REQUEST,
+  ERROR_UNAUTHORIZED,
+} from "@/components/HotelReservation/MyStay/accessBooking"
+import Footer from "@/components/HotelReservation/MyStay/Receipt/Footer"
+import Specification from "@/components/HotelReservation/MyStay/Receipt/Specification"
+import Total from "@/components/HotelReservation/MyStay/Receipt/Total"
+import { getIntl } from "@/i18n"
+import { parseRefId } from "@/utils/refId"
+
+import styles from "./page.module.css"
+
+import { CurrencyEnum } from "@/types/enums/currency"
 import type { LangParams, PageArgs } from "@/types/params"
 
 export default async function ReceiptPage({
+  params,
   searchParams,
 }: PageArgs<LangParams, { RefId?: string }>) {
-  if (!searchParams.RefId) {
+  const refId = searchParams.RefId
+
+  if (!refId) {
     notFound()
   }
-  return (
-    <Suspense fallback={<MyStaySkeleton />}>
-      <Receipt refId={searchParams.RefId} />
-    </Suspense>
+
+  const { confirmationNumber, lastName } = parseRefId(refId)
+
+  const bookingConfirmation = await getBookingConfirmation(
+    confirmationNumber,
+    params.lang
   )
+
+  if (!bookingConfirmation) {
+    return notFound()
+  }
+
+  const { booking, hotelData, room } = bookingConfirmation
+  const { hotel } = hotelData
+
+  const intl = await getIntl()
+  const user = await getProfileSafely()
+  const bv = cookies().get("bv")?.value
+
+  const access = accessBooking(booking.guest, lastName, user, bv)
+
+  if (access === ACCESS_GRANTED) {
+    const ancillaryPackages = await getAncillaryPackages({
+      fromDate: dt(booking.checkInDate).format("YYYY-MM-DD"),
+      hotelId: hotel.operaId,
+      toDate: dt(booking.checkOutDate).format("YYYY-MM-DD"),
+    })
+
+    const currency =
+      booking.currencyCode !== CurrencyEnum.POINTS
+        ? booking.currencyCode
+        : (booking.ancillaries.find((a) => a.currency !== CurrencyEnum.POINTS)
+            ?.currency ??
+          booking.packages.find((p) => p.currency !== CurrencyEnum.POINTS)
+            ?.currency)
+
+    return (
+      <main className={styles.main}>
+        <div>
+          <ScandicLogoIcon width="89px" height="19px" color="Icon/Accent" />
+          <div className={styles.addresses}>
+            <div>
+              <Typography variant="Body/Supporting text (caption)/smRegular">
+                <div>{hotel.name}</div>
+              </Typography>
+              <Typography variant="Body/Supporting text (caption)/smRegular">
+                <div>
+                  {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
+                  {`${hotel.address.streetAddress}, ${hotel.address.zipCode} ${hotel.address.city}`}
+                </div>
+              </Typography>
+              <Typography variant="Body/Supporting text (caption)/smRegular">
+                <div className={`${styles.tertiary} ${styles.addressMargin}`}>
+                  {hotel.contactInformation.email}
+                </div>
+              </Typography>
+              <Typography variant="Body/Supporting text (caption)/smRegular">
+                <div className={styles.tertiary}>
+                  {hotel.contactInformation.phoneNumber}
+                </div>
+              </Typography>
+            </div>
+            <div className={styles.rightColumn}>
+              <Typography variant="Body/Supporting text (caption)/smRegular">
+                {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
+                <div>{`${booking.guest.firstName} ${booking.guest.lastName}`}</div>
+              </Typography>
+              {booking.guest.membershipNumber && (
+                <Typography variant="Body/Supporting text (caption)/smRegular">
+                  {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
+                  <div>{`${intl.formatMessage({
+                    defaultMessage: "Member",
+                  })} ${booking.guest.membershipNumber}`}</div>
+                </Typography>
+              )}
+              <Typography variant="Body/Supporting text (caption)/smRegular">
+                <div className={`${styles.tertiary} ${styles.addressMargin}`}>
+                  {booking.guest.email}
+                </div>
+              </Typography>
+              <Typography variant="Body/Supporting text (caption)/smRegular">
+                <div className={styles.tertiary}>
+                  {booking.guest.phoneNumber}
+                </div>
+              </Typography>
+            </div>
+          </div>
+        </div>
+        <Total booking={booking} currency={currency} />
+        <Specification
+          ancillaryPackages={ancillaryPackages}
+          booking={booking}
+          currency={currency}
+        />
+
+        <hr className={styles.divider} />
+
+        <Footer booking={booking} room={room} />
+      </main>
+    )
+  }
+
+  if (access === ERROR_BAD_REQUEST) {
+    return (
+      <main className={styles.main}>
+        <div className={styles.form}>
+          <AdditionalInfoForm refId={refId} lastName={lastName} />
+        </div>
+      </main>
+    )
+  }
+
+  if (access === ERROR_UNAUTHORIZED) {
+    return (
+      <main className={styles.main}>
+        <div className={styles.logIn}>
+          <Typography variant="Title/md">
+            <h1>
+              {intl.formatMessage({
+                defaultMessage: "You need to be logged in to view your booking",
+              })}
+            </h1>
+          </Typography>
+          <Typography variant="Body/Lead text">
+            <p>
+              {intl.formatMessage({
+                defaultMessage:
+                  "And you need to be logged in with the same member account that made the booking.",
+              })}
+            </p>
+          </Typography>
+        </div>
+      </main>
+    )
+  }
+
+  return notFound()
 }
diff --git a/apps/scandic-web/app/[lang]/webview/hotelreservation/my-stay/page.tsx b/apps/scandic-web/app/[lang]/webview/hotelreservation/my-stay/page.tsx
index e083c1cde..06574a7c2 100644
--- a/apps/scandic-web/app/[lang]/webview/hotelreservation/my-stay/page.tsx
+++ b/apps/scandic-web/app/[lang]/webview/hotelreservation/my-stay/page.tsx
@@ -13,7 +13,6 @@ import {
   getProfileSafely,
   getSavedPaymentCardsSafely,
 } from "@/lib/trpc/memoizedRequests"
-import { decrypt } from "@/server/routers/utils/encryption"
 
 import AdditionalInfoForm from "@/components/HotelReservation/FindMyBooking/AdditionalInfoForm"
 import accessBooking, {
@@ -32,6 +31,7 @@ import Image from "@/components/Image"
 import { getIntl } from "@/i18n"
 import { setLang } from "@/i18n/serverContext"
 import MyStayProvider from "@/providers/MyStay"
+import { parseRefId } from "@/utils/refId"
 import { getCurrentWebUrl } from "@/utils/url"
 
 import styles from "./page.module.css"
@@ -44,29 +44,26 @@ export default async function MyStay({
   searchParams,
 }: PageArgs<LangParams, { RefId?: string }>) {
   setLang(params.lang)
+
   const refId = searchParams.RefId
 
   if (!refId) {
     notFound()
   }
 
-  const value = decrypt(refId)
-  if (!value) {
-    return notFound()
-  }
-
-  const [confirmationNumber, lastName] = value.split(",")
-  const bookingConfirmation = await getBookingConfirmation(confirmationNumber)
+  const bookingConfirmation = await getBookingConfirmation(refId, params.lang)
   if (!bookingConfirmation) {
     return notFound()
   }
 
-  const { additionalData, booking, hotel, roomCategories } = bookingConfirmation
+  const { booking, hotelData } = bookingConfirmation
+  const { hotel } = hotelData
 
   const user = await getProfileSafely()
   const bv = cookies().get("bv")?.value
   const intl = await getIntl()
 
+  const { lastName } = parseRefId(refId)
   const access = accessBooking(booking.guest, lastName, user, bv)
 
   if (access === ACCESS_GRANTED) {
@@ -74,9 +71,7 @@ export default async function MyStay({
     const fromDate = dt(booking.checkInDate).format("YYYY-MM-DD")
     const toDate = dt(booking.checkOutDate).format("YYYY-MM-DD")
 
-    const linkedReservationsPromise = getLinkedReservations({
-      rooms: booking.linkedReservations,
-    })
+    const linkedReservationsPromise = getLinkedReservations(refId, params.lang)
 
     const packagesInput = {
       adults: booking.adults,
@@ -98,9 +93,9 @@ export default async function MyStay({
       (pkg) => pkg.code === BreakfastPackageEnum.REGULAR_BREAKFAST
     )
     const breakfastIncluded = booking.rateDefinition.breakfastIncluded
-    const alreadyHasABreakfastSelection =
+    const shouldFetchBreakfastPackages =
       !hasBreakfastPackage && !breakfastIncluded
-    if (alreadyHasABreakfastSelection) {
+    if (shouldFetchBreakfastPackages) {
       void getPackages(packagesInput)
     }
     void getSavedPaymentCardsSafely(savedPaymentCardsInput)
@@ -112,7 +107,7 @@ export default async function MyStay({
     })
 
     let breakfastPackages = null
-    if (alreadyHasABreakfastSelection) {
+    if (shouldFetchBreakfastPackages) {
       breakfastPackages = await getPackages(packagesInput)
     }
     const savedCreditCards = await getSavedPaymentCardsSafely(
@@ -121,7 +116,7 @@ export default async function MyStay({
 
     const imageSrc =
       hotel.hotelContent.images.imageSizes.large ??
-      additionalData.gallery?.heroImages[0]?.imageSizes.large ??
+      hotelData.additionalData.gallery?.heroImages[0]?.imageSizes.large ??
       hotel.galleryImages[0]?.imageSizes.large
 
     const baseUrl = env.PUBLIC_URL || "https://www.scandichotels.com"
@@ -138,7 +133,7 @@ export default async function MyStay({
         lang={params.lang}
         linkedReservationsPromise={linkedReservationsPromise}
         refId={refId}
-        roomCategories={roomCategories}
+        roomCategories={hotelData.roomCategories}
         savedCreditCards={savedCreditCards}
       >
         <main className={styles.main}>
@@ -197,10 +192,7 @@ export default async function MyStay({
     return (
       <main className={styles.main}>
         <div className={styles.form}>
-          <AdditionalInfoForm
-            confirmationNumber={confirmationNumber}
-            lastName={lastName}
-          />
+          <AdditionalInfoForm refId={refId} lastName={lastName} />
         </div>
       </main>
     )
diff --git a/apps/scandic-web/components/HotelReservation/AddToCalendar/index.tsx b/apps/scandic-web/components/HotelReservation/AddToCalendar/index.tsx
index 4830d7543..be8849787 100644
--- a/apps/scandic-web/components/HotelReservation/AddToCalendar/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/AddToCalendar/index.tsx
@@ -1,4 +1,5 @@
 "use client"
+
 import { createEvent } from "ics"
 import { useIntl } from "react-intl"
 
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Confirmation/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Confirmation/index.tsx
deleted file mode 100644
index 88b99038c..000000000
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Confirmation/index.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-"use client"
-import { useRef } from "react"
-
-import Header from "@/components/HotelReservation/BookingConfirmation/Header"
-
-import styles from "./confirmation.module.css"
-
-import type { ConfirmationProps } from "@/types/components/hotelReservation/bookingConfirmation/bookingConfirmation"
-
-export default function Confirmation({
-  booking,
-  hotel,
-  children,
-  refId,
-}: React.PropsWithChildren<ConfirmationProps>) {
-  const mainRef = useRef<HTMLElement | null>(null)
-
-  return (
-    <main className={styles.main} ref={mainRef}>
-      <Header booking={booking} hotel={hotel} mainRef={mainRef} refId={refId} />
-      {children}
-    </main>
-  )
-}
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/Actions/ManageBooking.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/Actions/ManageBooking.tsx
index 28a81406d..ef49a8988 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/Actions/ManageBooking.tsx
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/Actions/ManageBooking.tsx
@@ -1,15 +1,22 @@
 "use client"
+
 import { useIntl } from "react-intl"
 
 import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
 
+import { myStay } from "@/constants/routes/myStay"
+
 import Button from "@/components/TempDesignSystem/Button"
 import Link from "@/components/TempDesignSystem/Link"
+import useLang from "@/hooks/useLang"
 
 import type { ManageBookingProps } from "@/types/components/hotelReservation/bookingConfirmation/actions/manageBooking"
 
-export default function ManageBooking({ bookingUrl }: ManageBookingProps) {
+export default function ManageBooking({ refId }: ManageBookingProps) {
   const intl = useIntl()
+  const lang = useLang()
+
+  const bookingUrl = `${myStay[lang]}?RefId=${refId}`
 
   return (
     <Button
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/index.tsx
index 48e6751cf..fd9692704 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/index.tsx
@@ -1,15 +1,11 @@
 "use client"
 import { useIntl } from "react-intl"
 
-import { myStay } from "@/constants/routes/myStay"
-
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Title from "@/components/TempDesignSystem/Text/Title"
-import useLang from "@/hooks/useLang"
 
 import AddToCalendar from "../../AddToCalendar"
 import AddToCalendarButton from "./Actions/AddToCalendarButton"
-// import DownloadInvoice from "./Actions/DownloadInvoice"
 import { generateDateTime } from "./Actions/helpers"
 import ManageBooking from "./Actions/ManageBooking"
 
@@ -22,11 +18,9 @@ import type { BookingConfirmationHeaderProps } from "@/types/components/hotelRes
 export default function Header({
   booking,
   hotel,
-  // mainRef,
   refId,
 }: BookingConfirmationHeaderProps) {
   const intl = useIntl()
-  const lang = useLang()
 
   const text = intl.formatMessage({
     defaultMessage:
@@ -52,8 +46,6 @@ export default function Header({
     url: hotel.contactInformation.websiteUrl,
   }
 
-  const bookingUrlPath = `${myStay[lang]}?RefId=${refId}`
-
   return (
     <header className={styles.header}>
       <hgroup className={styles.hgroup}>
@@ -74,9 +66,7 @@ export default function Header({
           hotelName={hotel.name}
           renderButton={(onPress) => <AddToCalendarButton onPress={onPress} />}
         />
-        <ManageBooking bookingUrl={bookingUrlPath} />
-        {/* Download Invoice will be added later (currently available on My Stay) */}
-        {/* <DownloadInvoice mainRef={mainRef} /> */}
+        <ManageBooking refId={refId} />
       </div>
     </header>
   )
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Promos/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Promos/index.tsx
index c35b08676..f32191901 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Promos/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Promos/index.tsx
@@ -1,9 +1,8 @@
 "use client"
+
 import { useIntl } from "react-intl"
 
-import { homeHrefs } from "@/constants/homeHrefs"
-import { myBooking } from "@/constants/myBooking"
-import { env } from "@/env/client"
+import { myStay } from "@/constants/routes/myStay"
 
 import useLang from "@/hooks/useLang"
 
@@ -13,22 +12,17 @@ import styles from "./promos.module.css"
 
 import type { PromosProps } from "@/types/components/hotelReservation/bookingConfirmation/promos"
 
-export default function Promos({
-  confirmationNumber,
-  hotelId,
-  lastName,
-}: PromosProps) {
+export default function Promos({ refId, hotelId }: PromosProps) {
   const intl = useIntl()
   const lang = useLang()
-  const homeUrl = homeHrefs[env.NEXT_PUBLIC_NODE_ENV][lang]
-  const myBookingUrl = myBooking[env.NEXT_PUBLIC_NODE_ENV][lang]
+
   return (
     <div className={styles.promos}>
       <Promo
         buttonText={intl.formatMessage({
           defaultMessage: "View and buy add-ons",
         })}
-        href={`${myBookingUrl}?bookingId=${confirmationNumber}&lastName=${lastName}`}
+        href={`${myStay[lang]}?RefId=${refId}`}
         text={intl.formatMessage({
           defaultMessage:
             "Discover the little extra touches to make your upcoming stay even more unforgettable.",
@@ -41,7 +35,7 @@ export default function Promos({
         buttonText={intl.formatMessage({
           defaultMessage: "Book another stay",
         })}
-        href={`${homeUrl}?hotel=${hotelId}`}
+        href={`/${lang}?hotel=${hotelId}`}
         text={intl.formatMessage({
           defaultMessage:
             "Get inspired and start dreaming beyond your next trip. Explore more Scandic destinations.",
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/LinkedReservation/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/LinkedReservation/index.tsx
index 40e6e2104..b96b1829a 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/LinkedReservation/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/LinkedReservation/index.tsx
@@ -20,14 +20,16 @@ import { CurrencyEnum } from "@/types/enums/currency"
 export function LinkedReservation({
   checkInTime,
   checkOutTime,
-  confirmationNumber,
+  refId,
   roomIndex,
 }: LinkedReservationProps) {
   const lang = useLang()
-  const { data, refetch, isLoading } = trpc.booking.get.useQuery({
-    confirmationNumber,
+
+  const { data, refetch, isLoading } = trpc.booking.confirmation.useQuery({
+    refId,
     lang,
   })
+
   const {
     setRoom,
     setFormattedTotalCost,
@@ -41,6 +43,7 @@ export function LinkedReservation({
     totalBookingPrice: state.totalBookingPrice,
     totalBookingCheques: state.totalBookingCheques,
   }))
+
   const intl = useIntl()
 
   useEffect(() => {
@@ -78,7 +81,9 @@ export function LinkedReservation({
   if (!data?.room) {
     return <Retry handleRefetch={refetch} />
   }
+
   const { booking, room } = data
+
   return (
     <Room
       checkInDate={booking.checkInDate}
@@ -86,8 +91,8 @@ export function LinkedReservation({
       checkInTime={checkInTime}
       checkOutTime={checkOutTime}
       confirmationNumber={booking.confirmationNumber}
-      guest={booking.guest}
       guaranteeInfo={booking.guaranteeInfo}
+      guest={booking.guest}
       img={room.images[0]}
       rateDefinition={booking.rateDefinition}
       roomName={room.name}
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
index 991d62212..096fe370e 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
@@ -9,30 +9,35 @@ import styles from "./rooms.module.css"
 
 import type { BookingConfirmationRoomsProps } from "@/types/components/hotelReservation/bookingConfirmation/rooms"
 
+async function RoomTitle({ nr }: { nr: number }) {
+  const intl = await getIntl()
+
+  return (
+    <Typography variant="Title/Subtitle/md">
+      <h2 className={styles.roomTitle}>
+        {intl.formatMessage(
+          {
+            defaultMessage: "Room {roomIndex}",
+          },
+          { roomIndex: nr }
+        )}
+      </h2>
+    </Typography>
+  )
+}
+
 export default async function Rooms({
   booking,
   checkInTime,
   checkOutTime,
   mainRoom,
-  linkedReservations,
 }: BookingConfirmationRoomsProps) {
-  const intl = await getIntl()
+  const { linkedReservations } = booking
 
   return (
     <section className={styles.rooms}>
       <div className={styles.room}>
-        {linkedReservations.length ? (
-          <Typography variant="Title/Subtitle/md">
-            <h2 className={styles.roomTitle}>
-              {intl.formatMessage(
-                {
-                  defaultMessage: "Room {roomIndex}",
-                },
-                { roomIndex: 1 }
-              )}
-            </h2>
-          </Typography>
-        ) : null}
+        {linkedReservations.length ? <RoomTitle nr={1} /> : null}
         <Room
           checkInDate={booking.checkInDate}
           checkOutDate={booking.checkOutDate}
@@ -49,20 +54,11 @@ export default async function Rooms({
 
       {linkedReservations.map((reservation, idx) => (
         <div className={styles.room} key={reservation.confirmationNumber}>
-          <Typography variant="Title/Subtitle/md">
-            <h2 className={styles.roomTitle}>
-              {intl.formatMessage(
-                {
-                  defaultMessage: "Room {roomIndex}",
-                },
-                { roomIndex: idx + 2 }
-              )}
-            </h2>
-          </Typography>
+          <RoomTitle nr={idx + 2} />
           <LinkedReservation
             checkInTime={checkInTime}
             checkOutTime={checkOutTime}
-            confirmationNumber={reservation.confirmationNumber}
+            refId={reservation.refId}
             roomIndex={idx + 1}
           />
         </div>
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/index.tsx
index da10c4dd5..46a358d46 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/index.tsx
@@ -27,7 +27,7 @@ export default function Tracking({
     getTracking(
       lang,
       bookingConfirmation.booking,
-      bookingConfirmation.hotel,
+      bookingConfirmation.hotelData.hotel,
       rooms
     )
 
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/tracking.ts b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/tracking.ts
index 665eeb9c8..940eb0974 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/tracking.ts
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Tracking/tracking.ts
@@ -67,7 +67,7 @@ function mapAncillaryPackage(
 export function getTracking(
   lang: Lang,
   booking: BookingConfirmation["booking"],
-  hotel: BookingConfirmation["hotel"],
+  hotel: BookingConfirmation["hotelData"]["hotel"],
   rooms: Room[]
 ) {
   const arrivalDate = new Date(booking.checkInDate)
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/bookingConfirmation.module.css b/apps/scandic-web/components/HotelReservation/BookingConfirmation/bookingConfirmation.module.css
deleted file mode 100644
index f7555e753..000000000
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/bookingConfirmation.module.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.booking {
-  display: flex;
-  flex-direction: column;
-  gap: var(--Spacing-x5);
-  grid-area: booking;
-  padding-bottom: var(--Spacing-x9);
-}
-
-.aside {
-  display: none;
-}
-
-@media screen and (min-width: 1367px) {
-  .mobileReceipt {
-    display: none;
-  }
-
-  .aside {
-    display: grid;
-    grid-area: receipt;
-  }
-}
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/index.tsx
deleted file mode 100644
index 8be66fd31..000000000
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/index.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { notFound } from "next/navigation"
-
-import { getBookingConfirmation } from "@/lib/trpc/memoizedRequests"
-
-import HotelDetails from "@/components/HotelReservation/BookingConfirmation/HotelDetails"
-import PaymentDetails from "@/components/HotelReservation/BookingConfirmation/PaymentDetails"
-import Promos from "@/components/HotelReservation/BookingConfirmation/Promos"
-import Receipt from "@/components/HotelReservation/BookingConfirmation/Receipt"
-import Rooms from "@/components/HotelReservation/BookingConfirmation/Rooms"
-import SidePanel from "@/components/HotelReservation/SidePanel"
-import Divider from "@/components/TempDesignSystem/Divider"
-import { getIntl } from "@/i18n"
-import BookingConfirmationProvider from "@/providers/BookingConfirmationProvider"
-import { encrypt } from "@/utils/encryption"
-
-import Alerts from "./Alerts"
-import Confirmation from "./Confirmation"
-import Tracking from "./Tracking"
-import { mapRoomState } from "./utils"
-
-import styles from "./bookingConfirmation.module.css"
-
-import type { BookingConfirmationProps } from "@/types/components/hotelReservation/bookingConfirmation/bookingConfirmation"
-
-export default async function BookingConfirmation({
-  confirmationNumber,
-}: BookingConfirmationProps) {
-  const bookingConfirmation = await getBookingConfirmation(confirmationNumber)
-
-  if (!bookingConfirmation) {
-    return notFound()
-  }
-  const { booking, hotel, room } = bookingConfirmation
-  if (!room) {
-    return notFound()
-  }
-
-  const refId = encrypt(
-    `${booking.confirmationNumber},${booking.guest.lastName}`
-  )
-
-  const intl = await getIntl()
-  return (
-    <BookingConfirmationProvider
-      bookingCode={booking.bookingCode}
-      currencyCode={booking.currencyCode}
-      fromDate={booking.checkInDate}
-      toDate={booking.checkOutDate}
-      rooms={[
-        mapRoomState(booking, room, intl),
-        // null represents "known but not yet fetched rooms" and is used to render placeholders correctly
-        ...Array(booking.linkedReservations.length).fill(null),
-      ]}
-      vat={booking.vatPercentage}
-    >
-      <Confirmation booking={booking} hotel={hotel} room={room} refId={refId}>
-        <div className={styles.booking}>
-          <Alerts booking={booking} />
-          <Rooms
-            booking={booking}
-            checkInTime={hotel.hotelFacts.checkin.checkInTime}
-            checkOutTime={hotel.hotelFacts.checkin.checkOutTime}
-            mainRoom={room}
-            linkedReservations={booking.linkedReservations}
-          />
-          <PaymentDetails />
-          <Divider color="primaryLightSubtle" />
-          <HotelDetails hotel={hotel} />
-          <Promos refId={refId} hotelId={hotel.operaId} />
-          <div className={styles.mobileReceipt}>
-            <Receipt />
-          </div>
-        </div>
-        <aside className={styles.aside}>
-          <SidePanel variant="receipt">
-            <Receipt />
-          </SidePanel>
-        </aside>
-      </Confirmation>
-      <Tracking bookingConfirmation={bookingConfirmation} />
-    </BookingConfirmationProvider>
-  )
-}
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/utils.ts b/apps/scandic-web/components/HotelReservation/BookingConfirmation/utils.ts
index 2e8428983..a34223227 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/utils.ts
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/utils.ts
@@ -5,10 +5,10 @@ import type { IntlShape } from "react-intl"
 import type { BookingConfirmationRoom } from "@/types/components/hotelReservation/bookingConfirmation/bookingConfirmation"
 import { BreakfastPackageEnum } from "@/types/enums/breakfast"
 import { CurrencyEnum } from "@/types/enums/currency"
-import type { BookingConfirmationSchema } from "@/types/trpc/routers/booking/confirmation"
+import type { BookingSchema } from "@/types/trpc/routers/booking/confirmation"
 
 export function mapRoomState(
-  booking: BookingConfirmationSchema,
+  booking: BookingSchema,
   room: BookingConfirmationRoom,
   intl: IntlShape
 ) {
diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback.tsx
index 20445bb6e..0d34fac40 100644
--- a/apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback.tsx
+++ b/apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback.tsx
@@ -18,12 +18,12 @@ const validBookingStatuses = [
 ]
 
 interface HandleStatusPollingProps {
-  confirmationNumber: string
+  refId: string
   successRedirectUrl: string
 }
 
 export default function HandleSuccessCallback({
-  confirmationNumber,
+  refId,
   successRedirectUrl,
 }: HandleStatusPollingProps) {
   const router = useRouter()
@@ -33,7 +33,7 @@ export default function HandleSuccessCallback({
     error,
     isTimeout,
   } = useHandleBookingStatus({
-    confirmationNumber,
+    refId,
     expectedStatuses: validBookingStatuses,
     maxRetries: 10,
     retryInterval: 2000,
@@ -70,9 +70,9 @@ export default function HandleSuccessCallback({
         ? `&errorCode=${membershipFailedError.errorCode}`
         : ""
 
-      router.replace(`${successRedirectUrl}${errorParam}`)
+      router.replace(`${successRedirectUrl}?RefId=${refId}${errorParam}`)
     }
-  }, [bookingStatus, successRedirectUrl, router])
+  }, [bookingStatus, refId, router, successRedirectUrl])
 
   if (isTimeout || error) {
     return <TimeoutSpinner />
diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx
index 8b8d3dea7..1b5938e1b 100644
--- a/apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx
+++ b/apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx
@@ -2,7 +2,7 @@
 
 import { zodResolver } from "@hookform/resolvers/zod"
 import { usePathname, useRouter, useSearchParams } from "next/navigation"
-import { useCallback, useEffect, useState } from "react"
+import { useCallback, useEffect, useRef, useState } from "react"
 import { Label } from "react-aria-components"
 import { FormProvider, useForm } from "react-hook-form"
 import { useIntl } from "react-intl"
@@ -10,7 +10,6 @@ import { useIntl } from "react-intl"
 import { Typography } from "@scandic-hotels/design-system/Typography"
 
 import {
-  BOOKING_CONFIRMATION_NUMBER,
   BookingStatusEnum,
   PAYMENT_METHOD_TITLES,
   PaymentMethodEnum,
@@ -30,7 +29,6 @@ import Button from "@/components/TempDesignSystem/Button"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import { useAvailablePaymentOptions } from "@/hooks/booking/useAvailablePaymentOptions"
-import { useHandleBookingStatus } from "@/hooks/booking/useHandleBookingStatus"
 import useLang from "@/hooks/useLang"
 import useStickyPosition from "@/hooks/useStickyPosition"
 import { trackPaymentEvent } from "@/utils/tracking"
@@ -101,7 +99,7 @@ export default function PaymentClient({
     (state) => state.actions.setIsSubmittingDisabled
   )
 
-  const [bookingNumber, setBookingNumber] = useState<string>("")
+  const [refId, setRefId] = useState<string>("")
   const [isPollingForBookingStatus, setIsPollingForBookingStatus] =
     useState(false)
 
@@ -146,13 +144,14 @@ export default function PaymentClient({
           return
         }
 
+        const mainRoom = result.rooms[0]
         if (result.reservationStatus == BookingStatusEnum.BookingCompleted) {
-          const confirmationUrl = `${bookingConfirmation(lang)}?${BOOKING_CONFIRMATION_NUMBER}=${result.id}`
+          const confirmationUrl = `${bookingConfirmation(lang)}?RefId=${mainRoom.refId}`
           router.push(confirmationUrl)
           return
         }
 
-        setBookingNumber(result.id)
+        setRefId(mainRoom.refId)
 
         const hasPriceChange = result.rooms.some((r) => r.priceChangedMetadata)
         if (hasPriceChange) {
@@ -174,8 +173,8 @@ export default function PaymentClient({
   })
 
   const priceChange = trpc.booking.priceChange.useMutation({
-    onSuccess: (result) => {
-      if (result?.id) {
+    onSuccess: (confirmationNumber) => {
+      if (confirmationNumber) {
         setIsPollingForBookingStatus(true)
       } else {
         handlePaymentError("No confirmation number")
@@ -189,13 +188,39 @@ export default function PaymentClient({
     },
   })
 
-  const bookingStatus = useHandleBookingStatus({
-    confirmationNumber: bookingNumber,
-    expectedStatuses: [BookingStatusEnum.BookingCompleted],
-    maxRetries,
-    retryInterval,
-    enabled: isPollingForBookingStatus,
-  })
+  // Replaced useHandleBookingStatus with logic specifically used here, since the hook would need
+  // to handle different parameters based on use case
+  const retries = useRef(0)
+
+  const bookingStatus = trpc.booking.confirmationCompleted.useQuery(
+    {
+      refId,
+      lang,
+    },
+    {
+      enabled: isPollingForBookingStatus,
+      refetchInterval: (query) => {
+        retries.current = query.state.dataUpdateCount
+
+        if (query.state.error || query.state.dataUpdateCount >= maxRetries) {
+          return false
+        }
+
+        if (
+          query.state.data?.reservationStatus ===
+          BookingStatusEnum.BookingCompleted
+        ) {
+          return false
+        }
+
+        return retryInterval
+      },
+      refetchIntervalInBackground: true,
+      refetchOnWindowFocus: false,
+      refetchOnMount: false,
+      retry: false,
+    }
+  )
 
   const handlePaymentError = useCallback(
     (errorMessage: string) => {
@@ -245,18 +270,12 @@ export default function PaymentClient({
   )
 
   useEffect(() => {
-    if (bookingStatus?.data?.paymentUrl) {
-      router.push(bookingStatus.data.paymentUrl)
-    } else if (
-      bookingStatus?.data?.reservationStatus ===
-      BookingStatusEnum.BookingCompleted
-    ) {
-      const confirmationUrl = `${bookingConfirmation(lang)}?${BOOKING_CONFIRMATION_NUMBER}=${bookingStatus?.data?.id}`
-      router.push(confirmationUrl)
-    } else if (bookingStatus.isTimeout) {
+    if (bookingStatus?.data?.redirectUrl) {
+      router.push(bookingStatus.data.redirectUrl)
+    } else if (retries.current >= maxRetries) {
       handlePaymentError("Timeout")
     }
-  }, [bookingStatus, router, intl, lang, handlePaymentError])
+  }, [bookingStatus, router, handlePaymentError])
 
   useEffect(() => {
     setIsSubmittingDisabled(
@@ -458,7 +477,7 @@ export default function PaymentClient({
     initiateBooking.isPending ||
     (isPollingForBookingStatus &&
       !bookingStatus.data?.paymentUrl &&
-      !bookingStatus.isTimeout)
+      retries.current < maxRetries)
   ) {
     return <LoadingSpinner />
   }
@@ -620,9 +639,7 @@ export default function PaymentClient({
               : ""
             router.push(`${selectRate(lang)}${allSearchParams}`)
           }}
-          onAccept={() =>
-            priceChange.mutate({ confirmationNumber: bookingNumber })
-          }
+          onAccept={() => priceChange.mutate({ refId })}
         />
       ) : null}
     </section>
diff --git a/apps/scandic-web/components/HotelReservation/FindMyBooking/AdditionalInfoForm.tsx b/apps/scandic-web/components/HotelReservation/FindMyBooking/AdditionalInfoForm.tsx
index 07ee51d7f..a2d1a20f0 100644
--- a/apps/scandic-web/components/HotelReservation/FindMyBooking/AdditionalInfoForm.tsx
+++ b/apps/scandic-web/components/HotelReservation/FindMyBooking/AdditionalInfoForm.tsx
@@ -18,10 +18,10 @@ import {
 import styles from "./findMyBooking.module.css"
 
 export default function AdditionalInfoForm({
-  confirmationNumber,
+  refId,
   lastName,
 }: {
-  confirmationNumber: string
+  refId: string
   lastName: string
 }) {
   const router = useRouter()
@@ -37,7 +37,7 @@ export default function AdditionalInfoForm({
     const values = form.getValues()
     const value = new URLSearchParams({
       ...values,
-      confirmationNumber,
+      RefId: refId,
       lastName,
     }).toString()
     document.cookie = `bv=${encodeURIComponent(value)}; Path=/; Max-Age=600; Secure; SameSite=Strict`
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx
index 51510f14e..a34a688ca 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx
@@ -145,7 +145,7 @@ export default function AddAncillaryFlowModal({
   ) {
     addAncillary.mutate(
       {
-        confirmationNumber: booking.confirmationNumber,
+        refId,
         ancillaryComment: data.optionalText,
         ancillaryDeliveryTime: selectedAncillary?.requiresDeliveryTime
           ? data.deliveryTime
@@ -175,8 +175,8 @@ export default function AddAncillaryFlowModal({
             )
             clearAncillarySessionData()
             closeModal()
-            utils.booking.get.invalidate({
-              confirmationNumber: booking.confirmationNumber,
+            utils.booking.confirmation.invalidate({
+              refId: booking.refId,
             })
             router.refresh()
           } else {
@@ -211,7 +211,7 @@ export default function AddAncillaryFlowModal({
           }
         : undefined
       guaranteeBooking.mutate({
-        confirmationNumber: booking.confirmationNumber,
+        refId,
         language: lang,
         ...(card && { card }),
         success: `${guaranteeRedirectUrl}?status=success&RefId=${encodeURIComponent(refId)}&ancillary=1`,
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/RemoveButton.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/RemoveButton.tsx
index 9d346df62..75300af24 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/RemoveButton.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/RemoveButton.tsx
@@ -10,12 +10,12 @@ import { toast } from "@/components/TempDesignSystem/Toasts"
 import useLang from "@/hooks/useLang"
 
 export default function RemoveButton({
-  confirmationNumber,
+  refId,
   codes,
   title,
   onSuccess,
 }: {
-  confirmationNumber: string
+  refId: string
   codes: string[]
   title?: string
   onSuccess: () => void
@@ -51,7 +51,7 @@ export default function RemoveButton({
         removePackage.mutate(
           {
             language: lang,
-            confirmationNumber,
+            refId,
             codes,
           },
           {
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx
index b8328768f..c967705b9 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx
@@ -25,6 +25,7 @@ import type {
 export function AddedAncillaries({
   ancillaries,
   booking,
+  refId,
 }: AddedAncillariesProps) {
   const intl = useIntl()
   const router = useRouter()
@@ -126,7 +127,7 @@ export function AddedAncillaries({
                   {booking.confirmationNumber && ancillary.code ? (
                     <div className={styles.actions}>
                       <RemoveButton
-                        confirmationNumber={booking.confirmationNumber}
+                        refId={refId}
                         codes={
                           ancillary.code ===
                           BreakfastPackageEnum.ANCILLARY_REGULAR_BREAKFAST
@@ -192,7 +193,7 @@ export function AddedAncillaries({
                 booking.canModifyAncillaries ? (
                   <div className={styles.actions}>
                     <RemoveButton
-                      confirmationNumber={booking.confirmationNumber}
+                      refId={refId}
                       codes={
                         ancillary.code ===
                         BreakfastPackageEnum.ANCILLARY_REGULAR_BREAKFAST
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/GuaranteeCallback/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/GuaranteeCallback/index.tsx
index 4c2c1677c..fa2ddc871 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/GuaranteeCallback/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/GuaranteeCallback/index.tsx
@@ -20,10 +20,12 @@ import type { Lang } from "@/constants/languages"
 
 export default function GuaranteeAncillaryHandler({
   confirmationNumber,
+  refId,
   returnUrl,
   lang,
 }: {
   confirmationNumber: string
+  refId: string
   returnUrl: string
   lang: Lang
 }) {
@@ -47,7 +49,7 @@ export default function GuaranteeAncillaryHandler({
 
     addAncillary.mutate(
       {
-        confirmationNumber,
+        refId,
         ancillaryComment: formData.optionalText,
         ancillaryDeliveryTime: selectedAncillary.requiresDeliveryTime
           ? formData.deliveryTime
@@ -86,7 +88,7 @@ export default function GuaranteeAncillaryHandler({
         },
       }
     )
-  }, [confirmationNumber, returnUrl, addAncillary, lang, router])
+  }, [confirmationNumber, refId, returnUrl, addAncillary, lang, router])
 
   return <LoadingSpinner />
 }
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/index.tsx
index a35fa8514..734c16c82 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/index.tsx
@@ -213,7 +213,11 @@ export function Ancillaries({
           </>
         )}
 
-        <AddedAncillaries booking={booking} ancillaries={uniqueAncillaries} />
+        <AddedAncillaries
+          booking={booking}
+          ancillaries={uniqueAncillaries}
+          refId={refId}
+        />
 
         <AncillaryFlowModalWrapper>
           <AddAncillaryFlowModal
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/GuestDetails/Details.tsx b/apps/scandic-web/components/HotelReservation/MyStay/GuestDetails/Details.tsx
index 51da312d3..c10a7e43b 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/GuestDetails/Details.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/GuestDetails/Details.tsx
@@ -64,10 +64,10 @@ export default function Details({ booking, user }: DetailsProps) {
 
   const updateGuest = trpc.booking.update.useMutation({
     onMutate: () => setIsLoading(true),
-    onSuccess: (data) => {
-      if (data) {
-        utils.booking.get.invalidate({
-          confirmationNumber: data.confirmationNumber,
+    onSuccess: (refId) => {
+      if (refId) {
+        utils.booking.confirmation.invalidate({
+          refId,
         })
 
         toast.success(
@@ -99,7 +99,7 @@ export default function Details({ booking, user }: DetailsProps) {
 
   async function onSubmit(data: ModifyContactSchema) {
     updateGuest.mutate({
-      confirmationNumber: booking.confirmationNumber,
+      refId: booking.refId,
       guest: {
         email: data.email,
         phoneNumber: data.phoneNumber,
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/GuestDetails/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/GuestDetails/index.tsx
index 7f786c59f..f8dfc3949 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/GuestDetails/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/GuestDetails/index.tsx
@@ -1,4 +1,5 @@
 "use client"
+
 import { useMyStayStore } from "@/stores/my-stay"
 
 import Details from "./Details"
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Receipt/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Receipt/index.tsx
deleted file mode 100644
index 70e17a294..000000000
--- a/apps/scandic-web/components/HotelReservation/MyStay/Receipt/index.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-import { cookies } from "next/headers"
-import { notFound } from "next/navigation"
-
-import ScandicLogoIcon from "@scandic-hotels/design-system/Icons/ScandicLogoIcon"
-import { Typography } from "@scandic-hotels/design-system/Typography"
-
-import { dt } from "@/lib/dt"
-import {
-  getAncillaryPackages,
-  getBookingConfirmation,
-  getProfileSafely,
-} from "@/lib/trpc/memoizedRequests"
-
-import { getIntl } from "@/i18n"
-import { decrypt } from "@/utils/encryption"
-
-import AdditionalInfoForm from "../../FindMyBooking/AdditionalInfoForm"
-import accessBooking, {
-  ACCESS_GRANTED,
-  ERROR_BAD_REQUEST,
-  ERROR_UNAUTHORIZED,
-} from "../accessBooking"
-import Footer from "./Footer"
-import Specification from "./Specification"
-import Total from "./Total"
-
-import styles from "./receipt.module.css"
-
-import { CurrencyEnum } from "@/types/enums/currency"
-
-export async function Receipt({ refId }: { refId: string }) {
-  const value = decrypt(refId)
-  if (!value) {
-    return notFound()
-  }
-  const [confirmationNumber, lastName] = value.split(",")
-  const bookingConfirmation = await getBookingConfirmation(confirmationNumber)
-  if (!bookingConfirmation) {
-    return notFound()
-  }
-
-  const { booking, hotel, room } = bookingConfirmation
-  const user = await getProfileSafely()
-  const bv = cookies().get("bv")?.value
-  const intl = await getIntl()
-
-  const access = accessBooking(booking.guest, lastName, user, bv)
-
-  if (access === ACCESS_GRANTED) {
-    const ancillaryPackages = await getAncillaryPackages({
-      fromDate: dt(booking.checkInDate).format("YYYY-MM-DD"),
-      hotelId: hotel.operaId,
-      toDate: dt(booking.checkOutDate).format("YYYY-MM-DD"),
-    })
-
-    const currency =
-      booking.currencyCode !== CurrencyEnum.POINTS
-        ? booking.currencyCode
-        : (booking.ancillaries.find((a) => a.currency !== CurrencyEnum.POINTS)
-            ?.currency ??
-          booking.packages.find((p) => p.currency !== CurrencyEnum.POINTS)
-            ?.currency)
-
-    return (
-      <main className={styles.main}>
-        <div>
-          <ScandicLogoIcon width="89px" height="19px" color="Icon/Accent" />
-          <div className={styles.addresses}>
-            <div>
-              <Typography variant="Body/Supporting text (caption)/smRegular">
-                <div>{hotel.name}</div>
-              </Typography>
-              <Typography variant="Body/Supporting text (caption)/smRegular">
-                <div>
-                  {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
-                  {`${hotel.address.streetAddress}, ${hotel.address.zipCode} ${hotel.address.city}`}
-                </div>
-              </Typography>
-              <Typography variant="Body/Supporting text (caption)/smRegular">
-                <div className={`${styles.tertiary} ${styles.addressMargin}`}>
-                  {hotel.contactInformation.email}
-                </div>
-              </Typography>
-              <Typography variant="Body/Supporting text (caption)/smRegular">
-                <div className={styles.tertiary}>
-                  {hotel.contactInformation.phoneNumber}
-                </div>
-              </Typography>
-            </div>
-            <div className={styles.rightColumn}>
-              <Typography variant="Body/Supporting text (caption)/smRegular">
-                {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
-                <div>{`${booking.guest.firstName} ${booking.guest.lastName}`}</div>
-              </Typography>
-              {booking.guest.membershipNumber && (
-                <Typography variant="Body/Supporting text (caption)/smRegular">
-                  {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
-                  <div>{`${intl.formatMessage({
-                    defaultMessage: "Member",
-                  })} ${booking.guest.membershipNumber}`}</div>
-                </Typography>
-              )}
-              <Typography variant="Body/Supporting text (caption)/smRegular">
-                <div className={`${styles.tertiary} ${styles.addressMargin}`}>
-                  {booking.guest.email}
-                </div>
-              </Typography>
-              <Typography variant="Body/Supporting text (caption)/smRegular">
-                <div className={styles.tertiary}>
-                  {booking.guest.phoneNumber}
-                </div>
-              </Typography>
-            </div>
-          </div>
-        </div>
-        <Total booking={booking} currency={currency} />
-        <Specification
-          ancillaryPackages={ancillaryPackages}
-          booking={booking}
-          currency={currency}
-        />
-
-        <hr className={styles.divider} />
-
-        <Footer booking={booking} room={room} />
-      </main>
-    )
-  }
-
-  if (access === ERROR_BAD_REQUEST) {
-    return (
-      <main className={styles.main}>
-        <div className={styles.form}>
-          <AdditionalInfoForm
-            // send refId here?
-            confirmationNumber={confirmationNumber}
-            lastName={lastName}
-          />
-        </div>
-      </main>
-    )
-  }
-
-  if (access === ERROR_UNAUTHORIZED) {
-    return (
-      <main className={styles.main}>
-        <div className={styles.logIn}>
-          <Typography variant="Title/md">
-            <h1>
-              {intl.formatMessage({
-                defaultMessage: "You need to be logged in to view your booking",
-              })}
-            </h1>
-          </Typography>
-          <Typography variant="Body/Lead text">
-            <p>
-              {intl.formatMessage({
-                defaultMessage:
-                  "And you need to be logged in with the same member account that made the booking.",
-              })}
-            </p>
-          </Typography>
-        </div>
-      </main>
-    )
-  }
-
-  return notFound()
-}
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/CancelStay/Steps/FinalConfirmation/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/CancelStay/Steps/FinalConfirmation/index.tsx
index 8bd45aadf..90f5c15c7 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/CancelStay/Steps/FinalConfirmation/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/CancelStay/Steps/FinalConfirmation/index.tsx
@@ -57,7 +57,7 @@ export default function FinalConfirmation({
           )
         } else {
           const cancelledRooms = rooms.filter((r) =>
-            variables.confirmationNumbers.includes(r.confirmationNumber)
+            variables.refIds.includes(r.refId)
           )
           for (const cancelledRoom of cancelledRooms) {
             toast.success(
@@ -93,13 +93,16 @@ export default function FinalConfirmation({
         )
       }
 
-      utils.booking.get.invalidate({
-        confirmationNumber: bookedRoom.confirmationNumber,
-      })
-      utils.booking.linkedReservations.invalidate({
+      utils.booking.confirmation.invalidate({
+        refId: bookedRoom.refId,
         lang,
-        rooms: bookedRoom.linkedReservations,
       })
+
+      utils.booking.linkedReservations.invalidate({
+        refId: bookedRoom.refId,
+        lang,
+      })
+
       closeModal()
     },
     onError() {
@@ -113,13 +116,13 @@ export default function FinalConfirmation({
 
   function cancelBooking() {
     if (Array.isArray(formRooms)) {
-      const confirmationNumbersToCancel = formRooms
+      const refIdsToCancel = formRooms
         .filter((r) => r.checked)
         .map((r) => r.confirmationNumber)
-      if (confirmationNumbersToCancel.length) {
+      if (refIdsToCancel.length) {
         cancelBookingsMutation.mutate({
-          confirmationNumbers: confirmationNumbersToCancel,
-          language: lang,
+          refIds: refIdsToCancel,
+          lang,
         })
       }
     } else {
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/Confirmation/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/Confirmation/index.tsx
index 9c75710fc..49f3d6c6c 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/Confirmation/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/Confirmation/index.tsx
@@ -54,10 +54,10 @@ export default function Confirmation({
   )
 
   const updateBooking = trpc.booking.update.useMutation({
-    onSuccess: (updatedBooking) => {
-      if (updatedBooking) {
-        utils.booking.get.invalidate({
-          confirmationNumber: updatedBooking.confirmationNumber,
+    onSuccess: (refId) => {
+      if (refId) {
+        utils.booking.confirmation.invalidate({
+          refId,
         })
 
         toast.success(
@@ -86,7 +86,7 @@ export default function Confirmation({
 
   function handleModifyStay() {
     updateBooking.mutate({
-      confirmationNumber: bookedRoom.confirmationNumber,
+      refId: bookedRoom.refId,
       checkInDate,
       checkOutDate,
     })
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/GuaranteeLateArrival/Form/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/GuaranteeLateArrival/Form/index.tsx
index 911d976f5..69d3fbc73 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/GuaranteeLateArrival/Form/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/GuaranteeLateArrival/Form/index.tsx
@@ -60,7 +60,7 @@ export default function Form() {
   const guaranteeRedirectUrl = `${env.NEXT_PUBLIC_NODE_ENV === "development" ? `http://localhost:${env.NEXT_PUBLIC_PORT}` : ""}${guaranteeCallback(lang)}`
 
   const { guaranteeBooking, isLoading, handleGuaranteeError } =
-    useGuaranteeBooking(confirmationNumber, false, hotelId)
+    useGuaranteeBooking(refId, false, hotelId)
 
   if (isLoading) {
     return (
@@ -85,7 +85,7 @@ export default function Form() {
         : undefined
       writeGlaToSessionStorage("yes", hotelId)
       guaranteeBooking.mutate({
-        confirmationNumber,
+        refId,
         language: lang,
         ...(card && { card }),
         success: `${guaranteeRedirectUrl}?status=success&RefId=${encodeURIComponent(refId)}`,
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/utils/mapRoomDetails.ts b/apps/scandic-web/components/HotelReservation/MyStay/utils/mapRoomDetails.ts
index 185075a63..fd8e5e395 100644
--- a/apps/scandic-web/components/HotelReservation/MyStay/utils/mapRoomDetails.ts
+++ b/apps/scandic-web/components/HotelReservation/MyStay/utils/mapRoomDetails.ts
@@ -143,6 +143,7 @@ export function mapRoomDetails({
     priceType,
     rate,
     rateDefinition: booking.rateDefinition,
+    refId: booking.refId,
     reservationStatus: booking.reservationStatus,
     room,
     roomName: room?.name ?? "",
diff --git a/apps/scandic-web/constants/booking.ts b/apps/scandic-web/constants/booking.ts
index 8f365fad8..9c156369e 100644
--- a/apps/scandic-web/constants/booking.ts
+++ b/apps/scandic-web/constants/booking.ts
@@ -37,8 +37,6 @@ export enum ChildBedTypeEnum {
 export const REDEMPTION = "redemption"
 export const SEARCHTYPE = "searchtype"
 
-export const BOOKING_CONFIRMATION_NUMBER = "confirmationNumber"
-
 export const MEMBERSHIP_FAILED_ERROR = "MembershipFailedError"
 
 export enum PaymentMethodEnum {
diff --git a/apps/scandic-web/hooks/booking/useGuaranteeBooking.ts b/apps/scandic-web/hooks/booking/useGuaranteeBooking.ts
index 21f4205ed..ed0b9b82b 100644
--- a/apps/scandic-web/hooks/booking/useGuaranteeBooking.ts
+++ b/apps/scandic-web/hooks/booking/useGuaranteeBooking.ts
@@ -13,7 +13,7 @@ const maxRetries = 15
 const retryInterval = 2000
 
 export function useGuaranteeBooking(
-  confirmationNumber: string,
+  refId: string,
   isAncillaryFlow = false,
   hotelId: string
 ) {
@@ -51,10 +51,10 @@ export function useGuaranteeBooking(
     onSuccess: (result) => {
       if (result) {
         if (result.reservationStatus == BookingStatusEnum.BookingCompleted) {
-          utils.booking.get.invalidate({ confirmationNumber })
+          utils.booking.confirmation.invalidate({ refId })
         } else {
           setIsPollingForBookingStatus(true)
-          utils.booking.status.invalidate({ confirmationNumber })
+          utils.booking.status.invalidate({ refId })
         }
       } else {
         handleGuaranteeError()
@@ -66,7 +66,7 @@ export function useGuaranteeBooking(
   })
 
   const bookingStatus = useHandleBookingStatus({
-    confirmationNumber,
+    refId,
     expectedStatuses: [BookingStatusEnum.BookingCompleted],
     maxRetries,
     retryInterval,
@@ -76,7 +76,7 @@ export function useGuaranteeBooking(
   useEffect(() => {
     if (bookingStatus?.data?.paymentUrl && isPollingForBookingStatus) {
       router.push(bookingStatus.data.paymentUrl)
-      utils.booking.get.invalidate({ confirmationNumber })
+      utils.booking.confirmation.invalidate({ refId })
       setIsPollingForBookingStatus(false)
     } else if (bookingStatus.isTimeout) {
       handleGuaranteeError("Timeout")
@@ -87,8 +87,8 @@ export function useGuaranteeBooking(
     handleGuaranteeError,
     setIsPollingForBookingStatus,
     isPollingForBookingStatus,
-    confirmationNumber,
-    utils.booking.get,
+    refId,
+    utils.booking.confirmation,
   ])
 
   const isLoading =
diff --git a/apps/scandic-web/hooks/booking/useHandleBookingStatus.ts b/apps/scandic-web/hooks/booking/useHandleBookingStatus.ts
index c47d01148..f6220b31e 100644
--- a/apps/scandic-web/hooks/booking/useHandleBookingStatus.ts
+++ b/apps/scandic-web/hooks/booking/useHandleBookingStatus.ts
@@ -7,13 +7,13 @@ import { trpc } from "@/lib/trpc/client"
 import type { BookingStatusEnum } from "@/constants/booking"
 
 export function useHandleBookingStatus({
-  confirmationNumber,
+  refId,
   expectedStatuses,
   maxRetries,
   retryInterval,
   enabled,
 }: {
-  confirmationNumber: string | null
+  refId: string
   expectedStatuses: BookingStatusEnum[]
   maxRetries: number
   retryInterval: number
@@ -22,7 +22,7 @@ export function useHandleBookingStatus({
   const retries = useRef(0)
 
   const query = trpc.booking.status.useQuery(
-    { confirmationNumber: confirmationNumber ?? "" },
+    { refId },
     {
       enabled,
       refetchInterval: (query) => {
diff --git a/apps/scandic-web/lib/trpc/memoizedRequests/index.ts b/apps/scandic-web/lib/trpc/memoizedRequests/index.ts
index 9dd7eb0ba..6abc2db19 100644
--- a/apps/scandic-web/lib/trpc/memoizedRequests/index.ts
+++ b/apps/scandic-web/lib/trpc/memoizedRequests/index.ts
@@ -1,3 +1,4 @@
+import { getHotel as _getHotel } from "@/server/routers/hotels/utils"
 import { isDefined } from "@/server/utils"
 
 import { getLang } from "@/i18n/serverContext"
@@ -17,7 +18,6 @@ import type {
   HotelInput,
 } from "@/types/trpc/routers/hotel/hotel"
 import type { Lang } from "@/constants/languages"
-import type { LinkedReservationsInput } from "@/server/routers/booking/input"
 import type { GetHotelsByCSFilterInput } from "@/server/routers/hotels/input"
 import type { GetSavedPaymentCardsInput } from "@/server/routers/user/input"
 
@@ -136,14 +136,20 @@ export const getPackages = cache(async function getMemoizedPackages(
 })
 
 export const getBookingConfirmation = cache(
-  async function getMemoizedBookingConfirmation(confirmationNumber: string) {
-    return serverClient().booking.get({ confirmationNumber })
+  async function getMemoizedBookingConfirmation(refId: string, lang: Lang) {
+    return serverClient().booking.confirmation({
+      refId,
+      lang,
+    })
   }
 )
 
 export const getLinkedReservations = cache(
-  async function getMemoizedLinkedReservations(input: LinkedReservationsInput) {
-    return serverClient().booking.linkedReservations(input)
+  async function getMemoizedLinkedReservations(refId: string, lang: Lang) {
+    return serverClient().booking.linkedReservations({
+      refId,
+      lang,
+    })
   }
 )
 
diff --git a/apps/scandic-web/providers/MyStay.tsx b/apps/scandic-web/providers/MyStay.tsx
index 6a3fa6e2c..e841344de 100644
--- a/apps/scandic-web/providers/MyStay.tsx
+++ b/apps/scandic-web/providers/MyStay.tsx
@@ -1,9 +1,10 @@
 "use client"
+
 import { notFound } from "next/navigation"
 import { use, useRef } from "react"
 import { useIntl } from "react-intl"
 
-import { trpc } from "@/lib/trpc/client"
+import { type RouterOutput, trpc } from "@/lib/trpc/client"
 import { createMyStayStore } from "@/stores/my-stay"
 
 import { MyStaySkeleton } from "@/components/HotelReservation/MyStay/myStaySkeleton"
@@ -12,10 +13,7 @@ import { MyStayContext } from "@/contexts/MyStay"
 import type { Packages } from "@/types/components/myPages/myStay/ancillaries"
 import type { MyStayStore } from "@/types/contexts/my-stay"
 import type { RoomCategories } from "@/types/hotel"
-import type {
-  BookingConfirmation,
-  BookingConfirmationSchema,
-} from "@/types/trpc/routers/booking/confirmation"
+import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
 import type { CreditCard } from "@/types/user"
 import type { Lang } from "@/constants/languages"
 
@@ -23,7 +21,9 @@ interface MyStayProviderProps {
   bookingConfirmation: BookingConfirmation
   breakfastPackages: Packages | null
   lang: Lang
-  linkedReservationsPromise: Promise<BookingConfirmationSchema[]>
+  linkedReservationsPromise: Promise<
+    RouterOutput["booking"]["linkedReservations"]
+  >
   refId: string
   roomCategories: RoomCategories
   savedCreditCards: CreditCard[] | null
@@ -39,13 +39,14 @@ export default function MyStayProvider({
   roomCategories,
   savedCreditCards,
 }: React.PropsWithChildren<MyStayProviderProps>) {
-  const storeRef = useRef<MyStayStore>()
   const intl = useIntl()
 
+  const storeRef = useRef<MyStayStore>()
+
   const { data, error, isFetching, isFetchedAfterMount } =
-    trpc.booking.get.useQuery(
+    trpc.booking.confirmation.useQuery(
       {
-        confirmationNumber: bookingConfirmation.booking.confirmationNumber,
+        refId,
         lang,
       },
       {
@@ -68,7 +69,7 @@ export default function MyStayProvider({
   } = trpc.booking.linkedReservations.useQuery(
     {
       lang,
-      rooms: bookingConfirmation.booking.linkedReservations,
+      refId,
     },
     {
       initialData: linkedReservationsResponses,
@@ -85,15 +86,16 @@ export default function MyStayProvider({
     return notFound()
   }
 
-  const rooms = [data.booking, ...linkedReservations]
+  const rooms = [data.booking].concat(linkedReservations ?? [])
 
   const hasInvalidatedQueryAndRefetched =
     (isFetchedAfterMount && data) ||
     (linkedReservationsIsFetchedAfterMount && linkedReservations)
+
   if (!storeRef.current || hasInvalidatedQueryAndRefetched) {
     storeRef.current = createMyStayStore({
       breakfastPackages,
-      hotel: bookingConfirmation.hotel,
+      hotel: bookingConfirmation.hotelData.hotel,
       intl,
       refId,
       roomCategories,
diff --git a/apps/scandic-web/server/routers/booking/input.ts b/apps/scandic-web/server/routers/booking/input.ts
index bbf444181..38d6858b5 100644
--- a/apps/scandic-web/server/routers/booking/input.ts
+++ b/apps/scandic-web/server/routers/booking/input.ts
@@ -103,7 +103,7 @@ export const createBookingInput = z.object({
 })
 
 export const addPackageInput = z.object({
-  confirmationNumber: z.string(),
+  refId: z.string(),
   ancillaryComment: z.string(),
   ancillaryDeliveryTime: z.string().nullish(),
   packages: z.array(
@@ -117,22 +117,22 @@ export const addPackageInput = z.object({
 })
 
 export const removePackageInput = z.object({
-  confirmationNumber: z.string(),
+  refId: z.string(),
   codes: z.array(z.string()),
   language: z.nativeEnum(Lang).transform((val) => langToApiLang[val]),
 })
 
 export const priceChangeInput = z.object({
-  confirmationNumber: z.string(),
+  refId: z.string(),
 })
 
 export const cancelBookingsInput = z.object({
-  confirmationNumbers: z.array(z.string()),
-  language: z.nativeEnum(Lang),
+  refIds: z.array(z.string()),
+  lang: z.nativeEnum(Lang),
 })
 
 export const guaranteeBookingInput = z.object({
-  confirmationNumber: z.string(),
+  refId: z.string(),
   card: z
     .object({
       alias: z.string(),
@@ -156,7 +156,7 @@ export const createRefIdInput = z.object({
 })
 
 export const updateBookingInput = z.object({
-  confirmationNumber: z.string(),
+  refId: z.string(),
   checkInDate: z.string().optional(),
   checkOutDate: z.string().optional(),
   guest: z
@@ -168,22 +168,27 @@ export const updateBookingInput = z.object({
     .optional(),
 })
 
-// Query
-const confirmationNumberInput = z.object({
-  confirmationNumber: z.string(),
+export const bookingConfirmationInput = z.object({
+  refId: z.string(),
   lang: z.nativeEnum(Lang).optional(),
 })
 
-export const getBookingInput = confirmationNumberInput
 export const getLinkedReservationsInput = z.object({
+  refId: z.string(),
   lang: z.nativeEnum(Lang).optional(),
-  rooms: z.array(
-    z.object({
-      confirmationNumber: z.string(),
-    })
-  ),
 })
 
 export type LinkedReservationsInput = z.input<typeof getLinkedReservationsInput>
 
-export const getBookingStatusInput = confirmationNumberInput
+export const getBookingStatusInput = z.object({
+  refId: z.string(),
+})
+
+export const getBookingConfirmationErrorInput = z.object({
+  refId: z.string(),
+})
+
+export const getConfirmationCompletedInput = z.object({
+  refId: z.string(),
+  lang: z.nativeEnum(Lang),
+})
diff --git a/apps/scandic-web/server/routers/booking/mutation.ts b/apps/scandic-web/server/routers/booking/mutation.ts
index ce648e7ec..c7c04076f 100644
--- a/apps/scandic-web/server/routers/booking/mutation.ts
+++ b/apps/scandic-web/server/routers/booking/mutation.ts
@@ -1,8 +1,11 @@
 import * as api from "@/lib/api"
 import { getMembershipNumber } from "@/server/routers/user/utils"
 import { createCounter } from "@/server/telemetry"
+import { getUserOrServiceToken } from "@/server/tokenManager"
 import { router, safeProtectedServiceProcedure } from "@/server/trpc"
 
+import { parseRefId } from "@/utils/refId"
+
 import {
   addPackageInput,
   cancelBookingsInput,
@@ -12,7 +15,7 @@ import {
   removePackageInput,
   updateBookingInput,
 } from "./input"
-import { bookingConfirmationSchema, createBookingSchema } from "./output"
+import { bookingSchema, createBookingSchema } from "./output"
 import { cancelBooking } from "./utils"
 
 export const bookingMutationRouter = router({
@@ -73,8 +76,17 @@ export const bookingMutationRouter = router({
     }),
   priceChange: safeProtectedServiceProcedure
     .input(priceChangeInput)
+    .use(async ({ input, next }) => {
+      const { confirmationNumber } = parseRefId(input.refId)
+
+      return next({
+        ctx: {
+          confirmationNumber,
+        },
+      })
+    })
     .mutation(async function ({ ctx, input }) {
-      const { confirmationNumber } = input
+      const { confirmationNumber } = ctx
 
       const priceChangeCounter = createCounter("trpc.booking", "price-change")
       const metricsPriceChange = priceChangeCounter.init({ confirmationNumber })
@@ -109,17 +121,29 @@ export const bookingMutationRouter = router({
 
       metricsPriceChange.success()
 
-      return verifiedData.data
+      return verifiedData.data.id
     }),
   cancel: safeProtectedServiceProcedure
     .input(cancelBookingsInput)
+    .use(async ({ input, next }) => {
+      const confirmationNumbers = input.refIds.map((refId) => {
+        const { confirmationNumber } = parseRefId(refId)
+        return confirmationNumber
+      })
+
+      return next({
+        ctx: {
+          confirmationNumbers,
+        },
+      })
+    })
     .mutation(async function ({ ctx, input }) {
-      const token = ctx.session?.token.access_token ?? ctx.serviceToken
-      const { confirmationNumbers, language } = input
+      const { confirmationNumbers } = ctx
+      const { lang } = input
 
       const responses = await Promise.allSettled(
         confirmationNumbers.map((confirmationNumber) =>
-          cancelBooking(confirmationNumber, language, token)
+          cancelBooking(confirmationNumber, lang)
         )
       )
 
@@ -144,10 +168,19 @@ export const bookingMutationRouter = router({
     }),
   packages: safeProtectedServiceProcedure
     .input(addPackageInput)
+    .use(async ({ input, next }) => {
+      const { confirmationNumber } = parseRefId(input.refId)
+
+      return next({
+        ctx: {
+          confirmationNumber,
+        },
+      })
+    })
     .mutation(async function ({ ctx, input }) {
       const accessToken = ctx.session?.token.access_token ?? ctx.serviceToken
-      const { confirmationNumber, ...body } = input
-
+      const { refId, ...body } = input
+      const { confirmationNumber } = ctx
       const addPackageCounter = createCounter("trpc.booking", "package.add")
       const metricsAddPackage = addPackageCounter.init({ confirmationNumber })
 
@@ -183,10 +216,19 @@ export const bookingMutationRouter = router({
     }),
   guarantee: safeProtectedServiceProcedure
     .input(guaranteeBookingInput)
+    .use(async ({ input, next }) => {
+      const { confirmationNumber } = parseRefId(input.refId)
+
+      return next({
+        ctx: {
+          confirmationNumber,
+        },
+      })
+    })
     .mutation(async function ({ ctx, input }) {
       const accessToken = ctx.session?.token.access_token ?? ctx.serviceToken
-      const { confirmationNumber, language, ...body } = input
-
+      const { refId, language, ...body } = input
+      const { confirmationNumber } = ctx
       const guaranteeBookingCounter = createCounter("trpc.booking", "guarantee")
       const metricsGuaranteeBooking = guaranteeBookingCounter.init({
         confirmationNumber,
@@ -225,10 +267,16 @@ export const bookingMutationRouter = router({
     }),
   update: safeProtectedServiceProcedure
     .input(updateBookingInput)
+    .use(async ({ input, next }) => {
+      const { confirmationNumber } = parseRefId(input.refId)
+      return next({
+        ctx: {
+          confirmationNumber,
+        },
+      })
+    })
     .mutation(async function ({ ctx, input }) {
-      const accessToken = ctx.session?.token.access_token || ctx.serviceToken
-      const { confirmationNumber, ...body } = input
-
+      const { confirmationNumber } = ctx
       const updateBookingCounter = createCounter("trpc.booking", "update")
       const metricsUpdateBooking = updateBookingCounter.init({
         confirmationNumber,
@@ -236,12 +284,17 @@ export const bookingMutationRouter = router({
 
       metricsUpdateBooking.start()
 
+      const token = getUserOrServiceToken()
       const apiResponse = await api.put(
         api.endpoints.v1.Booking.booking(confirmationNumber),
         {
-          body,
+          body: {
+            checkInDate: input.checkInDate,
+            checkOutDate: input.checkOutDate,
+            guest: input.guest,
+          },
           headers: {
-            Authorization: `Bearer ${accessToken}`,
+            Authorization: `Bearer ${token}`,
           },
         }
       )
@@ -253,7 +306,7 @@ export const bookingMutationRouter = router({
 
       const apiJson = await apiResponse.json()
 
-      const verifiedData = bookingConfirmationSchema.safeParse(apiJson)
+      const verifiedData = bookingSchema.safeParse(apiJson)
       if (!verifiedData.success) {
         metricsUpdateBooking.validationError(verifiedData.error)
         return null
@@ -261,14 +314,23 @@ export const bookingMutationRouter = router({
 
       metricsUpdateBooking.success()
 
-      return verifiedData.data
+      return verifiedData.data.refId
     }),
   removePackage: safeProtectedServiceProcedure
     .input(removePackageInput)
+    .use(async ({ input, next }) => {
+      const { confirmationNumber } = parseRefId(input.refId)
+
+      return next({
+        ctx: {
+          confirmationNumber,
+        },
+      })
+    })
     .mutation(async function ({ ctx, input }) {
       const accessToken = ctx.session?.token.access_token ?? ctx.serviceToken
-      const { confirmationNumber, codes, language } = input
-
+      const { codes, language } = input
+      const { confirmationNumber } = ctx
       const removePackageCounter = createCounter(
         "trpc.booking",
         "package.remove"
diff --git a/apps/scandic-web/server/routers/booking/output.ts b/apps/scandic-web/server/routers/booking/output.ts
index 072b2681b..df24d20af 100644
--- a/apps/scandic-web/server/routers/booking/output.ts
+++ b/apps/scandic-web/server/routers/booking/output.ts
@@ -2,6 +2,7 @@ import { z } from "zod"
 
 import { BookingStatusEnum, ChildBedTypeEnum } from "@/constants/booking"
 
+import { calculateRefId } from "@/utils/refId"
 import { nullableArrayObjectValidator } from "@/utils/zod/arrayValidator"
 import { nullableIntValidator } from "@/utils/zod/numberValidator"
 import {
@@ -78,7 +79,13 @@ export const createBookingSchema = z
     type: d.data.type,
     reservationStatus: d.data.attributes.reservationStatus,
     paymentUrl: d.data.attributes.paymentUrl,
-    rooms: d.data.attributes.rooms,
+    rooms: d.data.attributes.rooms.map((room) => {
+      const lastName = d.data.attributes.guest?.lastName || ""
+      return {
+        ...room,
+        refId: calculateRefId(room.confirmationNumber, lastName),
+      }
+    }),
     errors: d.data.attributes.errors,
     guest: d.data.attributes.guest,
   }))
@@ -195,7 +202,7 @@ const linksSchema = z.object({
     .nullable(),
 })
 
-export const bookingConfirmationSchema = z
+export const bookingSchema = z
   .object({
     data: z.object({
       attributes: z.object({
@@ -248,6 +255,19 @@ export const bookingConfirmationSchema = z
   })
   .transform(({ data }) => ({
     ...data.attributes,
+    refId: calculateRefId(
+      data.attributes.confirmationNumber,
+      data.attributes.guest.lastName
+    ),
+    linkedReservations: data.attributes.linkedReservations.map(
+      (linkedReservation) => {
+        const lastName = data.attributes.guest.lastName
+        return {
+          ...linkedReservation,
+          refId: calculateRefId(linkedReservation.confirmationNumber, lastName),
+        }
+      }
+    ),
     packages: data.attributes.packages.filter((p) => p.type !== "Ancillary"),
     ancillaries: data.attributes.packages.filter((p) => p.type === "Ancillary"),
     extraBedTypes: data.attributes.childBedPreferences,
diff --git a/apps/scandic-web/server/routers/booking/query.ts b/apps/scandic-web/server/routers/booking/query.ts
index 76067970c..beb685d12 100644
--- a/apps/scandic-web/server/routers/booking/query.ts
+++ b/apps/scandic-web/server/routers/booking/query.ts
@@ -1,3 +1,5 @@
+import { BookingStatusEnum } from "@/constants/booking"
+import { bookingConfirmation } from "@/constants/routes/hotelReservation"
 import * as api from "@/lib/api"
 import { badRequestError, serverErrorByStatus } from "@/server/errors/trpc"
 import { createCounter } from "@/server/telemetry"
@@ -6,39 +8,46 @@ import {
   safeProtectedServiceProcedure,
   serviceProcedure,
 } from "@/server/trpc"
+import { getBookedHotelRoom } from "@/stores/my-stay"
 
-import { calculateRefId } from "@/utils/refId"
+import { calculateRefId, parseRefId } from "@/utils/refId"
 
 import { getHotel } from "../hotels/utils"
 import {
+  bookingConfirmationInput,
   createRefIdInput,
-  getBookingInput,
+  getBookingConfirmationErrorInput,
   getBookingStatusInput,
+  getConfirmationCompletedInput,
   getLinkedReservationsInput,
 } from "./input"
 import { createBookingSchema } from "./output"
-import { getBookedHotelRoom, getBooking } from "./utils"
+import { getBooking, getLinkedReservations } from "./utils"
+
+import type { BookingSchema } from "@/types/trpc/routers/booking/confirmation"
 
 export const bookingQueryRouter = router({
-  get: safeProtectedServiceProcedure
-    .input(getBookingInput)
+  confirmation: safeProtectedServiceProcedure
+    .input(bookingConfirmationInput)
     .use(async ({ ctx, input, next }) => {
       const lang = input.lang ?? ctx.lang
-      const token = ctx.session?.token.access_token ?? ctx.serviceToken
+      const { confirmationNumber } = parseRefId(input.refId)
       return next({
         ctx: {
           lang,
-          token,
+          confirmationNumber,
         },
       })
     })
-    .query(async function ({ ctx, input: { confirmationNumber } }) {
+    .query(async function ({
+      ctx: { confirmationNumber, lang, serviceToken },
+    }) {
       const getBookingCounter = createCounter("trpc.booking", "get")
       const metricsGetBooking = getBookingCounter.init({ confirmationNumber })
 
       metricsGetBooking.start()
 
-      const booking = await getBooking(confirmationNumber, ctx.lang, ctx.token)
+      const booking = await getBooking(confirmationNumber, lang)
 
       if (!booking) {
         metricsGetBooking.dataError(
@@ -52,9 +61,9 @@ export const bookingQueryRouter = router({
         {
           hotelId: booking.hotelId,
           isCardOnlyPayment: false,
-          language: ctx.lang,
+          language: lang,
         },
-        ctx.serviceToken
+        serviceToken
       )
 
       if (!hotelData) {
@@ -68,104 +77,243 @@ export const bookingQueryRouter = router({
         throw serverErrorByStatus(404)
       }
 
+      const room = getBookedHotelRoom(
+        hotelData.roomCategories,
+        booking.roomTypeCode
+      )
+
+      if (!room) {
+        metricsGetBooking.dataError(
+          `Failed to extract booked room ${booking.roomTypeCode} from room categories for ${booking.hotelId}`,
+          {
+            roomTypeCode: booking.roomTypeCode,
+            hotelId: booking.hotelId,
+          }
+        )
+
+        throw serverErrorByStatus(404)
+      }
+
       metricsGetBooking.success()
 
       return {
-        ...hotelData,
+        hotelData,
         booking,
-        room: getBookedHotelRoom(
-          hotelData.roomCategories,
-          booking.roomTypeCode
-        ),
+        room,
       }
     }),
   linkedReservations: safeProtectedServiceProcedure
     .input(getLinkedReservationsInput)
     .use(async ({ ctx, input, next }) => {
       const lang = input.lang ?? ctx.lang
-      const token = ctx.session?.token.access_token ?? ctx.serviceToken
+      const { confirmationNumber } = parseRefId(input.refId)
+
       return next({
         ctx: {
           lang,
-          token,
+          confirmationNumber,
         },
       })
     })
-    .query(async function ({ ctx, input: { rooms } }) {
-      const getLinkedReservationsCounter = createCounter(
+    .query(async function ({ ctx: { confirmationNumber, lang } }) {
+      const linkedReservationsCounter = createCounter(
         "trpc.booking",
         "linkedReservations"
       )
-      const metricsGetLinkedReservations = getLinkedReservationsCounter.init({
-        confirmationNumbers: rooms,
+      const metricsLinkedReservations = linkedReservationsCounter.init({
+        confirmationNumber,
       })
 
-      metricsGetLinkedReservations.start()
+      metricsLinkedReservations.start()
 
-      const linkedReservationsResult = await Promise.allSettled(
-        rooms.map((room) =>
-          getBooking(room.confirmationNumber, ctx.lang, ctx.token)
-        )
+      const linkedReservations = await getLinkedReservations(
+        confirmationNumber,
+        lang
       )
-      const linkedReservations = []
-      for (const booking of linkedReservationsResult) {
-        if (booking.status === "fulfilled") {
-          if (booking.value) {
-            linkedReservations.push(booking.value)
-          } else {
-            metricsGetLinkedReservations.dataError(
-              `Unexpected value for linked reservation`
-            )
-          }
-        } else {
-          metricsGetLinkedReservations.dataError(
-            `Failed to get linked reservation`
+
+      if (!linkedReservations) {
+        metricsLinkedReservations.noDataError()
+        return null
+      }
+
+      const validLinkedReservations = linkedReservations.reduce<
+        BookingSchema[]
+      >((acc, linkedReservation) => {
+        if ("error" in linkedReservation) {
+          metricsLinkedReservations.dataError(
+            `Failed to get linked reservations ${linkedReservation.confirmationNumber}`,
+            {
+              linkedReservationConfirmationNumber:
+                linkedReservation.confirmationNumber,
+            }
           )
+          return acc
         }
-      }
 
-      metricsGetLinkedReservations.success()
+        acc.push(linkedReservation)
+        return acc
+      }, [])
 
-      return linkedReservations
+      metricsLinkedReservations.success()
+
+      return validLinkedReservations
     }),
-  status: serviceProcedure.input(getBookingStatusInput).query(async function ({
-    ctx,
-    input,
-  }) {
-    const { confirmationNumber } = input
+  status: serviceProcedure
+    .input(getBookingStatusInput)
+    .use(async ({ input, next }) => {
+      const { confirmationNumber } = parseRefId(input.refId)
 
-    const getBookingStatusCounter = createCounter("trpc.booking", "status")
-    const metricsGetBookingStatus = getBookingStatusCounter.init({
-      confirmationNumber,
-    })
-
-    metricsGetBookingStatus.start()
-
-    const apiResponse = await api.get(
-      api.endpoints.v1.Booking.status(confirmationNumber),
-      {
-        headers: {
-          Authorization: `Bearer ${ctx.serviceToken}`,
+      return next({
+        ctx: {
+          confirmationNumber,
         },
+      })
+    })
+    .query(async function ({ ctx: { confirmationNumber, serviceToken } }) {
+      const getBookingStatusCounter = createCounter("trpc.booking", "status")
+      const metricsGetBookingStatus = getBookingStatusCounter.init({
+        confirmationNumber,
+      })
+
+      metricsGetBookingStatus.start()
+
+      const apiResponse = await api.get(
+        api.endpoints.v1.Booking.status(confirmationNumber),
+        {
+          headers: {
+            Authorization: `Bearer ${serviceToken}`,
+          },
+        }
+      )
+
+      if (!apiResponse.ok) {
+        await metricsGetBookingStatus.httpError(apiResponse)
+        throw serverErrorByStatus(apiResponse.status, apiResponse)
       }
-    )
 
-    if (!apiResponse.ok) {
-      await metricsGetBookingStatus.httpError(apiResponse)
-      throw serverErrorByStatus(apiResponse.status, apiResponse)
-    }
+      const apiJson = await apiResponse.json()
+      const verifiedData = createBookingSchema.safeParse(apiJson)
+      if (!verifiedData.success) {
+        metricsGetBookingStatus.validationError(verifiedData.error)
+        throw badRequestError()
+      }
 
-    const apiJson = await apiResponse.json()
-    const verifiedData = createBookingSchema.safeParse(apiJson)
-    if (!verifiedData.success) {
-      metricsGetBookingStatus.validationError(verifiedData.error)
-      throw badRequestError()
-    }
+      metricsGetBookingStatus.success()
 
-    metricsGetBookingStatus.success()
+      return verifiedData.data
+    }),
+
+  confirmationCompleted: serviceProcedure
+    .input(getConfirmationCompletedInput)
+    .use(async ({ input, next }) => {
+      const { confirmationNumber } = parseRefId(input.refId)
+
+      return next({
+        ctx: {
+          confirmationNumber,
+        },
+      })
+    })
+    .query(async function ({ ctx, input }) {
+      const { confirmationNumber } = ctx
+
+      const confirmationCompletedCounter = createCounter(
+        "trpc.booking",
+        "confirmationCompleted"
+      )
+      const metricsConfirmationCompleted = confirmationCompletedCounter.init({
+        confirmationNumber,
+      })
+
+      metricsConfirmationCompleted.start()
+
+      const apiResponse = await api.get(
+        api.endpoints.v1.Booking.status(confirmationNumber),
+        {
+          headers: {
+            Authorization: `Bearer ${ctx.serviceToken}`,
+          },
+        }
+      )
+
+      if (!apiResponse.ok) {
+        await metricsConfirmationCompleted.httpError(apiResponse)
+        throw serverErrorByStatus(apiResponse.status, apiResponse)
+      }
+
+      const apiJson = await apiResponse.json()
+      const verifiedData = createBookingSchema.safeParse(apiJson)
+      if (!verifiedData.success) {
+        metricsConfirmationCompleted.validationError(verifiedData.error)
+        throw badRequestError()
+      }
+
+      const confirmationUrl =
+        verifiedData.data.reservationStatus ===
+        BookingStatusEnum.BookingCompleted
+          ? `${bookingConfirmation(input.lang)}?RefId=${verifiedData.data.rooms[0].refId}`
+          : ""
+
+      const result = {
+        ...verifiedData.data,
+        redirectUrl: verifiedData.data.paymentUrl || confirmationUrl,
+      }
+
+      metricsConfirmationCompleted.success()
+
+      return result
+    }),
+
+  confirmationError: serviceProcedure
+    .input(getBookingConfirmationErrorInput)
+    .use(async ({ input, next }) => {
+      const { confirmationNumber } = parseRefId(input.refId)
+
+      return next({
+        ctx: {
+          confirmationNumber,
+        },
+      })
+    })
+    .query(async function ({ ctx }) {
+      const { confirmationNumber } = ctx
+
+      const confirmationErrorCounter = createCounter(
+        "trpc.booking",
+        "confirmationError"
+      )
+      const metricsConfirmationError = confirmationErrorCounter.init({
+        confirmationNumber,
+      })
+
+      metricsConfirmationError.start()
+
+      const apiResponse = await api.get(
+        api.endpoints.v1.Booking.status(confirmationNumber),
+        {
+          headers: {
+            Authorization: `Bearer ${ctx.serviceToken}`,
+          },
+        }
+      )
+
+      if (!apiResponse.ok) {
+        await metricsConfirmationError.httpError(apiResponse)
+        throw serverErrorByStatus(apiResponse.status, apiResponse)
+      }
+
+      const apiJson = await apiResponse.json()
+      const verifiedData = createBookingSchema.safeParse(apiJson)
+      if (!verifiedData.success) {
+        metricsConfirmationError.validationError(verifiedData.error)
+        throw badRequestError()
+      }
+
+      metricsConfirmationError.success()
+
+      return verifiedData.data
+    }),
 
-    return verifiedData.data
-  }),
   createRefId: serviceProcedure
     .input(createRefIdInput)
     .mutation(async function ({ input }) {
diff --git a/apps/scandic-web/server/routers/booking/utils.ts b/apps/scandic-web/server/routers/booking/utils.ts
index c983407b4..61dcba01d 100644
--- a/apps/scandic-web/server/routers/booking/utils.ts
+++ b/apps/scandic-web/server/routers/booking/utils.ts
@@ -1,101 +1,134 @@
 import * as api from "@/lib/api"
 import { badRequestError, serverErrorByStatus } from "@/server/errors/trpc"
 import { createCounter } from "@/server/telemetry"
+import { getUserOrServiceToken } from "@/server/tokenManager"
 import { toApiLang } from "@/server/utils"
 
-import { bookingConfirmationSchema, createBookingSchema } from "./output"
+import { getCacheClient } from "@/services/dataCache"
 
-import type { Room } from "@/types/hotel"
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
+import { bookingSchema, createBookingSchema } from "./output"
+
+import type { BookingSchema } from "@/types/trpc/routers/booking/confirmation"
 import type { Lang } from "@/constants/languages"
 
-export function getBookedHotelRoom(
-  rooms: Room[] | undefined,
-  roomTypeCode: BookingConfirmation["booking"]["roomTypeCode"]
-) {
-  if (!rooms?.length || !roomTypeCode) {
-    return null
-  }
-  const room = rooms?.find((r) => {
-    return r.roomTypes.find((roomType) => roomType.code === roomTypeCode)
-  })
-  if (!room) {
-    return null
-  }
-  const bedType = room.roomTypes.find(
-    (roomType) => roomType.code === roomTypeCode
-  )
-  if (!bedType) {
-    return null
-  }
-  return {
-    ...room,
-    bedType,
-  }
-}
-
-export async function getBooking(
-  confirmationNumber: string,
-  lang: Lang,
-  token: string
-) {
+export async function getBooking(confirmationNumber: string, lang: Lang) {
   const getBookingCounter = createCounter("booking", "get")
   const metricsGetBooking = getBookingCounter.init({ confirmationNumber })
 
   metricsGetBooking.start()
 
-  const apiResponse = await api.get(
-    api.endpoints.v1.Booking.booking(confirmationNumber),
-    {
-      headers: {
-        Authorization: `Bearer ${token}`,
-      },
+  const cacheKey = `${lang}:booking:${confirmationNumber}`
+  const cache = await getCacheClient()
+
+  const result: BookingSchema | null = await cache.cacheOrGet(
+    cacheKey,
+    async () => {
+      const token = getUserOrServiceToken()
+
+      const apiResponse = await api.get(
+        api.endpoints.v1.Booking.booking(confirmationNumber),
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        },
+        { language: toApiLang(lang) }
+      )
+
+      if (!apiResponse.ok) {
+        await metricsGetBooking.httpError(apiResponse)
+
+        // If the booking is not found, return null.
+        // This scenario is expected to happen when a logged in user trying to access a booking that doesn't belong to them.
+        if (apiResponse.status === 400) {
+          return null
+        }
+
+        throw serverErrorByStatus(apiResponse.status, apiResponse)
+      }
+
+      const apiJson = await apiResponse.json()
+      const booking = bookingSchema.safeParse(apiJson)
+      if (!booking.success) {
+        metricsGetBooking.validationError(booking.error)
+        throw badRequestError()
+      }
+
+      return booking.data
     },
-    { language: toApiLang(lang) }
+    "1h"
   )
 
-  if (!apiResponse.ok) {
-    await metricsGetBooking.httpError(apiResponse)
-
-    // If the booking is not found, return null.
-    // This scenario is expected to happen when a logged in user trying to access a booking that doesn't belong to them.
-    if (apiResponse.status === 400) {
-      return null
-    }
-
-    throw serverErrorByStatus(apiResponse.status, apiResponse)
-  }
-
-  const apiJson = await apiResponse.json()
-  const booking = bookingConfirmationSchema.safeParse(apiJson)
-  if (!booking.success) {
-    metricsGetBooking.validationError(booking.error)
-    throw badRequestError()
-  }
-
   metricsGetBooking.success()
 
-  return booking.data
+  return result
 }
 
-export async function cancelBooking(
+export async function getBookings(confirmationNumbers: string[], lang: Lang) {
+  const results = await Promise.allSettled(
+    confirmationNumbers.map((confirmationNumber) => {
+      return getBooking(confirmationNumber, lang)
+    })
+  )
+
+  return results.map((result) => {
+    if (result.status === "fulfilled" && result.value) {
+      return result.value
+    }
+    return null
+  })
+}
+
+export async function getLinkedReservations(
   confirmationNumber: string,
-  language: Lang,
-  token: string
+  lang: Lang
 ) {
+  const booking = await getBooking(confirmationNumber, lang)
+
+  if (!booking) {
+    return null
+  }
+
+  if (booking.linkedReservations.length > 0) {
+    const confirmationNumbers = booking.linkedReservations.map(
+      (linkedReservation) => {
+        return linkedReservation.confirmationNumber
+      }
+    )
+
+    const bookings = await getBookings(confirmationNumbers, lang)
+
+    const linkedReservations = bookings.map((booking, i) => {
+      if (booking === null) {
+        return {
+          confirmationNumber: confirmationNumbers[i],
+          error: true,
+        } as const
+      }
+      return booking
+    })
+
+    return linkedReservations
+  }
+
+  return []
+}
+
+export async function cancelBooking(confirmationNumber: string, lang: Lang) {
   const cancelBookingCounter = createCounter("booking", "cancel")
   const metricsCancelBooking = cancelBookingCounter.init({
     confirmationNumber,
-    language,
+    lang,
   })
 
   metricsCancelBooking.start()
 
+  const token = getUserOrServiceToken()
   const headers = {
     Authorization: `Bearer ${token}`,
   }
 
-  const booking = await getBooking(confirmationNumber, language, token)
+  const booking = await getBooking(confirmationNumber, lang)
   if (!booking) {
     metricsCancelBooking.noDataError({ confirmationNumber })
     return null
@@ -107,7 +140,7 @@ export async function cancelBooking(
       headers,
       body: { firstName, lastName, email },
     },
-    { language: toApiLang(language) }
+    { language: toApiLang(lang) }
   )
 
   if (!apiResponse.ok) {
diff --git a/apps/scandic-web/server/tokenManager.ts b/apps/scandic-web/server/tokenManager.ts
index 0044ed891..6e7c42343 100644
--- a/apps/scandic-web/server/tokenManager.ts
+++ b/apps/scandic-web/server/tokenManager.ts
@@ -3,7 +3,9 @@ import { trace, type Tracer } from "@opentelemetry/api"
 import { env } from "@/env/server"
 import { createCounter } from "@/server/telemetry"
 
+import { auth } from "@/auth"
 import { getCacheClient } from "@/services/dataCache"
+import { isValidSession } from "@/utils/session"
 
 import type { ServiceTokenResponse } from "@/types/tokens"
 
@@ -117,3 +119,12 @@ async function fetchServiceToken(scopes: string[]) {
 function getServiceTokenCacheKey(scopes: string[]): string {
   return `serviceToken:${scopes.join(",")}`
 }
+
+export async function getUserOrServiceToken() {
+  const serviceToken = await getServiceToken()
+  const session = await auth()
+
+  return isValidSession(session)
+    ? session.token.access_token
+    : serviceToken.access_token
+}
diff --git a/apps/scandic-web/stores/my-stay/index.ts b/apps/scandic-web/stores/my-stay/index.ts
index fd6544ebc..13bfcf441 100644
--- a/apps/scandic-web/stores/my-stay/index.ts
+++ b/apps/scandic-web/stores/my-stay/index.ts
@@ -3,8 +3,6 @@ import { produce } from "immer"
 import { useContext } from "react"
 import { create, useStore } from "zustand"
 
-import { getBookedHotelRoom } from "@/server/routers/booking/utils"
-
 import { mapRoomDetails } from "@/components/HotelReservation/MyStay/utils/mapRoomDetails"
 import { MyStayContext } from "@/contexts/MyStay"
 
@@ -14,7 +12,34 @@ import {
   isAllRoomsCancelled,
 } from "./helpers"
 
+import type { Room } from "@/types/hotel"
 import type { InitialState, MyStayState } from "@/types/stores/my-stay"
+import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
+
+export function getBookedHotelRoom(
+  rooms: Room[] | undefined,
+  roomTypeCode: BookingConfirmation["booking"]["roomTypeCode"]
+) {
+  if (!rooms?.length || !roomTypeCode) {
+    return null
+  }
+  const room = rooms?.find((r) => {
+    return r.roomTypes.find((roomType) => roomType.code === roomTypeCode)
+  })
+  if (!room) {
+    return null
+  }
+  const bedType = room.roomTypes.find(
+    (roomType) => roomType.code === roomTypeCode
+  )
+  if (!bedType) {
+    return null
+  }
+  return {
+    ...room,
+    bedType,
+  }
+}
 
 export function createMyStayStore({
   breakfastPackages,
diff --git a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/actions/addToCalendar.ts b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/actions/addToCalendar.ts
index bf7aee437..c62d5cd54 100644
--- a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/actions/addToCalendar.ts
+++ b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/actions/addToCalendar.ts
@@ -1,12 +1,8 @@
 import type { EventAttributes } from "ics"
 
-import type { RouterOutput } from "@/lib/trpc/client"
-
 export interface AddToCalendarProps {
-  checkInDate: NonNullable<
-    RouterOutput["booking"]["get"]
-  >["booking"]["checkInDate"]
+  checkInDate: Date
   event: EventAttributes
-  hotelName: NonNullable<RouterOutput["booking"]["get"]>["hotel"]["name"]
+  hotelName: string
   renderButton: (onPress: () => Promise<void>) => React.ReactNode
 }
diff --git a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/actions/manageBooking.ts b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/actions/manageBooking.ts
index 5b10c25fb..2fbd1ef05 100644
--- a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/actions/manageBooking.ts
+++ b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/actions/manageBooking.ts
@@ -1,3 +1,3 @@
 export interface ManageBookingProps {
-  bookingUrl: string
+  refId: string
 }
diff --git a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/bookingConfirmation.ts b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/bookingConfirmation.ts
index 609fe53d2..dd7842f34 100644
--- a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/bookingConfirmation.ts
+++ b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/bookingConfirmation.ts
@@ -1,23 +1,19 @@
 import type { Room } from "@/types/hotel"
 import type {
   BookingConfirmation,
-  BookingConfirmationSchema,
+  BookingSchema,
 } from "@/types/trpc/routers/booking/confirmation"
 
-export interface BookingConfirmationProps {
-  confirmationNumber: string
-}
-
 export interface BookingConfirmationRoom extends Room {
   bedType: Room["roomTypes"][number]
 }
 
 export interface ConfirmationProps
-  extends Pick<BookingConfirmation, "booking" | "hotel"> {
+  extends Pick<BookingConfirmation, "booking" | "hotelData"> {
   room: BookingConfirmationRoom
   refId: string
 }
 
 export interface BookingConfirmationAlertsProps {
-  booking: BookingConfirmationSchema
+  booking: BookingSchema
 }
diff --git a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/header.ts b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/header.ts
index 1fe7aaa21..13f80856c 100644
--- a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/header.ts
+++ b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/header.ts
@@ -1,9 +1,7 @@
-import type { MutableRefObject } from "react"
-
 import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
 
-export interface BookingConfirmationHeaderProps
-  extends Pick<BookingConfirmation, "booking" | "hotel"> {
-  mainRef: MutableRefObject<HTMLElement | null>
+export interface BookingConfirmationHeaderProps {
+  booking: BookingConfirmation["booking"]
+  hotel: BookingConfirmation["hotelData"]["hotel"]
   refId: string
 }
diff --git a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/hotelDetails.ts b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/hotelDetails.ts
index f121e0aba..1e335703a 100644
--- a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/hotelDetails.ts
+++ b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/hotelDetails.ts
@@ -1,5 +1,5 @@
 import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
 
 export interface BookingConfirmationHotelDetailsProps {
-  hotel: BookingConfirmation["hotel"]
+  hotel: BookingConfirmation["hotelData"]["hotel"]
 }
diff --git a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms.ts b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms.ts
index 1c29fc0d3..a6ce40f75 100644
--- a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms.ts
+++ b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms.ts
@@ -1,11 +1,5 @@
-import type { z } from "zod"
-
 import type { Room } from "@/types/hotel"
 import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
-import type { linkedReservationSchema } from "@/server/routers/booking/output"
-
-export interface LinkedReservationSchema
-  extends z.output<typeof linkedReservationSchema> {}
 
 export interface BookingConfirmationRoomsProps
   extends Pick<BookingConfirmation, "booking"> {
@@ -14,5 +8,4 @@ export interface BookingConfirmationRoomsProps
   }
   checkInTime: string
   checkOutTime: string
-  linkedReservations: LinkedReservationSchema[]
 }
diff --git a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms/linkedReservation.ts b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms/linkedReservation.ts
index a03adeb20..ddd1209e8 100644
--- a/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms/linkedReservation.ts
+++ b/apps/scandic-web/types/components/hotelReservation/bookingConfirmation/rooms/linkedReservation.ts
@@ -1,7 +1,7 @@
 export interface LinkedReservationProps {
   checkInTime: string
   checkOutTime: string
-  confirmationNumber: string
+  refId: string
   roomIndex: number
 }
 
diff --git a/apps/scandic-web/types/components/myPages/myStay/ancillaries.ts b/apps/scandic-web/types/components/myPages/myStay/ancillaries.ts
index 6e372a5bd..3ba618866 100644
--- a/apps/scandic-web/types/components/myPages/myStay/ancillaries.ts
+++ b/apps/scandic-web/types/components/myPages/myStay/ancillaries.ts
@@ -23,6 +23,7 @@ export interface AncillariesProps extends Pick<BookingConfirmation, "booking"> {
 export interface AddedAncillariesProps {
   ancillaries: Ancillary["ancillaryContent"][number][] | null
   booking: BookingConfirmation["booking"]
+  refId: string
 }
 
 export interface AncillaryProps {
diff --git a/apps/scandic-web/types/stores/my-stay.ts b/apps/scandic-web/types/stores/my-stay.ts
index a9492ec2b..1f527a85e 100644
--- a/apps/scandic-web/types/stores/my-stay.ts
+++ b/apps/scandic-web/types/stores/my-stay.ts
@@ -30,6 +30,7 @@ export type Room = Pick<
   | "linkedReservations"
   | "multiRoom"
   | "rateDefinition"
+  | "refId"
   | "reservationStatus"
   | "roomPoints"
   | "roomTypeCode"
diff --git a/apps/scandic-web/types/trpc/routers/booking/confirmation.ts b/apps/scandic-web/types/trpc/routers/booking/confirmation.ts
index 4b6e6f5eb..479af5ea3 100644
--- a/apps/scandic-web/types/trpc/routers/booking/confirmation.ts
+++ b/apps/scandic-web/types/trpc/routers/booking/confirmation.ts
@@ -2,20 +2,20 @@ import type { z } from "zod"
 
 import type { HotelData, Room } from "@/types/hotel"
 import type {
-  bookingConfirmationSchema,
+  bookingSchema,
   packageSchema,
 } from "@/server/routers/booking/output"
 
-export interface BookingConfirmationSchema
-  extends z.output<typeof bookingConfirmationSchema> {}
+export interface BookingSchema extends z.output<typeof bookingSchema> {}
 
 export interface PackageSchema extends z.output<typeof packageSchema> {}
 
-export interface BookingConfirmation extends HotelData {
-  booking: BookingConfirmationSchema
-  room:
-    | (Room & {
-        bedType: Room["roomTypes"][number]
-      })
-    | null
+export interface BookingConfirmationRoom extends Room {
+  bedType: Room["roomTypes"][number]
+}
+
+export interface BookingConfirmation {
+  booking: BookingSchema
+  hotelData: HotelData
+  room: BookingConfirmationRoom
 }