diff --git a/packages/components/src/input-control/input-base.js b/packages/components/src/input-control/input-base.js
index fd47c76473a60d..232e5c16a1f238 100644
--- a/packages/components/src/input-control/input-base.js
+++ b/packages/components/src/input-control/input-base.js
@@ -24,6 +24,26 @@ function useUniqueId( idProp ) {
 	return idProp || id;
 }
 
+// Adapter to map props for the new ui/flex compopnent.
+function getUIFlexProps( { labelPosition } ) {
+	const props = {};
+	switch ( labelPosition ) {
+		case 'top':
+			props.direction = 'column';
+			props.gap = 0;
+			break;
+		case 'bottom':
+			props.direction = 'column-reverse';
+			props.gap = 0;
+			break;
+		case 'edge':
+			props.justify = 'space-between';
+			break;
+	}
+
+	return props;
+}
+
 export function InputBase(
 	{
 		__unstableInputWidth,
@@ -48,6 +68,7 @@ export function InputBase(
 	return (
 		<Root
 			{ ...props }
+			{ ...getUIFlexProps( { labelPosition } ) }
 			className={ className }
 			isFocused={ isFocused }
 			labelPosition={ labelPosition }
diff --git a/storybook/main.js b/storybook/main.js
index f9d05667f4cabf..d410195ee23b1b 100644
--- a/storybook/main.js
+++ b/storybook/main.js
@@ -5,6 +5,10 @@ const stories = [
 	'../packages/icons/src/**/stories/*.js',
 ].filter( Boolean );
 
+const customEnvVariables = {
+	COMPONENT_SYSTEM_PHASE: 1,
+};
+
 module.exports = {
 	stories,
 	addons: [
@@ -17,4 +21,20 @@ module.exports = {
 		'@storybook/addon-viewport',
 		'@storybook/addon-a11y',
 	],
+	// Workaround:
+	// https://github.com/storybookjs/storybook/issues/12270
+	webpackFinal: async ( config ) => {
+		// Find the DefinePlugin
+		const plugin = config.plugins.find( ( p ) => {
+			return p.definitions && p.definitions[ 'process.env' ];
+		} );
+		// Add custom env variables
+		Object.keys( customEnvVariables ).forEach( ( key ) => {
+			plugin.definitions[ 'process.env' ][ key ] = JSON.stringify(
+				customEnvVariables[ key ]
+			);
+		} );
+
+		return config;
+	},
 };