diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css
index 294f9cce29..4dd0affb7e 100644
--- a/blockbase/assets/ponyfill.css
+++ b/blockbase/assets/ponyfill.css
@@ -828,6 +828,10 @@ p.has-background {
 	margin-bottom: unset;
 }
 
+.post-meta {
+	row-gap: var(--wp--custom--gap--baseline) !important;
+}
+
 .post-meta .wp-block-post-author,
 .post-meta .wp-block-post-date,
 .post-meta .taxonomy-post_tag,
diff --git a/blockbase/assets/svg/post-tag.svg b/blockbase/assets/svg/post-tag.svg
new file mode 100644
index 0000000000..136004dabd
--- /dev/null
+++ b/blockbase/assets/svg/post-tag.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M3 12.2045C3 12.5941 3.15158 12.9684 3.42267 13.2482L9.71878 19.747C11.0769 21.1489 13.3201 21.1667 14.7003 19.7865L19.7873 14.6995C21.1677 13.319 21.1497 11.0753 19.7471 9.71731L13.2459 3.42238C12.9661 3.15147 12.5919 3 12.2025 3H4.5C3.67157 3 3 3.67157 3 4.5V12.2045ZM12.2025 4.5H4.5V12.2045L10.7961 18.7033C11.5714 19.5035 12.8518 19.5137 13.6396 18.7258L18.7266 13.6388C19.5146 12.8509 19.5043 11.5701 18.7037 10.7949L12.2025 4.5ZM8.4975 9.495C9.0484 9.495 9.495 9.0484 9.495 8.4975C9.495 7.9466 9.0484 7.5 8.4975 7.5C7.9466 7.5 7.5 7.9466 7.5 8.4975C7.5 9.0484 7.9466 9.495 8.4975 9.495Z" fill="currentColor"/></svg>
\ No newline at end of file
diff --git a/blockbase/block-template-parts/post-meta.html b/blockbase/block-template-parts/post-meta.html
new file mode 100644
index 0000000000..c42e914259
--- /dev/null
+++ b/blockbase/block-template-parts/post-meta.html
@@ -0,0 +1,8 @@
+<!-- wp:group {"className":"post-meta","layout":{"type":"flex"}} -->
+<div class="wp-block-group post-meta">
+    <!-- wp:post-author {"showAvatar":false,"showBio":false,"fontSize":"tiny"} /-->
+    <!-- wp:post-date {"fontSize":"tiny","isLink":true} /-->
+    <!-- wp:post-terms {"term":"category","fontSize":"tiny"} /-->
+    <!-- wp:post-terms {"term": "post_tag", "fontSize":"tiny"} /-->
+</div>
+<!-- /wp:group -->
diff --git a/blockbase/block-templates/singular.html b/blockbase/block-templates/singular.html
index 39955d08f1..6194ea7877 100644
--- a/blockbase/block-templates/singular.html
+++ b/blockbase/block-templates/singular.html
@@ -11,11 +11,18 @@
 <!-- wp:post-featured-image {"align":"full"} /-->
 
 <!-- wp:post-content {"layout":{"inherit":true}} /-->
+
+<!-- wp:template-part {"slug":"post-meta","layout":{"inherit":true}} /-->
 </main>
 <!-- /wp:group -->
 
 <!-- wp:group {"layout":{"inherit":true}} -->
-<div class="wp-block-group"><!-- wp:post-comments /--></div>
+<div class="wp-block-group">
+    <!-- wp:spacer {"height":60} -->
+    <div style="height:60px" aria-hidden="true" class="wp-block-spacer"></div>
+    <!-- /wp:spacer -->
+    <!-- wp:post-comments /-->
+</div>
 <!-- /wp:group -->
 
 <!-- wp:template-part {"slug":"footer","tagName":"footer","layout":{"inherit":true},"className":"site-footer-container"} /-->
diff --git a/blockbase/sass/post/_meta.scss b/blockbase/sass/post/_meta.scss
index ec4395e1a3..ca81c67654 100644
--- a/blockbase/sass/post/_meta.scss
+++ b/blockbase/sass/post/_meta.scss
@@ -1,4 +1,7 @@
 .post-meta {
+	// We're setting row-gap here as currently, we can't specify separate vertical and horizontal block gaps.
+	// Tracking in Gutenberg here: https://github.com/WordPress/gutenberg/issues/34529
+	row-gap: var(--wp--custom--gap--baseline) !important; // !important is needed to override the unique .wp-container-ID classes
 	.wp-block-post-author,
 	.wp-block-post-date,
 	.taxonomy-post_tag,
diff --git a/blockbase/theme.json b/blockbase/theme.json
index 9b0949797a..5ad1bb722b 100644
--- a/blockbase/theme.json
+++ b/blockbase/theme.json
@@ -311,6 +311,7 @@
 			"wideSize": "1000px"
 		},
 		"spacing": {
+			"blockGap": true,
 			"customPadding": true,
 			"units": [
 				"%",
@@ -564,7 +565,7 @@
 			}
 		},
 		"spacing": {
-			"blockGap": "var(--wp--custom--gap--vertical)"
+			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
diff --git a/geologist/theme.json b/geologist/theme.json
index 508309cade..03bcabf13e 100644
--- a/geologist/theme.json
+++ b/geologist/theme.json
@@ -335,6 +335,7 @@
 			"wideSize": "1128px"
 		},
 		"spacing": {
+			"blockGap": true,
 			"customPadding": true,
 			"units": [
 				"%",
@@ -641,7 +642,7 @@
 			}
 		},
 		"spacing": {
-			"blockGap": "var(--wp--custom--gap--vertical)"
+			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
diff --git a/mayland-blocks/theme.json b/mayland-blocks/theme.json
index 99b436b13c..8fd2ff1e73 100644
--- a/mayland-blocks/theme.json
+++ b/mayland-blocks/theme.json
@@ -323,6 +323,7 @@
 			"wideSize": "1000px"
 		},
 		"spacing": {
+			"blockGap": true,
 			"customPadding": true,
 			"units": [
 				"%",
@@ -593,7 +594,7 @@
 			}
 		},
 		"spacing": {
-			"blockGap": "var(--wp--custom--gap--vertical)"
+			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
diff --git a/quadrat/theme.json b/quadrat/theme.json
index ece7367ccc..2649a70ac7 100644
--- a/quadrat/theme.json
+++ b/quadrat/theme.json
@@ -361,6 +361,7 @@
 			"wideSize": "1128px"
 		},
 		"spacing": {
+			"blockGap": true,
 			"customPadding": true,
 			"units": [
 				"%",
@@ -667,7 +668,7 @@
 			}
 		},
 		"spacing": {
-			"blockGap": "var(--wp--custom--gap--vertical)"
+			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
diff --git a/seedlet-blocks/block-template-parts/post-meta.html b/seedlet-blocks/block-template-parts/post-meta.html
index 8856e40968..a2180b8845 100644
--- a/seedlet-blocks/block-template-parts/post-meta.html
+++ b/seedlet-blocks/block-template-parts/post-meta.html
@@ -7,5 +7,7 @@
 
 <!-- wp:post-date {"fontSize":"tiny","isLink":true} /-->
 
-<!-- wp:post-terms {"term":"category","fontSize":"tiny"} /--></div>
+<!-- wp:post-terms {"term":"category","fontSize":"tiny"} /-->
+
+<!-- wp:post-terms {"term": "post_tag", "fontSize":"tiny"} /--></div>
 <!-- /wp:group -->
diff --git a/seedlet-blocks/theme.json b/seedlet-blocks/theme.json
index a575866d97..c80ea71c05 100644
--- a/seedlet-blocks/theme.json
+++ b/seedlet-blocks/theme.json
@@ -352,6 +352,7 @@
 			"wideSize": "790px"
 		},
 		"spacing": {
+			"blockGap": true,
 			"customPadding": true,
 			"units": [
 				"%",
@@ -627,7 +628,7 @@
 			}
 		},
 		"spacing": {
-			"blockGap": "var(--wp--custom--gap--vertical)"
+			"blockGap": "calc(2 * var(--wp--custom--gap--baseline))"
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",
diff --git a/skatepark/assets/theme.css b/skatepark/assets/theme.css
index 9675e7ea05..b5d8ef4cc5 100644
--- a/skatepark/assets/theme.css
+++ b/skatepark/assets/theme.css
@@ -442,7 +442,6 @@ a:not(.ab-item):not(.screen-reader-shortcut):focus {
 .post-meta.wp-block-group {
 	flex-direction: column;
 	align-items: start;
-	gap: .5em;
 }
 
 .post-meta .wp-block-post-date,
diff --git a/skatepark/child-theme.json b/skatepark/child-theme.json
index c02afa5486..20614900f9 100644
--- a/skatepark/child-theme.json
+++ b/skatepark/child-theme.json
@@ -379,6 +379,9 @@
 				}
 			}
 		},
+		"spacing": {
+			"blockGap": "0.5em"
+		},
 		"typography": {
 			"fontFamily": "var(--wp--preset--font-family--red-hat-display)",
 			"fontWeight": "400"
diff --git a/skatepark/sass/elements/_post-meta.scss b/skatepark/sass/elements/_post-meta.scss
index a87eafb969..d220bd9539 100644
--- a/skatepark/sass/elements/_post-meta.scss
+++ b/skatepark/sass/elements/_post-meta.scss
@@ -2,7 +2,6 @@
 	&.wp-block-group {
 		flex-direction: column;
 		align-items: start;
-		gap: .5em;
 	}
 
 	.wp-block-post-date,
diff --git a/skatepark/theme.json b/skatepark/theme.json
index 3d2ee9d247..3a0bdd6c4c 100644
--- a/skatepark/theme.json
+++ b/skatepark/theme.json
@@ -360,6 +360,7 @@
 			"wideSize": "1194px"
 		},
 		"spacing": {
+			"blockGap": true,
 			"customPadding": true,
 			"units": [
 				"%",
@@ -652,7 +653,7 @@
 			}
 		},
 		"spacing": {
-			"blockGap": "var(--wp--custom--gap--vertical)"
+			"blockGap": "0.5em"
 		},
 		"typography": {
 			"lineHeight": "var(--wp--custom--body--typography--line-height)",