diff --git a/packages/calypso-products/src/constants/features.ts b/packages/calypso-products/src/constants/features.ts
index bfcc8f60d2b3..1aba34dfd53f 100644
--- a/packages/calypso-products/src/constants/features.ts
+++ b/packages/calypso-products/src/constants/features.ts
@@ -533,6 +533,7 @@ export const FEATURE_WOO_HOSTED_EMAIL_CAMPAIGNS = 'woo-hosted-email-campaigns';
 export const FEATURE_WOO_HOSTED_EMAIL_SUBSCRIBER_MGMT = 'woo-hosted-email-subscriber-mgmt';
 export const FEATURE_WOO_HOSTED_SALES_TAX = 'woo-hosted-sales-tax';
 export const FEATURE_WOO_HOSTED_SHIPPING_LABELS = 'woo-hosted-shipping-labels';
+export const FEATURE_WOO_HOSTED_PRIORITY_SUPPORT = 'woo-hosted-priority-support';
 
 // Sensei Features
 export const FEATURE_SENSEI_SUPPORT = 'sensei-support';
diff --git a/packages/calypso-products/src/feature-group-plan-map.ts b/packages/calypso-products/src/feature-group-plan-map.ts
index da97e57c638d..a735ccdefb27 100644
--- a/packages/calypso-products/src/feature-group-plan-map.ts
+++ b/packages/calypso-products/src/feature-group-plan-map.ts
@@ -185,6 +185,8 @@ import {
 	FEATURE_WOO_HOSTED_PRO_MAILPOET,
 	FEATURE_WOO_HOSTED_BASIC_ADMIN_USERS,
 	FEATURE_WOO_HOSTED_PRO_ADMIN_USERS,
+	FEATURE_WOO_HOSTED_BASIC_STORAGE,
+	FEATURE_WOO_HOSTED_PRO_STORAGE,
 	FEATURE_WOO_HOSTED_POWERFUL_COMMERCE_TOOLS,
 	FEATURE_WOO_HOSTED_FREE_DOMAIN_1_YEAR,
 	FEATURE_WOO_HOSTED_SEAMLESS_CHECKOUT,
@@ -214,6 +216,7 @@ import {
 	FEATURE_WOO_HOSTED_EMAIL_SUBSCRIBER_MGMT,
 	FEATURE_WOO_HOSTED_SALES_TAX,
 	FEATURE_WOO_HOSTED_SHIPPING_LABELS,
+	FEATURE_WOO_HOSTED_PRIORITY_SUPPORT,
 	FEATURE_GROUP_WOO_HOSTED,
 	FEATURE_GROUP_WOO_HOSTED_CREATE_STORE,
 	FEATURE_GROUP_WOO_HOSTED_PAYMENTS,
@@ -479,6 +482,8 @@ export const featureGroups: Partial< FeatureGroupMap > = {
 			FEATURE_CUSTOM_DOMAIN,
 			FEATURE_WOO_HOSTED_BASIC_ADMIN_USERS,
 			FEATURE_WOO_HOSTED_PRO_ADMIN_USERS,
+			FEATURE_WOO_HOSTED_BASIC_STORAGE,
+			FEATURE_WOO_HOSTED_PRO_STORAGE,
 		],
 	},
 	[ FEATURE_GROUP_WOO_HOSTED_CREATE_STORE ]: {
@@ -525,7 +530,7 @@ export const featureGroups: Partial< FeatureGroupMap > = {
 			FEATURE_WOO_HOSTED_ANALYTICS_REPORTS,
 			FEATURE_WOO_HOSTED_STORAGE_SPACE,
 			FEATURE_WOO_HOSTED_SECURITY,
-			FEATURE_PRIORITY_24_7_SUPPORT,
+			FEATURE_WOO_HOSTED_PRIORITY_SUPPORT,
 		],
 	},
 	[ FEATURE_GROUP_WOO_HOSTED_GROW ]: {
@@ -821,7 +826,6 @@ export function resolveWooExpressFeatureGroupsForComparisonGrid(): Partial< Feat
 
 export function resolveWooHostedFeatureGroupsForFeaturesGrid(): Partial< FeatureGroupMap > {
 	return {
-		[ FEATURE_GROUP_STORAGE ]: featureGroups[ FEATURE_GROUP_STORAGE ],
 		[ FEATURE_GROUP_WOO_HOSTED ]: featureGroups[ FEATURE_GROUP_WOO_HOSTED ],
 	};
 }
diff --git a/packages/calypso-products/src/features-list.tsx b/packages/calypso-products/src/features-list.tsx
index 5e1ef598a625..76c0fa02584c 100644
--- a/packages/calypso-products/src/features-list.tsx
+++ b/packages/calypso-products/src/features-list.tsx
@@ -397,6 +397,7 @@ import {
 	FEATURE_WOO_HOSTED_EMAIL_SUBSCRIBER_MGMT,
 	FEATURE_WOO_HOSTED_SALES_TAX,
 	FEATURE_WOO_HOSTED_SHIPPING_LABELS,
+	FEATURE_WOO_HOSTED_PRIORITY_SUPPORT,
 } from './constants';
 import type { FeatureList } from './types';
 
@@ -3154,6 +3155,11 @@ const FEATURES_LIST: FeatureList = {
 		getTitle: () => i18n.translate( 'Printable shipping labels' ),
 		getDescription: () => '',
 	},
+	[ FEATURE_WOO_HOSTED_PRIORITY_SUPPORT ]: {
+		getSlug: () => FEATURE_WOO_HOSTED_PRIORITY_SUPPORT,
+		getTitle: () => i18n.translate( 'Priority 24x7 support' ),
+		getDescription: () => '',
+	},
 	/* END: Woo Hosted (CIAB) Features */
 
 	/* START: Sensei Features */
diff --git a/packages/calypso-products/src/plans-list.tsx b/packages/calypso-products/src/plans-list.tsx
index 418fdbe0b475..975ad4c95d9a 100644
--- a/packages/calypso-products/src/plans-list.tsx
+++ b/packages/calypso-products/src/plans-list.tsx
@@ -528,6 +528,7 @@ import {
 	FEATURE_WOO_HOSTED_EMAIL_SUBSCRIBER_MGMT,
 	FEATURE_WOO_HOSTED_SALES_TAX,
 	FEATURE_WOO_HOSTED_SHIPPING_LABELS,
+	FEATURE_WOO_HOSTED_PRIORITY_SUPPORT,
 	WPCOM_FEATURES_SCAN_SELF_SERVE,
 	WPCOM_FEATURES_BACKUPS_SELF_SERVE,
 } from './constants';
@@ -1639,7 +1640,7 @@ const getWooHostedPlanCompareFeatures = (): string[] => [
 	FEATURE_WOO_HOSTED_ANALYTICS_REPORTS,
 	FEATURE_WOO_HOSTED_STORAGE_SPACE,
 	FEATURE_WOO_HOSTED_SECURITY,
-	FEATURE_PRIORITY_24_7_SUPPORT,
+	FEATURE_WOO_HOSTED_PRIORITY_SUPPORT,
 	// Grow your business
 	FEATURE_WOO_HOSTED_EMAIL_CAMPAIGNS,
 	FEATURE_WOO_HOSTED_EMAIL_SUBSCRIBER_MGMT,