diff --git a/templates/parts/checkout-header.html b/templates/parts/checkout-header.html
index 7daff0ec92c..9243db28853 100644
--- a/templates/parts/checkout-header.html
+++ b/templates/parts/checkout-header.html
@@ -1,9 +1,9 @@
-<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group">
+<!-- wp:group {"tagName":"header","area":"header","metadata":{"name":"Checkout Header"},"layout":{"type":"constrained"}} -->
+<header class="wp-block-group">
 	<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"var:preset|spacing|40"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
 	<div class="wp-block-group alignwide" style="padding-bottom:var(--wp--preset--spacing--40)">
 		<!-- wp:site-title {"level":0} /-->
 	</div>
 	<!-- /wp:group -->
-</div>
-<!-- /wp:group -->
\ No newline at end of file
+</header>
+<!-- /wp:group -->
diff --git a/templates/templates/blockified/page-checkout.html b/templates/templates/blockified/page-checkout.html
index 28ae99cef01..0467ea4fd2a 100644
--- a/templates/templates/blockified/page-checkout.html
+++ b/templates/templates/blockified/page-checkout.html
@@ -8,4 +8,4 @@
 	<!-- wp:post-content {"align":"wide"} /-->
 	<!-- /wp:woocommerce/page-content-wrapper -->
 </div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- /wp:group -->
diff --git a/templates/templates/page-checkout.html b/templates/templates/page-checkout.html
index 28ae99cef01..0467ea4fd2a 100644
--- a/templates/templates/page-checkout.html
+++ b/templates/templates/page-checkout.html
@@ -8,4 +8,4 @@
 	<!-- wp:post-content {"align":"wide"} /-->
 	<!-- /wp:woocommerce/page-content-wrapper -->
 </div>
-<!-- /wp:group -->
\ No newline at end of file
+<!-- /wp:group -->