diff --git a/src/Components/CreateImageWizard/steps/ImageOutput/ArchSelect.tsx b/src/Components/CreateImageWizard/steps/ImageOutput/ArchSelect.tsx
index 32fe90c72..7db023630 100644
--- a/src/Components/CreateImageWizard/steps/ImageOutput/ArchSelect.tsx
+++ b/src/Components/CreateImageWizard/steps/ImageOutput/ArchSelect.tsx
@@ -1,11 +1,13 @@
 import React, { ReactElement, useState } from 'react';
 
-import { FormGroup } from '@patternfly/react-core';
 import {
+  FormGroup,
+  MenuToggle,
+  MenuToggleElement,
   Select,
+  SelectList,
   SelectOption,
-  SelectVariant,
-} from '@patternfly/react-core/deprecated';
+} from '@patternfly/react-core';
 
 import { ARCHES } from '../../../../constants';
 import { useAppDispatch, useAppSelector } from '../../../../store/hooks';
@@ -49,17 +51,34 @@ const ArchSelect = () => {
     return options;
   };
 
+  const onToggleClick = () => {
+    setIsOpen(!isOpen);
+  };
+
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      ref={toggleRef}
+      onClick={onToggleClick}
+      isExpanded={isOpen}
+      isFullWidth
+      data-testid="arch_select"
+    >
+      {arch}
+    </MenuToggle>
+  );
+
   return (
     <FormGroup isRequired={true} label="Architecture">
       <Select
         ouiaId="arch_select"
-        variant={SelectVariant.single}
-        onToggle={() => setIsOpen(!isOpen)}
-        onSelect={setArch}
-        selections={arch}
         isOpen={isOpen}
+        selected={arch}
+        onSelect={setArch}
+        onOpenChange={(isOpen: boolean) => setIsOpen(isOpen)}
+        toggle={toggle}
+        shouldFocusToggleOnSelect
       >
-        {setSelectOptions()}
+        <SelectList>{setSelectOptions()}</SelectList>
       </Select>
     </FormGroup>
   );
diff --git a/src/test/Components/CreateImageWizard/steps/ImageOutput/ImageOutput.test.tsx b/src/test/Components/CreateImageWizard/steps/ImageOutput/ImageOutput.test.tsx
index b9c9af573..cb329b2fe 100644
--- a/src/test/Components/CreateImageWizard/steps/ImageOutput/ImageOutput.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/ImageOutput/ImageOutput.test.tsx
@@ -89,9 +89,7 @@ const selectCentos9 = async () => {
 
 const openArchitectureMenu = async () => {
   const user = userEvent.setup();
-  const releaseMenu = screen.getAllByRole('button', {
-    name: /options menu/i,
-  })[1];
+  const releaseMenu = screen.getByTestId('arch_select');
   await waitFor(() => user.click(releaseMenu));
 };