diff --git a/assets/js/atomic/blocks/product-elements/add-to-cart-form/style.scss b/assets/js/atomic/blocks/product-elements/add-to-cart-form/style.scss
index 4752f860783..ebaed422715 100644
--- a/assets/js/atomic/blocks/product-elements/add-to-cart-form/style.scss
+++ b/assets/js/atomic/blocks/product-elements/add-to-cart-form/style.scss
@@ -3,4 +3,5 @@
 	.woocommerce-grouped-product-list-item__price del {
 		font-size: var(--wp--preset--font-size--large);
 	}
+	width: unset;
 }
diff --git a/templates/templates/blockified/single-product.html b/templates/templates/blockified/single-product.html
index 618465353b3..6d0502655ce 100644
--- a/templates/templates/blockified/single-product.html
+++ b/templates/templates/blockified/single-product.html
@@ -1,39 +1,64 @@
-<!-- wp:template-part {"slug":"header"} /-->
-<!-- wp:group {"className":"woocommerce product","layout":{"type":"constrained","contentSize":"1000px"}} -->
-<div class="wp-block-group woocommerce product"><!-- wp:woocommerce/breadcrumbs /-->
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+
+<!-- wp:group {"layout":{"type":"constrained","contentSize":"1000px"}} -->
+<div class="wp-block-group"><!-- wp:woocommerce/breadcrumbs /-->
 
 	<!-- wp:columns -->
-	<div class="wp-block-columns"><!-- wp:column {"style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"constrained","justifyContent":"right"}} -->
-	<div class="wp-block-column" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0"><!-- wp:woocommerce/product-image-gallery /--></div>
-	<!-- /wp:column -->
+	<div class="wp-block-columns">
+		<!-- wp:column {"style":{"spacing":{"padding":{"top":"0","right":"0","bottom":"0","left":"0"}}},"layout":{"type":"constrained","justifyContent":"right"}} -->
+		<div class="wp-block-column" style="padding-top:0;padding-right:0;padding-bottom:0;padding-left:0">
+			<!-- wp:woocommerce/product-image-gallery /-->
+		</div>
+		<!-- /wp:column -->
+
+		<!-- wp:column -->
+		<div class="wp-block-column">
+			<!-- wp:post-title {"__woocommerceNamespace":"woocommerce/product-query/product-title"} /-->
+
+			<!-- wp:post-excerpt {"__woocommerceNamespace":"woocommerce/product-query/product-summary"} /-->
+
+			<!-- wp:woocommerce/product-price /-->
 
-	<!-- wp:column -->
-	<div class="wp-block-column"><!-- wp:post-title {"__woocommerceNamespace":"woocommerce/product-query/product-title"} /-->
+			<!-- wp:woocommerce/add-to-cart-form /-->
 
-	<!-- wp:post-excerpt {"__woocommerceNamespace":"woocommerce/product-query/product-summary"} /-->
+			<!-- wp:woocommerce/product-meta -->
+			<div class="wp-block-woocommerce-product-meta">
+				<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+				<div class="wp-block-group">
+					<!-- wp:woocommerce/product-sku /-->
 
-	<!-- wp:woocommerce/add-to-cart-form /--></div>
-	<!-- /wp:column --></div>
+					<!-- wp:post-terms {"term":"product_cat","prefix":"Category: "} /-->
+
+					<!-- wp:post-terms {"term":"product_tag","prefix":"Tags: "} /-->
+				</div>
+				<!-- /wp:group -->
+			</div>
+			<!-- /wp:woocommerce/product-meta -->
+		</div>
+		<!-- /wp:column -->
+	</div>
 	<!-- /wp:columns -->
 
 	<!-- wp:woocommerce/product-details /-->
 
-	<!-- wp:heading -->
-	<h2 class="wp-block-heading">Related Products</h2>
-	<!-- /wp:heading -->
-
 	<!-- wp:woocommerce/related-products -->
-	<div class="wp-block-woocommerce-related-products"><!-- wp:query {"queryId":2,"query":{"perPage":5,"pages":0,"offset":0,"postType":"product","order":"asc","orderBy":"title","author":"","search":"","exclude":[],"sticky":"","inherit":false},"displayLayout":{"type":"flex","columns":5},"namespace":"woocommerce/related-products","lock":{"remove":true,"move":true}} -->
-	<div class="wp-block-query"><!-- wp:post-template {"__woocommerceNamespace":"woocommerce/product-query/product-template"} -->
-	<!-- wp:woocommerce/product-image {"isDescendentOfQueryLoop":true} /-->
+	<div class="wp-block-woocommerce-related-products">
+		<!-- wp:query {"queryId":2,"query":{"perPage":5,"pages":0,"offset":0,"postType":"product","order":"asc","orderBy":"title","author":"","search":"","exclude":[],"sticky":"","inherit":false},"displayLayout":{"type":"flex","columns":5},"namespace":"woocommerce/related-products","lock":{"remove":true,"move":true}} -->
+		<div class="wp-block-query">
+			<!-- wp:post-template {"__woocommerceNamespace":"woocommerce/product-query/product-template"} -->
+			<!-- wp:woocommerce/product-image {"isDescendentOfQueryLoop":true} /-->
+
+			<!-- wp:post-title {"textAlign":"center","level":3,"fontSize":"medium","__woocommerceNamespace":"woocommerce/product-query/product-title"} /-->
 
-	<!-- wp:post-title {"textAlign":"center","level":3,"fontSize":"medium","__woocommerceNamespace":"woocommerce/product-query/product-title"} /-->
+			<!-- wp:woocommerce/product-price {"isDescendentOfQueryLoop":true,"textAlign":"center","fontSize":"small","style":{"spacing":{"margin":{"bottom":"1rem"}}}} /-->
 
-	<!-- wp:woocommerce/product-price {"isDescendentOfQueryLoop":true,"textAlign":"center","fontSize":"small","style":{"spacing":{"margin":{"bottom":"1rem"}}}} /-->
+			<!-- wp:woocommerce/product-button {"isDescendentOfQueryLoop":true,"textAlign":"center","fontSize":"small","style":{"spacing":{"margin":{"bottom":"1rem"}}}} /-->
+			<!-- /wp:post-template -->
+		</div>
+		<!-- /wp:query -->
+	</div>
+	<!-- /wp:woocommerce/related-products -->
+</div>
+<!-- /wp:group -->
 
-	<!-- wp:woocommerce/product-button {"isDescendentOfQueryLoop":true,"textAlign":"center","fontSize":"small","style":{"spacing":{"margin":{"bottom":"1rem"}}}} /-->
-	<!-- /wp:post-template --></div>
-	<!-- /wp:query --></div>
-	<!-- /wp:woocommerce/related-products --></div>
-	<!-- /wp:group -->
-<!-- wp:template-part {"slug":"footer"} /-->
+<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
\ No newline at end of file