diff --git a/templates/hydrogen-theme/app/components/CollectionCard.tsx b/templates/hydrogen-theme/app/components/CollectionCard.tsx
index 0113957..1df0693 100644
--- a/templates/hydrogen-theme/app/components/CollectionCard.tsx
+++ b/templates/hydrogen-theme/app/components/CollectionCard.tsx
@@ -18,7 +18,7 @@ export function CollectionCard(props: {
 
   return (
     <div className="overflow-hidden rounded-lg border">
-      <Link prefetch="viewport" to={`/collections/${collection.handle}`}>
+      <Link prefetch="intent" to={`/collections/${collection.handle}`}>
         {collection.image && (
           <Image
             aspectRatio="16/9"
diff --git a/templates/hydrogen-theme/app/components/ProductCard.tsx b/templates/hydrogen-theme/app/components/ProductCard.tsx
index dcf093e..082b7ac 100644
--- a/templates/hydrogen-theme/app/components/ProductCard.tsx
+++ b/templates/hydrogen-theme/app/components/ProductCard.tsx
@@ -25,7 +25,7 @@ export function ProductCard(props: {
   return (
     <div className="overflow-hidden rounded-lg border">
       {!skeleton && product && firstVariant ? (
-        <Link prefetch="viewport" to={`/products/${product.handle}`}>
+        <Link prefetch="intent" to={`/products/${product.handle}`}>
           {firstVariant?.image && (
             <Image
               aspectRatio="16/9"
diff --git a/templates/hydrogen-theme/app/components/product/MediaGallery.tsx b/templates/hydrogen-theme/app/components/product/MediaGallery.tsx
index acecfa7..673324e 100644
--- a/templates/hydrogen-theme/app/components/product/MediaGallery.tsx
+++ b/templates/hydrogen-theme/app/components/product/MediaGallery.tsx
@@ -20,6 +20,7 @@ export function MediaGallery() {
               data={media}
               mediaOptions={{
                 image: {
+                  loading: 'eager',
                   sizes: '(min-width: 1024px) 50vw, 100vw',
                 },
               }}
diff --git a/templates/hydrogen-theme/app/components/sanity/link/SanityInternalLink.tsx b/templates/hydrogen-theme/app/components/sanity/link/SanityInternalLink.tsx
index 3f6f678..9e1536f 100644
--- a/templates/hydrogen-theme/app/components/sanity/link/SanityInternalLink.tsx
+++ b/templates/hydrogen-theme/app/components/sanity/link/SanityInternalLink.tsx
@@ -47,7 +47,7 @@ export function SanityInternalLink(props: {
 
   // Todo: add Navlink support
   return (
-    <Link className={className} prefetch="viewport" to={url}>
+    <Link className={className} prefetch="intent" to={url}>
       {children ? children : name}
     </Link>
   );
diff --git a/templates/hydrogen-theme/app/routes/($locale).collections.$collectionHandle.tsx b/templates/hydrogen-theme/app/routes/($locale).collections.$collectionHandle.tsx
index fd57b18..0facda3 100644
--- a/templates/hydrogen-theme/app/routes/($locale).collections.$collectionHandle.tsx
+++ b/templates/hydrogen-theme/app/routes/($locale).collections.$collectionHandle.tsx
@@ -137,7 +137,12 @@ export default function Collection() {
       {collection.image && (
         <section>
           <div className="relative h-80 w-full overflow-hidden">
-            <Image className="" crop="center" data={collection.image} />
+            <Image
+              crop="center"
+              data={collection.image}
+              loading="eager"
+              sizes="100vw"
+            />
             <div className="absolute inset-0">
               <div className="flex h-full items-center justify-center text-white">
                 <h1>{collection.title}</h1>