diff --git a/src/components/blocks/CardGridBlock.tsx b/src/components/blocks/CardGridBlock.tsx
index a6ba31d..c6cf7ce 100644
--- a/src/components/blocks/CardGridBlock.tsx
+++ b/src/components/blocks/CardGridBlock.tsx
@@ -13,7 +13,7 @@ interface CardGridBlockProps {
 }
 
 export function CardGridBlock({ block }: CardGridBlockProps) {
-  const title = (block.title as string) || (block.headline as string) || ''
+  const title = (block.headline as string) || (block.title as string) || ''
   const subtitle = (block.subtitle as string) || ''
   const cards = (block.cards as Array<Record<string, unknown>>) || []
   const columns = (block.columns as number) || 3
@@ -46,9 +46,8 @@ export function CardGridBlock({ block }: CardGridBlockProps) {
             const iconPosition = (card.iconPosition as string) || 'top'
             const cardImage = card.image as Record<string, unknown> | undefined
             const cardImageUrl = cardImage?.url as string | undefined
-            const cardLink = card.link as Record<string, unknown> | undefined
-            const cardLinkLabel = (cardLink?.label as string) || 'Mehr erfahren'
-            const cardLinkHref = (cardLink?.href as string) || (cardLink?.url as string) || ''
+            const cardLinkHref = (card.link as string) || ''
+            const cardLinkLabel = (card.linkText as string) || 'Mehr erfahren'
 
             const isIconLeft = mediaType === 'icon' && iconPosition === 'left'