diff --git a/plugins/woocommerce-blocks/assets/js/data/checkout/index.ts b/plugins/woocommerce-blocks/assets/js/data/checkout/index.ts
index 237664d645b..cd26412a047 100644
--- a/plugins/woocommerce-blocks/assets/js/data/checkout/index.ts
+++ b/plugins/woocommerce-blocks/assets/js/data/checkout/index.ts
@@ -16,10 +16,6 @@ export const config = {
 	reducer,
 	selectors,
 	actions,
-	// TODO: Gutenberg with Thunks was released in WP 6.0. Once 6.1 is released, remove the experimental flag here
-	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-	// @ts-ignore We pass this in case there is an older version of Gutenberg running.
-	__experimentalUseThunks: true,
 };
 
 const store = createReduxStore( STORE_KEY, config );
diff --git a/plugins/woocommerce-blocks/assets/js/data/payment/index.ts b/plugins/woocommerce-blocks/assets/js/data/payment/index.ts
index 95b67462982..9d7820d15b4 100644
--- a/plugins/woocommerce-blocks/assets/js/data/payment/index.ts
+++ b/plugins/woocommerce-blocks/assets/js/data/payment/index.ts
@@ -20,10 +20,6 @@ export const config = {
 	actions,
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	controls: { ...dataControls, ...sharedControls } as any,
-	// TODO: Gutenberg with Thunks was released in WP 6.0. Once 6.1 is released, remove the experimental flag here
-	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-	// @ts-ignore We pass this in case there is an older version of Gutenberg running.
-	__experimentalUseThunks: true,
 };
 
 const store = createReduxStore( STORE_KEY, config );
diff --git a/plugins/woocommerce-blocks/assets/js/data/validation/index.ts b/plugins/woocommerce-blocks/assets/js/data/validation/index.ts
index 8241a611614..2355c045438 100644
--- a/plugins/woocommerce-blocks/assets/js/data/validation/index.ts
+++ b/plugins/woocommerce-blocks/assets/js/data/validation/index.ts
@@ -16,10 +16,6 @@ export const config = {
 	reducer,
 	selectors,
 	actions,
-	// TODO: Gutenberg with Thunks was released in WP 6.0. Once 6.1 is released, remove the experimental flag here
-	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-	// @ts-ignore We pass this in case there is an older version of Gutenberg running.
-	__experimentalUseThunks: true,
 };
 
 const store = createReduxStore( STORE_KEY, config );
diff --git a/plugins/woocommerce-blocks/assets/js/types/type-defs/product-response.ts b/plugins/woocommerce-blocks/assets/js/types/type-defs/product-response.ts
index 8c1d037bde5..c12ae4b1a2f 100644
--- a/plugins/woocommerce-blocks/assets/js/types/type-defs/product-response.ts
+++ b/plugins/woocommerce-blocks/assets/js/types/type-defs/product-response.ts
@@ -20,6 +20,7 @@ export interface ProductResponseItemBaseData {
 	value: string;
 	display?: string;
 	hidden?: boolean;
+	className?: string;
 }
 
 export type ProductResponseItemData = ProductResponseItemBaseData &
diff --git a/plugins/woocommerce-blocks/checkstyle.xml b/plugins/woocommerce-blocks/checkstyle.xml
index 0d6eeb08414..f0b7e3e8e86 100644
--- a/plugins/woocommerce-blocks/checkstyle.xml
+++ b/plugins/woocommerce-blocks/checkstyle.xml
@@ -647,7 +647,7 @@
 <error line="164" column="25" severity="error" message="Property &apos;SET_PRISTINE&apos; does not exist on type &apos;{ readonly SET_IDLE: &quot;SET_IDLE&quot;; readonly SET_REDIRECT_URL: &quot;SET_REDIRECT_URL&quot;; readonly SET_COMPLETE: &quot;SET_CHECKOUT_COMPLETE&quot;; readonly SET_BEFORE_PROCESSING: &quot;SET_BEFORE_PROCESSING&quot;; ... 11 more ...; readonly SET_IS_CART: &quot;SET_IS_CART&quot;; }&apos;." source="TS2339" />
 </file>
 <file name="assets/js/data/checkout/index.ts">
-<error line="25" column="44" severity="error" message="Argument of type &apos;{ reducer: (state: CheckoutState | undefined, action: actions.CheckoutAction) =&gt; CheckoutState; selectors: typeof selectors; actions: typeof actions; __experimentalUseThunks: boolean; }&apos; is not assignable to parameter of type &apos;StoreConfig&lt;CheckoutState&gt;&apos;.
+<error line="21" column="44" severity="error" message="Argument of type &apos;{ reducer: (state: CheckoutState | undefined, action: actions.CheckoutAction) =&gt; CheckoutState; selectors: typeof selectors; actions: typeof actions; }&apos; is not assignable to parameter of type &apos;StoreConfig&lt;CheckoutState&gt;&apos;.
   Types of property &apos;actions&apos; are incompatible.
     Type &apos;typeof import(&quot;/home/runner/work/woocommerce-blocks/woocommerce-blocks/assets/js/data/checkout/actions&quot;)&apos; is not assignable to type &apos;{ [k: string]: (...args: readonly any[]) =&gt; AnyAction | Generator&lt;any, any, unknown&gt;; }&apos;.
       Property &apos;__internalProcessCheckoutResponse&apos; is incompatible with index signature.
@@ -700,7 +700,7 @@
 <error line="162" column="27" severity="error" message="Binding element &apos;dispatch&apos; implicitly has an &apos;any&apos; type." source="TS7031" />
 </file>
 <file name="assets/js/data/payment/index.ts">
-<error line="29" column="44" severity="error" message="Argument of type &apos;{ reducer: Reducer&lt;PaymentMethodDataState, AnyAction&gt;; selectors: typeof selectors; actions: typeof actions; controls: any; __experimentalUseThunks: boolean; }&apos; is not assignable to parameter of type &apos;StoreConfig&lt;PaymentMethodDataState&gt;&apos;.
+<error line="25" column="44" severity="error" message="Argument of type &apos;{ reducer: Reducer&lt;PaymentMethodDataState, AnyAction&gt;; selectors: typeof selectors; actions: typeof actions; controls: any; }&apos; is not assignable to parameter of type &apos;StoreConfig&lt;PaymentMethodDataState&gt;&apos;.
   Types of property &apos;actions&apos; are incompatible.
     Type &apos;typeof import(&quot;/home/runner/work/woocommerce-blocks/woocommerce-blocks/assets/js/data/payment/actions&quot;)&apos; is not assignable to type &apos;{ [k: string]: (...args: readonly any[]) =&gt; AnyAction | Generator&lt;any, any, unknown&gt;; }&apos;.
       Property &apos;__internalUpdateAvailablePaymentMethods&apos; is incompatible with index signature.