diff --git a/components/ContentType/HotelPage/AmenitiesList/index.tsx b/components/ContentType/HotelPage/AmenitiesList/index.tsx
index 06483f434..ff4ef9110 100644
--- a/components/ContentType/HotelPage/AmenitiesList/index.tsx
+++ b/components/ContentType/HotelPage/AmenitiesList/index.tsx
@@ -10,13 +10,11 @@ import { getLang } from "@/i18n/serverContext"
 
 import styles from "./amenitiesList.module.css"
 
-import type { Amenities } from "@/types/hotel"
+import type { AmentiesListProps } from "@/types/components/hotelPage/amenities"
 
 export default async function AmenitiesList({
   detailedFacilities,
-}: {
-  detailedFacilities: Amenities
-}) {
+}: AmentiesListProps) {
   const intl = await getIntl()
   const sortedAmenities = detailedFacilities
     .sort((a, b) => b.sortOrder - a.sortOrder)
diff --git a/components/ContentType/HotelPage/Facilities/CardGrid/index.tsx b/components/ContentType/HotelPage/Facilities/CardGrid/index.tsx
index 924d2c1ed..4a587d1ae 100644
--- a/components/ContentType/HotelPage/Facilities/CardGrid/index.tsx
+++ b/components/ContentType/HotelPage/Facilities/CardGrid/index.tsx
@@ -24,15 +24,10 @@ export default async function CardGrid({ facilities }: CardGridProps) {
   return (
     <section id={imageCard.card?.id}>
       <Grids.Stackable className={styles.desktopGrid}>
-        {facilities.map((card: CardProps, idx: number) => (
+        {facilities.map((card: CardProps) => (
           <Card
             theme={card.theme || "primaryDark"}
-            key={
-              card.id ||
-              (card.title && `${card.title}-${idx}`) ||
-              (card.heading && `${card.heading}-${idx}`) ||
-              idx
-            }
+            key={card.id}
             scriptedTopTitle={card.scriptedTopTitle}
             heading={card.heading}
             bodyText={card.bodyText}
diff --git a/components/ContentType/HotelPage/Facilities/index.tsx b/components/ContentType/HotelPage/Facilities/index.tsx
index 2b74c629d..4dba3926d 100644
--- a/components/ContentType/HotelPage/Facilities/index.tsx
+++ b/components/ContentType/HotelPage/Facilities/index.tsx
@@ -17,16 +17,16 @@ export default async function Facilities({ facilities }: FacilityProps) {
 
   // Put activities card at the end
   const activitiesIdx = facilities.findIndex(
-    (facility) => facility[0].id == activities[lang]
+    (facility) => facility[0].id === activities[lang]
   )
-  if (activitiesIdx != -1) {
+  if (activitiesIdx !== -1) {
     facilities.push(facilities.splice(activitiesIdx, 1)[0])
   }
 
   return (
     <SectionContainer className={styles.grid}>
-      {facilities.map((facilityCards: FacilityCards, idx: number) => (
-        <CardGrid key={`grid_${idx}`} facilities={facilityCards} />
+      {facilities.map((facilityCards: FacilityCards) => (
+        <CardGrid key={facilityCards[0].id} facilities={facilityCards} />
       ))}
     </SectionContainer>
   )
diff --git a/components/ContentType/HotelPage/index.tsx b/components/ContentType/HotelPage/index.tsx
index b48f97b62..a66a7afb7 100644
--- a/components/ContentType/HotelPage/index.tsx
+++ b/components/ContentType/HotelPage/index.tsx
@@ -51,9 +51,9 @@ export default async function HotelPage() {
     facilityCards,
   } = hotelData
 
-  const facilities = setFacilityCards(facilityCards, hotelDetailedFacilities)
-
+  const facilities = setFacilityCards(facilityCards)
   activitiesCard && facilities.push(setActivityCard(activitiesCard))
+
   const topThreePois = pointsOfInterest.slice(0, 3)
 
   const coordinates = {
diff --git a/components/TempDesignSystem/Card/CardImage/index.tsx b/components/TempDesignSystem/Card/CardImage/index.tsx
index 876316c8c..dc9c4f7f9 100644
--- a/components/TempDesignSystem/Card/CardImage/index.tsx
+++ b/components/TempDesignSystem/Card/CardImage/index.tsx
@@ -15,16 +15,10 @@ export default function CardImage({
     <article className={`${styles.container} ${className}`}>
       <div className={styles.imageContainer}>
         {imageCards.map(
-          ({ backgroundImage }, idx: Number) =>
+          ({ backgroundImage }) =>
             backgroundImage && (
               <Image
-                key={
-                  (backgroundImage.title &&
-                    `${backgroundImage.title}-${idx}`) ||
-                  (backgroundImage.meta.caption &&
-                    `${backgroundImage.meta.caption}-${idx}`) ||
-                  backgroundImage.url
-                }
+                key={backgroundImage.id}
                 src={backgroundImage.url}
                 className={styles.image}
                 alt={backgroundImage.title}
diff --git a/server/routers/hotels/output.ts b/server/routers/hotels/output.ts
index 1856f2243..0d3e75ce3 100644
--- a/server/routers/hotels/output.ts
+++ b/server/routers/hotels/output.ts
@@ -791,4 +791,3 @@ export const apiLocationsSchema = z.object({
         })
     ),
 })
-export type Facility = z.infer<typeof facilitySchema> & { id: string }
diff --git a/types/components/cardImage.ts b/types/components/cardImage.ts
index 6ba7838eb..0693fad65 100644
--- a/types/components/cardImage.ts
+++ b/types/components/cardImage.ts
@@ -1,6 +1,6 @@
 import type { CardProps } from "@/components/TempDesignSystem/Card/card"
 
 export interface CardImageProps extends React.HTMLAttributes<HTMLDivElement> {
-  card: CardProps | undefined
+  card?: CardProps
   imageCards: Pick<CardProps, "backgroundImage">[]
 }
diff --git a/types/components/hotelPage/amenities.ts b/types/components/hotelPage/amenities.ts
new file mode 100644
index 000000000..419a850a3
--- /dev/null
+++ b/types/components/hotelPage/amenities.ts
@@ -0,0 +1,5 @@
+import type { Amenities } from "@/types/hotel"
+
+export type AmentiesListProps = {
+  detailedFacilities: Amenities
+}
diff --git a/types/components/image.ts b/types/components/image.ts
index 0284eaa29..972c521d6 100644
--- a/types/components/image.ts
+++ b/types/components/image.ts
@@ -1,4 +1,5 @@
 export type ApiImage = {
+  id: string
   url: string
   title: string
   meta: {
diff --git a/utils/facilityCards.ts b/utils/facilityCards.ts
index 051679e9a..d2897d1df 100644
--- a/utils/facilityCards.ts
+++ b/utils/facilityCards.ts
@@ -77,7 +77,7 @@ async function setCardProps(
   return card
 }
 
-export function setFacilityCards(facilities: Facility[], amenities: Amenities) {
+export function setFacilityCards(facilities: Facility[]) {
   const lang = getLang()
   const cards: Facilities = []
 
@@ -88,6 +88,7 @@ export function setFacilityCards(facilities: Facility[], amenities: Amenities) {
     facility.heroImages.slice(0, 2).forEach((image) => {
       // Can be a maximum 2 images per grid
       const img: CardProps = {}
+      img.id = image.imageSizes.large
       ;(img.backgroundImage = {
         url: image.imageSizes.large,
         title: image.metaData.title,
@@ -95,6 +96,7 @@ export function setFacilityCards(facilities: Facility[], amenities: Amenities) {
           alt: image.metaData.altText,
           caption: image.metaData.altText_En,
         },
+        id: image.imageSizes.large,
       }),
         (img.theme = "image")
       grid.push(img)
@@ -143,10 +145,10 @@ export function setFacilityCards(facilities: Facility[], amenities: Amenities) {
 export function getRestaurantHeading(amenities: Amenities): RestaurantHeadings {
   const hasBar = amenities.some(
     (facility) =>
-      facility.id == FacilityIds.bar || facility.id == FacilityIds.rooftopBar
+      facility.id === FacilityIds.bar || facility.id === FacilityIds.rooftopBar
   )
   const hasRestaurant = amenities.some(
-    (facility) => facility.id == FacilityIds.restaurant
+    (facility) => facility.id === FacilityIds.restaurant
   )
 
   if (hasBar && hasRestaurant) {