diff --git a/packages/design-system/.storybook/main.js b/packages/design-system/.storybook/main.js
index 3b1f4c9a3a..f0b872522d 100644
--- a/packages/design-system/.storybook/main.js
+++ b/packages/design-system/.storybook/main.js
@@ -28,8 +28,18 @@ module.exports = {
 		'../src/components/N8nMarkdown/*.stories.@(js|jsx|ts|tsx)',
 		'../src/components/N8nMenu/*.stories.@(js|jsx|ts|tsx)',
 		'../src/components/N8nMenuItem/*.stories.@(js|jsx|ts|tsx)',
-		'../src/components/N8nText/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nNodeCreatorNode/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nNodeIcon/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nNotice/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nOption/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nPulse/*.stories.@(js|jsx|ts|tsx)',
 		'../src/components/N8nPopover/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nRadioButtons/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nSelect/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nSpinner/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nSticky/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nTags/*.stories.@(js|jsx|ts|tsx)',
+		'../src/components/N8nText/*.stories.@(js|jsx|ts|tsx)',
 		'../src/components/N8nTooltip/*.stories.@(js|jsx|ts|tsx)',
 	],
 	addons: [
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
index 6c52fcdac4..6e22518afa 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
@@ -7,13 +7,14 @@ export default {
 };
 
 const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNodeCreatorNode,
 	},
 	template: `
 		<n8n-node-creator-node v-bind="args">
-			<template v-slot:icon>
+			<template #icon>
 				<img src="https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/cartman.svg" />
 			</template>
 		</n8n-node-creator-node>
@@ -29,6 +30,7 @@ WithTitle.args = {
 };
 
 const PanelTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNodeCreatorNode,
@@ -40,10 +42,10 @@ const PanelTemplate: StoryFn = (args, { argTypes }) => ({
 	},
 	template: `
 		<n8n-node-creator-node v-bind="args" :isPanelActive="isPanelActive" @click.capture="isPanelActive = true">
-			<template v-slot:icon>
+			<template #icon>
 				<img src="https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/cartman.svg" />
 			</template>
-			<template v-slot:panel>
+			<template #panel>
 				<p style="width: 100%; height: 300px; background: white">Lorem ipsum dolor sit amet</p>
 				<button @click="isPanelActive = false">Close</button>
 			</template>
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
index f556cd7c0c..87dc9ad46a 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
@@ -5,7 +5,6 @@
 			[$style.hasAction]: !showActionArrow,
 		}"
 		v-bind="$attrs"
-		v-bind="$attrs"
 	>
 		<div :class="$style.nodeIcon">
 			<slot name="icon" />
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
index 0341825749..75a7d18496 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
@@ -7,6 +7,7 @@ export default {
 };
 
 const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNodeIcon,
diff --git a/packages/design-system/src/components/N8nNotice/Notice.stories.ts b/packages/design-system/src/components/N8nNotice/Notice.stories.ts
index 1ca30d9f1e..7da7555cbb 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.stories.ts
+++ b/packages/design-system/src/components/N8nNotice/Notice.stories.ts
@@ -13,6 +13,7 @@ export default {
 };
 
 const SlotTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNotice,
@@ -22,6 +23,7 @@ const SlotTemplate: StoryFn = (args, { argTypes }) => ({
 });
 
 const PropTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nNotice,
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
index 221be4b48f..aafc757c51 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
@@ -9,7 +9,13 @@
 		}"
 		aria-checked="true"
 	>
-		<input type="radio" tabindex="-1" autocomplete="off" :class="$style.input" :value="value" />
+		<input
+			type="radio"
+			tabindex="-1"
+			autocomplete="off"
+			:class="$style.input"
+			:modelValue="value"
+		/>
 		<div
 			:class="{
 				[$style.button]: true,
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
index b52892c5cd..e7b3ac013d 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
@@ -18,7 +18,7 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onInput: action('update:modelValue'),
 };
 
 const Template: StoryFn = (args, { argTypes }) => ({
@@ -27,7 +27,7 @@ const Template: StoryFn = (args, { argTypes }) => ({
 	components: {
 		N8nRadioButtons,
 	},
-	template: `<n8n-radio-buttons v-model="val" v-bind="args" @input="onInput">
+	template: `<n8n-radio-buttons v-model="val" v-bind="args" @update:modelValue="onInput">
 		</n8n-radio-buttons>`,
 	methods,
 	data() {
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
index 1972d4fd60..78aaa19923 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
@@ -7,7 +7,7 @@
 			v-for="option in options"
 			:key="option.value"
 			v-bind="option"
-			:active="value === option.value"
+			:active="modelValue === option.value"
 			:size="size"
 			:disabled="disabled || option.disabled"
 			@click="() => onClick(option)"
@@ -30,7 +30,7 @@ export interface RadioOption {
 export default defineComponent({
 	name: 'n8n-radio-buttons',
 	props: {
-		value: {
+		modelValue: {
 			type: String,
 		},
 		options: {
@@ -52,7 +52,7 @@ export default defineComponent({
 			if (this.disabled || option.disabled) {
 				return;
 			}
-			this.$emit('input', option.value);
+			this.$emit('update:modelValue', option.value);
 		},
 	},
 });
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js
index d89fea1806..bafd4c621a 100644
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js
+++ b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.js
@@ -42,7 +42,7 @@ const Template = (args, { argTypes }) => ({
 	},
 	template: `<div style="width: fit-content; height: fit-content">
 			<n8n-resize-wrapper
-				v-bind="$props"
+				v-bind="args"
 				@resize="onResize"
 				@resizeend="onResizeEnd"
 				@resizestart="onResizeStart"
diff --git a/packages/design-system/src/components/N8nSelect/Select.stories.ts b/packages/design-system/src/components/N8nSelect/Select.stories.ts
index d12354f10d..cf446248c8 100644
--- a/packages/design-system/src/components/N8nSelect/Select.stories.ts
+++ b/packages/design-system/src/components/N8nSelect/Select.stories.ts
@@ -79,6 +79,7 @@ const selects = ['large', 'medium', 'small', 'mini']
 	.join('');
 
 const ManyTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -109,6 +110,7 @@ const selectsWithIcon = ['xlarge', 'large', 'medium', 'small', 'mini']
 	.join('');
 
 const ManyTemplateWithIcon: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
@@ -132,6 +134,7 @@ WithIcon.args = {
 };
 
 const LimitedWidthTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
 		N8nSelect,
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/design-system/src/components/N8nSelect/Select.vue
index 66307f8068..b0fc0c62e6 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/design-system/src/components/N8nSelect/Select.vue
@@ -17,15 +17,13 @@
 			:popper-class="popperClass"
 			ref="innerSelect"
 		>
-			<template #prefix>
+			<template #prefix v-if="$slots.prefix">
 				<slot name="prefix" />
 			</template>
-			<template #suffix>
+			<template #suffix v-if="$slots.suffix">
 				<slot name="suffix" />
 			</template>
-			<template #default>
-				<slot></slot>
-			</template>
+			<slot></slot>
 		</el-select>
 	</div>
 </template>
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.stories.ts b/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
index c4c949bca9..6a4e05d830 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
+++ b/packages/design-system/src/components/N8nSticky/Sticky.stories.ts
@@ -40,7 +40,7 @@ export default {
 };
 
 const methods = {
-	onInput: action('input'),
+	onInput: action('update:modelValue'),
 	onResize: action('resize'),
 	onResizeEnd: action('resizeend'),
 	onResizeStart: action('resizestart'),
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.vue b/packages/design-system/src/components/N8nSticky/Sticky.vue
index 1c18ce051c..e56ed76c36 100644
--- a/packages/design-system/src/components/N8nSticky/Sticky.vue
+++ b/packages/design-system/src/components/N8nSticky/Sticky.vue
@@ -16,46 +16,44 @@
 			@resize="onResize"
 			@resizestart="onResizeStart"
 		>
-			<template>
-				<div
-					v-show="!editMode"
-					class="ph-no-capture"
-					:class="$style.wrapper"
-					@dblclick.stop="onDoubleClick"
-				>
-					<n8n-markdown
-						theme="sticky"
-						:content="content"
-						:withMultiBreaks="true"
-						@markdown-click="onMarkdownClick"
-					/>
-				</div>
-				<div
-					v-show="editMode"
-					@click.stop
-					@mousedown.stop
-					@mouseup.stop
-					@keydown.esc="onInputBlur"
-					@keydown.stop
-					@wheel.stop
-					class="sticky-textarea ph-no-capture"
-					:class="{ 'full-height': !shouldShowFooter }"
-				>
-					<n8n-input
-						:value="content"
-						type="textarea"
-						:rows="5"
-						@blur="onInputBlur"
-						@input="onInput"
-						ref="input"
-					/>
-				</div>
-				<div v-if="editMode && shouldShowFooter" :class="$style.footer">
-					<n8n-text size="xsmall" aligh="right">
-						<span v-html="t('sticky.markdownHint')"></span>
-					</n8n-text>
-				</div>
-			</template>
+			<div
+				v-show="!editMode"
+				class="ph-no-capture"
+				:class="$style.wrapper"
+				@dblclick.stop="onDoubleClick"
+			>
+				<n8n-markdown
+					theme="sticky"
+					:content="content"
+					:withMultiBreaks="true"
+					@markdown-click="onMarkdownClick"
+				/>
+			</div>
+			<div
+				v-show="editMode"
+				@click.stop
+				@mousedown.stop
+				@mouseup.stop
+				@keydown.esc="onInputBlur"
+				@keydown.stop
+				@wheel.stop
+				class="sticky-textarea ph-no-capture"
+				:class="{ 'full-height': !shouldShowFooter }"
+			>
+				<n8n-input
+					:modelValue="content"
+					type="textarea"
+					:rows="5"
+					@blur="onInputBlur"
+					@update:modelValue="onInput"
+					ref="input"
+				/>
+			</div>
+			<div v-if="editMode && shouldShowFooter" :class="$style.footer">
+				<n8n-text size="xsmall" aligh="right">
+					<span v-html="t('sticky.markdownHint')"></span>
+				</n8n-text>
+			</div>
 		</n8n-resize-wrapper>
 	</div>
 </template>
diff --git a/packages/design-system/src/components/index.ts b/packages/design-system/src/components/index.ts
index e09181c068..8b41b119d7 100644
--- a/packages/design-system/src/components/index.ts
+++ b/packages/design-system/src/components/index.ts
@@ -26,19 +26,19 @@ export { default as N8nLoading } from './N8nLoading';
 export { default as N8nMarkdown } from './N8nMarkdown';
 export { default as N8nMenu } from './N8nMenu';
 export { default as N8nMenuItem } from './N8nMenuItem';
-// export { default as N8nNodeCreatorNode } from './N8nNodeCreatorNode';
-// export { default as N8nNodeIcon } from './N8nNodeIcon';
-// export { default as N8nNotice } from './N8nNotice';
-// export { default as N8nOption } from './N8nOption';
+export { default as N8nNodeCreatorNode } from './N8nNodeCreatorNode';
+export { default as N8nNodeIcon } from './N8nNodeIcon';
+export { default as N8nNotice } from './N8nNotice';
+export { default as N8nOption } from './N8nOption';
 export { default as N8nPopover } from './N8nPopover';
-// export { default as N8nPulse } from './N8nPulse';
-// export { default as N8nRadioButtons } from './N8nRadioButtons';
-// export { default as N8nSelect } from './N8nSelect';
-// export { default as N8nSpinner } from './N8nSpinner';
-// export { default as N8nSticky } from './N8nSticky';
+export { default as N8nPulse } from './N8nPulse';
+export { default as N8nRadioButtons } from './N8nRadioButtons';
+export { default as N8nSelect } from './N8nSelect';
+export { default as N8nSpinner } from './N8nSpinner';
+export { default as N8nSticky } from './N8nSticky';
+export { default as N8nTags } from './N8nTags';
 // export { default as N8nTabs } from './N8nTabs';
 // export { default as N8nTag } from './N8nTag';
-// export { default as N8nTags } from './N8nTags';
 export { default as N8nText } from './N8nText';
 export { default as N8nTooltip } from './N8nTooltip';
 // export { default as N8nTree } from './N8nTree';
diff --git a/packages/design-system/src/plugin.ts b/packages/design-system/src/plugin.ts
index a39fad9606..9de54425c2 100644
--- a/packages/design-system/src/plugin.ts
+++ b/packages/design-system/src/plugin.ts
@@ -26,22 +26,22 @@ import {
 	N8nInputNumber,
 	N8nLink,
 	N8nLoading,
-	// N8nMarkdown,
-	// N8nMenu,
-	// N8nMenuItem,
-	// N8nNodeCreatorNode,
-	// N8nNodeIcon,
-	// N8nNotice,
-	// N8nOption,
+	N8nMarkdown,
+	N8nMenu,
+	N8nMenuItem,
+	N8nNodeCreatorNode,
+	N8nNodeIcon,
+	N8nNotice,
+	N8nOption,
 	N8nPopover,
-	// N8nPulse,
-	// N8nRadioButtons,
-	// N8nSelect,
-	// N8nSpinner,
-	// N8nSticky,
+	N8nPulse,
+	N8nRadioButtons,
+	N8nSelect,
+	N8nSpinner,
+	N8nSticky,
+	N8nTags,
 	// N8nTabs,
 	// N8nTag,
-	// N8nTags,
 	N8nText,
 	N8nTooltip,
 	// N8nTree,
@@ -81,20 +81,20 @@ export const N8nPlugin: Plugin<{}> = {
 		app.component('n8n-input-number', N8nInputNumber);
 		app.component('n8n-link', N8nLink);
 		app.component('n8n-loading', N8nLoading);
-		// app.component('n8n-markdown', N8nMarkdown);
-		// app.component('n8n-menu', N8nMenu);
-		// app.component('n8n-menu-item', N8nMenuItem);
-		// app.component('n8n-node-creator-node', N8nNodeCreatorNode);
-		// app.component('n8n-node-icon', N8nNodeIcon);
-		// app.component('n8n-notice', N8nNotice);
-		// app.component('n8n-option', N8nOption);
+		app.component('n8n-markdown', N8nMarkdown);
+		app.component('n8n-menu', N8nMenu);
+		app.component('n8n-menu-item', N8nMenuItem);
+		app.component('n8n-node-creator-node', N8nNodeCreatorNode);
+		app.component('n8n-node-icon', N8nNodeIcon);
+		app.component('n8n-notice', N8nNotice);
+		app.component('n8n-option', N8nOption);
 		app.component('n8n-popover', N8nPopover);
-		// app.component('n8n-pulse', N8nPulse);
-		// app.component('n8n-select', N8nSelect);
-		// app.component('n8n-spinner', N8nSpinner);
-		// app.component('n8n-sticky', N8nSticky);
-		// app.component('n8n-radio-buttons', N8nRadioButtons);
-		// app.component('n8n-tags', N8nTags);
+		app.component('n8n-pulse', N8nPulse);
+		app.component('n8n-radio-buttons', N8nRadioButtons);
+		app.component('n8n-select', N8nSelect);
+		app.component('n8n-spinner', N8nSpinner);
+		app.component('n8n-sticky', N8nSticky);
+		app.component('n8n-tags', N8nTags);
 		// app.component('n8n-tabs', N8nTabs);
 		// app.component('n8n-tag', N8nTag);
 		app.component('n8n-text', N8nText);
diff --git a/packages/editor-ui/src/components/CredentialsSelect.vue b/packages/editor-ui/src/components/CredentialsSelect.vue
index 83a1fd9593..f6e5d111e0 100644
--- a/packages/editor-ui/src/components/CredentialsSelect.vue
+++ b/packages/editor-ui/src/components/CredentialsSelect.vue
@@ -4,7 +4,7 @@
 			<n8n-select
 				:size="inputSize"
 				filterable
-				:value="displayValue"
+				:modelValue="displayValue"
 				:placeholder="
 					parameter.placeholder ? getPlaceholder() : $locale.baseText('parameterInput.select')
 				"
diff --git a/packages/editor-ui/src/components/CredentialsSelectModal.vue b/packages/editor-ui/src/components/CredentialsSelectModal.vue
index ef1bc49e37..bda48c24eb 100644
--- a/packages/editor-ui/src/components/CredentialsSelectModal.vue
+++ b/packages/editor-ui/src/components/CredentialsSelectModal.vue
@@ -24,7 +24,7 @@
 					:placeholder="$locale.baseText('credentialSelectModal.searchForApp')"
 					size="xlarge"
 					ref="select"
-					:value="selected"
+					:modelValue="selected"
 					@change="onSelect"
 					data-test-id="new-credential-type-select"
 				>
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 25d62b3657..1910f49b5b 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -27,8 +27,8 @@
 					v-if="parentNodes.length"
 					:popper-append-to-body="true"
 					size="small"
-					:value="currentNodeName"
-					@input="onSelect"
+					:modelValue="currentNodeName"
+					@update:modelValue="onSelect"
 					:no-data-text="$locale.baseText('ndv.input.noNodesFound')"
 					:placeholder="$locale.baseText('ndv.input.parentNodes')"
 					filterable
diff --git a/packages/editor-ui/src/components/MainHeader/TabBar.vue b/packages/editor-ui/src/components/MainHeader/TabBar.vue
index 3142a62c5d..0a70cb2fe3 100644
--- a/packages/editor-ui/src/components/MainHeader/TabBar.vue
+++ b/packages/editor-ui/src/components/MainHeader/TabBar.vue
@@ -7,7 +7,7 @@
 			[$style.menuCollapsed]: mainSidebarCollapsed,
 		}"
 	>
-		<n8n-radio-buttons :value="activeTab" :options="items" @input="onSelect" />
+		<n8n-radio-buttons :modelValue="activeTab" :options="items" @update:modelValue="onSelect" />
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index fb5567b347..52236e0596 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -29,7 +29,7 @@
 					data-test-id="node-credentials-select"
 				>
 					<n8n-select
-						:value="getSelectedId(credentialTypeDescription.name)"
+						:modelValue="getSelectedId(credentialTypeDescription.name)"
 						@change="
 							(value) =>
 								onCredentialSelected(
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 837535918f..6b2de3076e 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -252,7 +252,7 @@
 				ref="inputField"
 				:size="inputSize"
 				filterable
-				:value="displayValue"
+				:modelValue="displayValue"
 				:placeholder="
 					parameter.placeholder ? getPlaceholder() : $locale.baseText('parameterInput.select')
 				"
@@ -292,7 +292,7 @@
 				:size="inputSize"
 				filterable
 				multiple
-				:value="displayValue"
+				:modelValue="displayValue"
 				:loading="remoteParameterOptionsLoading"
 				:disabled="isReadOnly || remoteParameterOptionsLoading"
 				:title="displayTitle"
diff --git a/packages/editor-ui/src/components/ParameterOptions.vue b/packages/editor-ui/src/components/ParameterOptions.vue
index e4453ccc72..9bb6742450 100644
--- a/packages/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/editor-ui/src/components/ParameterOptions.vue
@@ -27,13 +27,13 @@
 			<n8n-radio-buttons
 				v-if="shouldShowExpressionSelector"
 				size="small"
-				:value="selectedView"
+				:modelValue="selectedView"
 				:disabled="isReadOnly"
-				@input="onViewSelected"
 				:options="[
 					{ label: $locale.baseText('parameterInput.fixed'), value: 'fixed' },
 					{ label: $locale.baseText('parameterInput.expression'), value: 'expression' },
 				]"
+				@update:modelValue="onViewSelected"
 			/>
 		</div>
 	</div>
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index ddd864fe93..f392c312f3 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -45,7 +45,7 @@
 			>
 				<div v-if="hasMultipleModes" :class="$style.modeSelector">
 					<n8n-select
-						:value="selectedMode"
+						:modelValue="selectedMode"
 						filterable
 						:size="inputSize"
 						:disabled="isReadOnly"
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
index 21d633c1f1..7941fc29b8 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
@@ -111,7 +111,7 @@ defineExpose({
 		>
 			<template>
 				<div class="mt-5xs">
-					<n8n-select :value="selected" :size="props.inputSize" @change="onModeChanged">
+					<n8n-select :modelValue="selected" :size="props.inputSize" @change="onModeChanged">
 						<n8n-option
 							v-for="option in mappingModeOptions"
 							:key="option.value"
diff --git a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
index 1356cbbd66..3b34ac3d1d 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
@@ -131,7 +131,7 @@ defineExpose({
 		>
 			<n8n-select
 				:multiple="resourceMapperTypeOptions?.multiKeyMatch === true"
-				:value="state.selected"
+				:modelValue="state.selected"
 				:size="props.inputSize"
 				:disabled="loading"
 				@change="onSelectionChange"
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index e1c04480b8..bded4dee20 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -53,10 +53,10 @@
 						((jsonData && jsonData.length > 0) || (binaryData && binaryData.length > 0)) &&
 						!editMode.enabled
 					"
-					:value="displayMode"
+					:modelValue="displayMode"
 					:options="buttons"
-					@input="onDisplayModeChange"
 					data-test-id="ndv-run-data-display-mode"
+					@update:modelValue="onDisplayModeChange"
 				/>
 				<n8n-icon-button
 					v-if="canPinData && !isReadOnly"
@@ -129,8 +129,8 @@
 		>
 			<n8n-select
 				size="small"
-				:value="runIndex"
-				@input="onRunIndexChange"
+				:modelValue="runIndex"
+				@update:modelValue="onRunIndexChange"
 				@click.stop
 				popper-append-to-body
 			>
@@ -451,7 +451,12 @@
 			</el-pagination>
 
 			<div :class="$style.pageSizeSelector">
-				<n8n-select size="mini" :value="pageSize" @input="onPageSizeChange" popper-append-to-body>
+				<n8n-select
+					size="mini"
+					:modelValue="pageSize"
+					@update:modelValue="onPageSizeChange"
+					popper-append-to-body
+				>
 					<template #prepend>{{ $locale.baseText('ndv.output.pageSize') }}</template>
 					<n8n-option v-for="size in pageSizes" :key="size" :label="size" :value="size">
 					</n8n-option>
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index 4dc2604223..4b857ac59a 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
@@ -83,7 +83,7 @@
 						:underline="false"
 					>
 						<n8n-select
-							:value="typeSelectValue"
+							:modelValue="typeSelectValue"
 							:placeholder="typeSelectPlaceholder"
 							@change="onTypeSelectInput"
 							data-test-id="select-destination-type"
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 601a936412..81e31acb93 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -2,7 +2,7 @@
 	<div :class="{ 'tags-container': true, focused }" @keydown.stop v-click-outside="onClickOutside">
 		<n8n-select
 			:popperAppendToBody="false"
-			:value="appliedTags"
+			:modelValue="appliedTags"
 			:loading="tagsStore.isLoading"
 			:placeholder="placeholder"
 			:filter-method="filterOptions"
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index dd35729124..e9d5f77d39 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -55,7 +55,7 @@
 						<template #actions="{ user }">
 							<n8n-select
 								:class="$style.roleSelect"
-								value="editor"
+								modelValue="editor"
 								size="small"
 								@change="onRoleAction(user, $event)"
 							>
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index 4b88f9aa46..c9299e50d1 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/editor-ui/src/views/CredentialsView.vue
@@ -23,13 +23,13 @@
 					class="mb-3xs"
 				/>
 				<n8n-select
-					:value="filters.type"
+					:modelValue="filters.type"
 					size="medium"
 					multiple
 					filterable
 					ref="typeInput"
 					:class="$style['type-input']"
-					@input="setKeyValue('type', $event)"
+					@update:modelValue="setKeyValue('type', $event)"
 				>
 					<n8n-option
 						v-for="credentialType in allCredentialTypes"
diff --git a/packages/editor-ui/src/views/SettingsVersionControl.vue b/packages/editor-ui/src/views/SettingsVersionControl.vue
index 877dfd24b1..1f12f00e20 100644
--- a/packages/editor-ui/src/views/SettingsVersionControl.vue
+++ b/packages/editor-ui/src/views/SettingsVersionControl.vue
@@ -307,11 +307,11 @@ const refreshBranches = async () => {
 					<label>{{ locale.baseText('settings.versionControl.branches') }}</label>
 					<div :class="$style.branchSelection">
 						<n8n-select
-							:value="versionControlStore.preferences.branchName"
+							:modelValue="versionControlStore.preferences.branchName"
 							class="mb-s"
 							size="medium"
 							filterable
-							@input="onSelect"
+							@update:modelValue="onSelect"
 							data-test-id="version-control-branch-select"
 						>
 							<n8n-option
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 5ce773c7a7..9827594da6 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -77,7 +77,11 @@
 					color="text-base"
 					class="mb-3xs"
 				/>
-				<n8n-select :value="filters.status" @input="setKeyValue('status', $event)" size="medium">
+				<n8n-select
+					:modelValue="filters.status"
+					@update:modelValue="setKeyValue('status', $event)"
+					size="medium"
+				>
 					<n8n-option
 						v-for="option in statusFilterOptions"
 						:key="option.label"