diff --git a/blockbase/block-templates/header-footer-only.html b/blockbase/block-templates/header-footer-only.html
index 1cacba72c8..f43c656423 100644
--- a/blockbase/block-templates/header-footer-only.html
+++ b/blockbase/block-templates/header-footer-only.html
@@ -1,6 +1,6 @@
 <!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
+<!-- wp:group {"tagName":"main"} -->
 <main class="wp-block-group">
 
 <!-- wp:post-content {"layout":{"inherit":true}} /-->
diff --git a/blockbase/block-templates/search.html b/blockbase/block-templates/search.html
index 8b94a0c5bd..778e793c22 100644
--- a/blockbase/block-templates/search.html
+++ b/blockbase/block-templates/search.html
@@ -1,4 +1,4 @@
-<!-- wp:template-part {"slug":"header","tagName":"header","layout":{"inherit":true}} /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
 
 <!-- wp:group {"layout":{"inherit":true},"tagName":"main"} -->
 <main class="wp-block-group">
diff --git a/blockbase/block-templates/singular.html b/blockbase/block-templates/singular.html
index 27d205d9d7..39955d08f1 100644
--- a/blockbase/block-templates/singular.html
+++ b/blockbase/block-templates/singular.html
@@ -6,11 +6,11 @@
 </div>
 <!-- /wp:group -->
 
-<!-- wp:group {"tagName":"main","layout":{"inherit":true}} -->
+<!-- wp:group {"tagName":"main"} -->
 <main class="wp-block-group">
 <!-- wp:post-featured-image {"align":"full"} /-->
 
-<!-- wp:post-content /-->
+<!-- wp:post-content {"layout":{"inherit":true}} /-->
 </main>
 <!-- /wp:group -->