diff --git a/templates/cassiopeia/html/layouts/chromes/card.php b/templates/cassiopeia/html/layouts/chromes/card.php
index f5075160b1a33..bec5053ac24de 100644
--- a/templates/cassiopeia/html/layouts/chromes/card.php
+++ b/templates/cassiopeia/html/layouts/chromes/card.php
@@ -21,34 +21,18 @@
 }
 
 $moduleTag              = $params->get('module_tag', 'div');
-$moduleAttribs          = [];
 $moduleAttribs['class'] = $module->position . ' card ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
-$headerTag              = htmlspecialchars($params->get('header_tag', 'h4'), ENT_QUOTES, 'UTF-8');
+$modId                  = 'mod-' . $module->id;
+$headerTag              = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
-$headerAttribs          = [];
-$headerAttribs['class'] = $headerClass;
 
-if ($module->showtitle) :
-	$moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
-	$headerAttribs['id']             = 'mod-' . $module->id;
-
-	if ($headerClass !== 'card-title') :
-		$headerAttribs['class'] .= 'card-header ' . $headerClass;
-	endif;
-else:
-	$moduleAttribs['aria-label'] = $module->title;
-endif;
-
-$header = '<' . $headerTag . ' ' . ArrayHelper::toString($headerAttribs) . '>' . $module->title . '</' . $headerTag . '>';
-?>
-<<?php echo $moduleTag; ?> <?php echo ArrayHelper::toString($moduleAttribs); ?>>
-	<?php if ($module->showtitle && $headerClass !== 'card-title') : ?>
-		<?php echo $header; ?>
-	<?php endif; ?>
-	<div class="card-body">
-		<?php if ($module->showtitle && $headerClass === 'card-title') : ?>
-			<?php echo $header; ?>
-		<?php endif; ?>
-		<?php echo $module->content; ?>
-	</div>
-</<?php echo $moduleTag; ?>>
+if ($module->showtitle) : ?>
+	<<?php echo $moduleTag; ?> class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $modId; ?>">
+		<<?php echo $headerTag; ?> id="<?php echo $modId; ?>" class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+		<div class="card-body"><?php echo $module->content; ?></div>
+	</<?php echo $moduleTag; ?>>
+<?php else : ?>
+	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-label="<?php echo $module->title; ?>">
+		<div class="card-body"><?php echo $module->content; ?></div>
+	</<?php echo $moduleTag; ?>>
+<?php endif; ?>