diff --git a/assets/js/atomic/blocks/product-elements/button/supports.ts b/assets/js/atomic/blocks/product-elements/button/supports.ts
index 00db65027b1..048625ee61a 100644
--- a/assets/js/atomic/blocks/product-elements/button/supports.ts
+++ b/assets/js/atomic/blocks/product-elements/button/supports.ts
@@ -32,4 +32,10 @@ export const supports = {
 		__experimentalSelector:
 			'.wp-block-button.wc-block-components-product-button .wc-block-components-product-button__button',
 	} ),
+	...( typeof __experimentalGetSpacingClassesAndStyles === 'function' &&
+		! isFeaturePluginBuild() && {
+			spacing: {
+				margin: true,
+			},
+		} ),
 };
diff --git a/assets/js/atomic/blocks/product-elements/rating/support.ts b/assets/js/atomic/blocks/product-elements/rating/support.ts
index f68350a0581..6ae7b413f5d 100644
--- a/assets/js/atomic/blocks/product-elements/rating/support.ts
+++ b/assets/js/atomic/blocks/product-elements/rating/support.ts
@@ -17,12 +17,11 @@ export const supports = {
 			fontSize: true,
 			__experimentalSkipSerialization: true,
 		},
-		...( typeof __experimentalGetSpacingClassesAndStyles === 'function' && {
-			spacing: {
-				margin: true,
-				__experimentalSkipSerialization: true,
-			},
-		} ),
 		__experimentalSelector: '.wc-block-components-product-rating',
 	} ),
+	...( typeof __experimentalGetSpacingClassesAndStyles === 'function' && {
+		spacing: {
+			margin: true,
+		},
+	} ),
 };