diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json
index fd03a4487ee5aa..2d73cd5151cfe0 100644
--- a/packages/block-library/src/heading/block.json
+++ b/packages/block-library/src/heading/block.json
@@ -29,12 +29,9 @@
 		"__experimentalFontSize": true,
 		"__experimentalLineHeight": true,
 		"__experimentalSelector": {
-			"core/heading/h1": "h1",
-			"core/heading/h2": "h2",
-			"core/heading/h3": "h3",
-			"core/heading/h4": "h4",
-			"core/heading/h5": "h5",
-			"core/heading/h6": "h6"
+			"attribute": "level",
+			"expression": "h${attribute}",
+			"range": ["h1", "h2", "h3", "h4", "h5", "h6"]
 		},
 		"__unstablePasteTextInline": true
 	}
diff --git a/packages/block-library/src/post-title/block.json b/packages/block-library/src/post-title/block.json
index ec3cad1f435ae8..554fb14148102f 100644
--- a/packages/block-library/src/post-title/block.json
+++ b/packages/block-library/src/post-title/block.json
@@ -23,13 +23,9 @@
 		"__experimentalFontSize": true,
 		"__experimentalLineHeight": true,
 		"__experimentalSelector": {
-			"core/post-title/h1": "h1",
-			"core/post-title/h2": "h2",
-			"core/post-title/h3": "h3",
-			"core/post-title/h4": "h4",
-			"core/post-title/h5": "h5",
-			"core/post-title/h6": "h6",
-			"core/post-title/p": "p"
+			"attribute": "level",
+			"expression": "h${attribute}",
+			"range": ["h1", "h2", "h3", "h4", "h5", "h6"]
 		}
 	}
 }