diff --git a/projects/packages/forms/changelog/update-form-blocks-for-content-only-mode b/projects/packages/forms/changelog/update-form-blocks-for-content-only-mode
new file mode 100644
index 0000000000000..a5143e2855ee9
--- /dev/null
+++ b/projects/packages/forms/changelog/update-form-blocks-for-content-only-mode
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Forms: Update fields and button blocks to support contentOnly editing.
diff --git a/projects/packages/forms/src/blocks/contact-form/child-blocks.js b/projects/packages/forms/src/blocks/contact-form/child-blocks.js
index 03add2e890a14..edfe9b2d3f4ab 100644
--- a/projects/packages/forms/src/blocks/contact-form/child-blocks.js
+++ b/projects/packages/forms/src/blocks/contact-form/child-blocks.js
@@ -31,6 +31,7 @@ const FieldDefaults = {
 		label: {
 			type: 'string',
 			default: null,
+			role: 'content',
 		},
 		required: {
 			type: 'boolean',
@@ -38,18 +39,22 @@ const FieldDefaults = {
 		},
 		requiredText: {
 			type: 'string',
+			role: 'content',
 		},
 		options: {
 			type: 'array',
 			default: [],
+			role: 'content',
 		},
 		defaultValue: {
 			type: 'string',
 			default: '',
+			role: 'content',
 		},
 		placeholder: {
 			type: 'string',
 			default: '',
+			role: 'content',
 		},
 		id: {
 			type: 'string',
@@ -366,6 +371,7 @@ export const childBlocks = [
 				label: {
 					type: 'string',
 					default: 'Text',
+					role: 'content',
 				},
 			},
 		},
@@ -388,6 +394,7 @@ export const childBlocks = [
 				label: {
 					type: 'string',
 					default: 'Name',
+					role: 'content',
 				},
 			},
 		},
@@ -409,6 +416,7 @@ export const childBlocks = [
 				label: {
 					type: 'string',
 					default: 'Email',
+					role: 'content',
 				},
 			},
 		},
@@ -435,6 +443,7 @@ export const childBlocks = [
 				label: {
 					type: 'string',
 					default: __( 'Website', 'jetpack-forms' ),
+					role: 'content',
 				},
 			},
 		},
@@ -464,6 +473,7 @@ export const childBlocks = [
 				label: {
 					type: 'string',
 					default: 'Date',
+					role: 'content',
 				},
 				dateFormat: {
 					type: 'string',
@@ -493,6 +503,7 @@ export const childBlocks = [
 				label: {
 					type: 'string',
 					default: 'Phone',
+					role: 'content',
 				},
 			},
 		},
@@ -542,6 +553,7 @@ export const childBlocks = [
 				label: {
 					type: 'string',
 					default: '',
+					role: 'content',
 				},
 			},
 		},
@@ -649,10 +661,12 @@ export const childBlocks = [
 				toggleLabel: {
 					type: 'string',
 					default: null,
+					role: 'content',
 				},
 				options: {
 					type: 'array',
 					default: [ '' ],
+					role: 'content',
 				},
 			},
 		},
diff --git a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-choice/item/settings.js b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-choice/item/settings.js
index 8793ef3060dc5..81edaa3554c74 100644
--- a/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-choice/item/settings.js
+++ b/projects/packages/forms/src/blocks/contact-form/components/jetpack-field-choice/item/settings.js
@@ -4,6 +4,7 @@ export default {
 	attributes: {
 		label: {
 			type: 'string',
+			role: 'content',
 		},
 		fieldType: {
 			enum: [ 'checkbox', 'radio' ],
diff --git a/projects/plugins/jetpack/changelog/update-form-blocks-for-content-only-mode b/projects/plugins/jetpack/changelog/update-form-blocks-for-content-only-mode
new file mode 100644
index 0000000000000..d526252ab0ca2
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-form-blocks-for-content-only-mode
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Forms: Update field and button blocks to support contentOnly editing.
diff --git a/projects/plugins/jetpack/extensions/blocks/button/attributes.js b/projects/plugins/jetpack/extensions/blocks/button/attributes.js
index a6bd20bbcf45d..875a48b67d7d2 100644
--- a/projects/plugins/jetpack/extensions/blocks/button/attributes.js
+++ b/projects/plugins/jetpack/extensions/blocks/button/attributes.js
@@ -17,12 +17,15 @@ export default {
 	},
 	text: {
 		type: 'string',
+		role: 'content',
 	},
 	placeholder: {
 		type: 'string',
+		role: 'content',
 	},
 	url: {
 		type: 'string',
+		role: 'content',
 	},
 	textColor: {
 		type: 'string',