diff --git a/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.module.css b/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.module.css
index e7f7cf928..d6c36de71 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.module.css
+++ b/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.module.css
@@ -1,8 +1,3 @@
-.header {
-  margin-top: var(--Spacing-x2);
-  margin-bottom: var(--Spacing-x2);
-}
-
 .hotelInfo {
   margin-bottom: 64px;
 }
@@ -20,22 +15,3 @@
   margin-left: auto;
   margin-right: auto;
 }
-
-.page input[type="radio"] {
-  opacity: 0;
-  position: fixed;
-  width: 0;
-}
-
-.roomList {
-  margin-top: var(--Spacing-x4);
-  list-style: none;
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
-  column-gap: var(--Spacing-x2);
-  row-gap: var(--Spacing-x4);
-}
-
-.roomList > li {
-  width: 100%;
-}
diff --git a/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.tsx
index 353ab430b..fd6fed22c 100644
--- a/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.tsx
+++ b/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.tsx
@@ -1,13 +1,10 @@
 import { serverClient } from "@/lib/trpc/server"
 
-import RoomCard from "@/components/HotelReservation/SelectRate/RoomCard"
-import Header from "@/components/Section/Header"
-import { getIntl } from "@/i18n"
+import RoomSelection from "@/components/HotelReservation/SelectRate/RoomSelection"
 
 import styles from "./page.module.css"
 
 export default async function SelectRate() {
-  const { formatMessage } = await getIntl()
   const rooms = await serverClient().hotel.getRates({
     // TODO: pass the correct hotel ID and all other parameters that should be included in the search
     hotelId: "1",
@@ -17,34 +14,7 @@ export default async function SelectRate() {
     <div className={styles.page}>
       <main className={styles.content}>
         <div className={styles.hotelInfo}>Hotel info TBI</div>
-        <div className={styles.header}>
-          <Header
-            title={formatMessage({ id: "Choose room" })}
-            subtitle={formatMessage({
-              id: "Which room class suits you the best?",
-            })}
-            link={{
-              href: "#",
-              text: formatMessage({
-                id: "All rooms comes with standard amenities",
-              }),
-            }}
-          />
-        </div>
-
-        <ul className={styles.roomList}>
-          {rooms.map((room) => (
-            <li key={room.id}>
-              <input
-                type="radio"
-                name="room"
-                value={room.id}
-                id={`room-${room.id}`}
-              />
-              <RoomCard room={room} />
-            </li>
-          ))}
-        </ul>
+        <RoomSelection rooms={rooms} />
       </main>
     </div>
   )
diff --git a/components/HotelReservation/SelectRate/RoomCard/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx
similarity index 100%
rename from components/HotelReservation/SelectRate/RoomCard/index.tsx
rename to components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx
diff --git a/components/HotelReservation/SelectRate/RoomCard/roomCard.module.css b/components/HotelReservation/SelectRate/RoomSelection/RoomCard/roomCard.module.css
similarity index 100%
rename from components/HotelReservation/SelectRate/RoomCard/roomCard.module.css
rename to components/HotelReservation/SelectRate/RoomSelection/RoomCard/roomCard.module.css
diff --git a/components/HotelReservation/SelectRate/RoomSelection/index.tsx b/components/HotelReservation/SelectRate/RoomSelection/index.tsx
new file mode 100644
index 000000000..1b802581f
--- /dev/null
+++ b/components/HotelReservation/SelectRate/RoomSelection/index.tsx
@@ -0,0 +1,45 @@
+import Header from "@/components/Section/Header"
+import { getIntl } from "@/i18n"
+
+import RoomCard from "./RoomCard"
+
+import styles from "./roomSelection.module.css"
+
+import { RoomSelectionProps } from "@/types/components/hotelReservation/selectRate/roomSelection"
+
+export default async function RoomSelection({ rooms }: RoomSelectionProps) {
+  const { formatMessage } = await getIntl()
+
+  return (
+    <div>
+      <div className={styles.header}>
+        <Header
+          title={formatMessage({ id: "Choose room" })}
+          subtitle={formatMessage({
+            id: "Which room class suits you the best?",
+          })}
+          link={{
+            href: "#",
+            text: formatMessage({
+              id: "All rooms comes with standard amenities",
+            }),
+          }}
+        />
+      </div>
+
+      <ul className={styles.roomList}>
+        {rooms.map((room) => (
+          <li key={room.id}>
+            <input
+              type="radio"
+              name="room"
+              value={room.id}
+              id={`room-${room.id}`}
+            />
+            <RoomCard room={room} />
+          </li>
+        ))}
+      </ul>
+    </div>
+  )
+}
diff --git a/components/HotelReservation/SelectRate/RoomSelection/roomSelection.module.css b/components/HotelReservation/SelectRate/RoomSelection/roomSelection.module.css
new file mode 100644
index 000000000..a559b3f52
--- /dev/null
+++ b/components/HotelReservation/SelectRate/RoomSelection/roomSelection.module.css
@@ -0,0 +1,23 @@
+.header {
+  margin-top: var(--Spacing-x2);
+  margin-bottom: var(--Spacing-x2);
+}
+
+.roomList {
+  margin-top: var(--Spacing-x4);
+  list-style: none;
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  column-gap: var(--Spacing-x2);
+  row-gap: var(--Spacing-x4);
+}
+
+.roomList > li {
+  width: 100%;
+}
+
+.roomList input[type="radio"] {
+  opacity: 0;
+  position: fixed;
+  width: 0;
+}
diff --git a/types/components/hotelReservation/selectRate/roomSelection.ts b/types/components/hotelReservation/selectRate/roomSelection.ts
new file mode 100644
index 000000000..be21abaed
--- /dev/null
+++ b/types/components/hotelReservation/selectRate/roomSelection.ts
@@ -0,0 +1,5 @@
+import { Rate } from "@/server/routers/hotels/output"
+
+export type RoomSelectionProps = {
+  rooms: Rate[]
+}