diff --git a/eslint.config.js b/eslint.config.js
index 4ebdd453..7f27fed0 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -86,6 +86,7 @@ module.exports = defineConfig([
         ],
         pathGroupsExcludedImportTypes: ['react']
       }],
+      'no-duplicate-imports': 'error',
       'prefer-const': ['error', {
         destructuring: 'any',
       }],
diff --git a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemConfiguration.tsx b/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemConfiguration.tsx
index aec6f409..dd24d4f8 100644
--- a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemConfiguration.tsx
+++ b/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemConfiguration.tsx
@@ -6,8 +6,7 @@ import {
   Content,
   ContentVariants,
 } from '@patternfly/react-core';
-import { PlusCircleIcon } from '@patternfly/react-icons';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { ExternalLinkAltIcon, PlusCircleIcon } from '@patternfly/react-icons';
 import { v4 as uuidv4 } from 'uuid';
 
 import FileSystemTable from './FileSystemTable';
diff --git a/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeyInformation.tsx b/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeyInformation.tsx
index 7989cfda..d2c0df53 100644
--- a/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeyInformation.tsx
+++ b/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeyInformation.tsx
@@ -2,11 +2,12 @@ import React from 'react';
 
 import {
   Alert,
+  Button,
   Spinner,
   Content,
   ContentVariants,
+  Popover,
 } from '@patternfly/react-core';
-import { Button, Popover } from '@patternfly/react-core';
 import { HelpIcon } from '@patternfly/react-icons';
 import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
 
diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx
index 446fc31e..3ef3392a 100644
--- a/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx
+++ b/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx
@@ -14,11 +14,11 @@ import {
 import { ExclamationTriangleIcon } from '@patternfly/react-icons';
 
 import {
+  FSReviewTable,
   PackagesTable,
   RepositoriesTable,
   SnapshotTable,
 } from './ReviewStepTables';
-import { FSReviewTable } from './ReviewStepTables';
 
 import {
   ON_PREM_RELEASES,
diff --git a/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx b/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx
index 98d5b482..adeba4af 100644
--- a/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx
+++ b/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx
@@ -1,6 +1,8 @@
 import React, { useEffect, useState } from 'react';
 
 import {
+  HelperText,
+  HelperTextItem,
   Select,
   SelectOption,
   SelectList,
@@ -12,8 +14,6 @@ import {
   Button,
   FormGroup,
 } from '@patternfly/react-core';
-import { HelperTextItem } from '@patternfly/react-core';
-import { HelperText } from '@patternfly/react-core';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
diff --git a/src/Components/ImagesTable/Instance.tsx b/src/Components/ImagesTable/Instance.tsx
index eadcbed6..43967979 100644
--- a/src/Components/ImagesTable/Instance.tsx
+++ b/src/Components/ImagesTable/Instance.tsx
@@ -31,8 +31,7 @@ import {
   MODAL_ANCHOR,
   SEARCH_INPUT,
 } from '../../constants';
-import { useGetBlueprintsQuery } from '../../store/backendApi';
-import { useGetComposeStatusQuery } from '../../store/backendApi';
+import { useGetBlueprintsQuery, useGetComposeStatusQuery } from '../../store/backendApi';
 import {
   selectSelectedBlueprintId,
   selectBlueprintSearchInput,
diff --git a/src/Components/ImagesTable/Target.tsx b/src/Components/ImagesTable/Target.tsx
index 5531d9fa..9d6c50de 100644
--- a/src/Components/ImagesTable/Target.tsx
+++ b/src/Components/ImagesTable/Target.tsx
@@ -3,8 +3,7 @@ import React from 'react';
 import { Skeleton } from '@patternfly/react-core';
 
 import { targetOptions } from '../../constants';
-import { useGetComposeClonesQuery } from '../../store/imageBuilderApi';
-import { ComposesResponseItem } from '../../store/imageBuilderApi';
+import { ComposesResponseItem, useGetComposeClonesQuery } from '../../store/imageBuilderApi';
 
 type TargetPropTypes = {
   compose: ComposesResponseItem;
diff --git a/src/store/listenerMiddleware.ts b/src/store/listenerMiddleware.ts
index 03b76e9b..f5c089d0 100644
--- a/src/store/listenerMiddleware.ts
+++ b/src/store/listenerMiddleware.ts
@@ -1,7 +1,11 @@
 // listenerMiddleware.ts
 // https://redux-toolkit.js.org/api/createListenerMiddleware#typescript-usage
-import { createListenerMiddleware, addListener } from '@reduxjs/toolkit';
-import type { TypedStartListening, TypedAddListener } from '@reduxjs/toolkit';
+import {
+  createListenerMiddleware,
+  addListener,
+  type TypedStartListening,
+  type TypedAddListener
+} from '@reduxjs/toolkit';
 
 import type { RootState, AppDispatch } from './index';
 
diff --git a/src/test/Components/CreateImageWizard/steps/Details/Details.test.tsx b/src/test/Components/CreateImageWizard/steps/Details/Details.test.tsx
index 94179205..7de2f02f 100644
--- a/src/test/Components/CreateImageWizard/steps/Details/Details.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Details/Details.test.tsx
@@ -4,11 +4,12 @@ import { userEvent } from '@testing-library/user-event';
 import { CREATE_BLUEPRINT, EDIT_BLUEPRINT } from '../../../../../constants';
 import { mockBlueprintIds } from '../../../../fixtures/blueprints';
 import { detailsCreateBlueprintRequest } from '../../../../fixtures/editMode';
-import { clickNext, getNextButton } from '../../wizardTestUtils';
 import {
   blueprintRequest,
+  clickNext,
   clickRegisterLater,
   enterBlueprintName,
+  getNextButton,
   goToRegistrationStep,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
diff --git a/src/test/Components/CreateImageWizard/steps/FileSystemConfiguration/FileSystemConfiguration.test.tsx b/src/test/Components/CreateImageWizard/steps/FileSystemConfiguration/FileSystemConfiguration.test.tsx
index b4fadc1f..097c1ddb 100644
--- a/src/test/Components/CreateImageWizard/steps/FileSystemConfiguration/FileSystemConfiguration.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/FileSystemConfiguration/FileSystemConfiguration.test.tsx
@@ -10,15 +10,13 @@ import {
 } from '../../../../../constants';
 import { mockBlueprintIds } from '../../../../fixtures/blueprints';
 import { fscCreateBlueprintRequest } from '../../../../fixtures/editMode';
-import {
-  clickNext,
-  clickReviewAndFinish,
-  getNextButton,
-} from '../../wizardTestUtils';
 import {
   blueprintRequest,
+  clickNext,
   clickRegisterLater,
+  clickReviewAndFinish,
   enterBlueprintName,
+  getNextButton,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
diff --git a/src/test/Components/CreateImageWizard/steps/Firewall/Firewall.test.tsx b/src/test/Components/CreateImageWizard/steps/Firewall/Firewall.test.tsx
index b3c0dd40..72eab036 100644
--- a/src/test/Components/CreateImageWizard/steps/Firewall/Firewall.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Firewall/Firewall.test.tsx
@@ -9,14 +9,15 @@ import {
   blueprintRequest,
   clickBack,
   clickNext,
+  clickRegisterLater,
   enterBlueprintName,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
+  renderCreateMode,
   renderEditMode,
   verifyCancelButton,
 } from '../../wizardTestUtils';
-import { clickRegisterLater, renderCreateMode } from '../../wizardTestUtils';
 
 let router: RemixRouter | undefined = undefined;
 
diff --git a/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx b/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx
index 7e0b1c44..50643413 100644
--- a/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx
@@ -16,23 +16,21 @@ import {
   firstBootCreateBlueprintRequest,
   firstBootData,
 } from '../../../../fixtures/editMode';
-import {
-  clickNext,
-  clickReviewAndFinish,
-  goToOscapStep,
-  selectGuestImageTarget,
-  getNextButton,
-  selectRhel9,
-} from '../../wizardTestUtils';
 import {
   blueprintRequest,
+  clickNext,
   clickRegisterLater,
+  clickReviewAndFinish,
   enterBlueprintName,
+  getNextButton,
+  goToOscapStep,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
   renderCreateMode,
   renderEditMode,
+  selectGuestImageTarget,
+  selectRhel9,
 } from '../../wizardTestUtils';
 
 const goToFirstBootStep = async (): Promise<void> => {
diff --git a/src/test/Components/CreateImageWizard/steps/Hostname/Hostname.test.tsx b/src/test/Components/CreateImageWizard/steps/Hostname/Hostname.test.tsx
index 40249477..1c12717e 100644
--- a/src/test/Components/CreateImageWizard/steps/Hostname/Hostname.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Hostname/Hostname.test.tsx
@@ -9,15 +9,16 @@ import {
   blueprintRequest,
   clickBack,
   clickNext,
+  clickRegisterLater,
   enterBlueprintName,
   getNextButton,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
+  renderCreateMode,
   renderEditMode,
   verifyCancelButton,
 } from '../../wizardTestUtils';
-import { clickRegisterLater, renderCreateMode } from '../../wizardTestUtils';
 
 let router: RemixRouter | undefined = undefined;
 
diff --git a/src/test/Components/CreateImageWizard/steps/ImageOutput/ImageOutput.test.tsx b/src/test/Components/CreateImageWizard/steps/ImageOutput/ImageOutput.test.tsx
index 784310b0..51cf6452 100644
--- a/src/test/Components/CreateImageWizard/steps/ImageOutput/ImageOutput.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/ImageOutput/ImageOutput.test.tsx
@@ -25,22 +25,20 @@ import {
   rhel9CreateBlueprintRequest,
   x86_64CreateBlueprintRequest,
 } from '../../../../fixtures/editMode';
-import {
-  clickNext,
-  getNextButton,
-  openReleaseMenu,
-  selectRhel9,
-  verifyCancelButton,
-} from '../../wizardTestUtils';
 import {
   blueprintRequest,
+  clickNext,
   clickRegisterLater,
   enterBlueprintName,
+  getNextButton,
   imageRequest,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
+  openReleaseMenu,
   renderCreateMode,
   renderEditMode,
+  selectRhel9,
+  verifyCancelButton,
 } from '../../wizardTestUtils';
 import { goToDetailsStep } from '../Details/Details.test';
 
diff --git a/src/test/Components/CreateImageWizard/steps/Kernel/Kernel.test.tsx b/src/test/Components/CreateImageWizard/steps/Kernel/Kernel.test.tsx
index 920a53cc..fef4990a 100644
--- a/src/test/Components/CreateImageWizard/steps/Kernel/Kernel.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Kernel/Kernel.test.tsx
@@ -13,15 +13,16 @@ import {
   blueprintRequest,
   clickBack,
   clickNext,
+  clickRegisterLater,
   enterBlueprintName,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
+  renderCreateMode,
   renderEditMode,
   selectRhel9,
   verifyCancelButton,
 } from '../../wizardTestUtils';
-import { clickRegisterLater, renderCreateMode } from '../../wizardTestUtils';
 
 let router: RemixRouter | undefined = undefined;
 
diff --git a/src/test/Components/CreateImageWizard/steps/Locale/Locale.test.tsx b/src/test/Components/CreateImageWizard/steps/Locale/Locale.test.tsx
index fbdc5e5b..06411911 100644
--- a/src/test/Components/CreateImageWizard/steps/Locale/Locale.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Locale/Locale.test.tsx
@@ -9,14 +9,15 @@ import {
   blueprintRequest,
   clickBack,
   clickNext,
+  clickRegisterLater,
   enterBlueprintName,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
+  renderCreateMode,
   renderEditMode,
   verifyCancelButton,
 } from '../../wizardTestUtils';
-import { clickRegisterLater, renderCreateMode } from '../../wizardTestUtils';
 
 let router: RemixRouter | undefined = undefined;
 
diff --git a/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx b/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx
index 8f050685..b0269b75 100644
--- a/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Oscap/Compliance.test.tsx
@@ -5,8 +5,8 @@ import { CREATE_BLUEPRINT, EDIT_BLUEPRINT } from '../../../../../constants';
 import { CreateBlueprintRequest } from '../../../../../store/imageBuilderApi';
 import { mockBlueprintIds } from '../../../../fixtures/blueprints';
 import { complianceCreateBlueprintRequest } from '../../../../fixtures/editMode';
-import { clickNext, selectRhel9 } from '../../wizardTestUtils';
 import {
+  clickNext,
   clickRegisterLater,
   enterBlueprintName,
   interceptBlueprintRequest,
@@ -14,6 +14,7 @@ import {
   openAndDismissSaveAndBuildModal,
   renderCreateMode,
   renderEditMode,
+  selectRhel9,
 } from '../../wizardTestUtils';
 
 // Overwrite
diff --git a/src/test/Components/CreateImageWizard/steps/Oscap/Oscap.test.tsx b/src/test/Components/CreateImageWizard/steps/Oscap/Oscap.test.tsx
index ad144af8..8def9399 100644
--- a/src/test/Components/CreateImageWizard/steps/Oscap/Oscap.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Oscap/Oscap.test.tsx
@@ -14,7 +14,10 @@ import {
   oscapCreateBlueprintRequest,
 } from '../../../../fixtures/editMode';
 import {
+  clickNext,
+  clickReviewAndFinish,
   enterBlueprintName,
+  goToOscapStep,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
@@ -23,11 +26,6 @@ import {
   selectGuestImageTarget,
   selectRhel9,
 } from '../../wizardTestUtils';
-import {
-  clickNext,
-  clickReviewAndFinish,
-  goToOscapStep,
-} from '../../wizardTestUtils';
 
 const selectRhel8 = async () => {
   const user = userEvent.setup();
diff --git a/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx b/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx
index efc3a614..7efb8536 100644
--- a/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx
@@ -17,15 +17,10 @@ import {
   packagesCreateBlueprintRequest,
 } from '../../../../fixtures/editMode';
 import {
+  blueprintRequest,
   clickBack,
   clickNext,
   clickReviewAndFinish,
-  selectRhel9,
-  verifyCancelButton,
-} from '../../wizardTestUtils';
-import { selectCustomRepo } from '../../wizardTestUtils';
-import {
-  blueprintRequest,
   clickRegisterLater,
   enterBlueprintName,
   interceptBlueprintRequest,
@@ -33,6 +28,9 @@ import {
   openAndDismissSaveAndBuildModal,
   renderCreateMode,
   renderEditMode,
+  selectCustomRepo,
+  selectRhel9,
+  verifyCancelButton,
 } from '../../wizardTestUtils';
 
 const router: RemixRouter | undefined = undefined;
diff --git a/src/test/Components/CreateImageWizard/steps/Repositories/Repositories.test.tsx b/src/test/Components/CreateImageWizard/steps/Repositories/Repositories.test.tsx
index 1e7bf552..e39551dc 100644
--- a/src/test/Components/CreateImageWizard/steps/Repositories/Repositories.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Repositories/Repositories.test.tsx
@@ -14,13 +14,11 @@ import {
   repositoriesCreateBlueprintRequest,
 } from '../../../../fixtures/editMode';
 import {
+  blueprintRequest,
   clickBack,
   clickNext,
-  clickReviewAndFinish,
-} from '../../wizardTestUtils';
-import {
-  blueprintRequest,
   clickRegisterLater,
+  clickReviewAndFinish,
   enterBlueprintName,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
diff --git a/src/test/Components/CreateImageWizard/steps/Services/Services.test.tsx b/src/test/Components/CreateImageWizard/steps/Services/Services.test.tsx
index a3d9075c..d66b93c4 100644
--- a/src/test/Components/CreateImageWizard/steps/Services/Services.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Services/Services.test.tsx
@@ -13,15 +13,16 @@ import {
   blueprintRequest,
   clickBack,
   clickNext,
+  clickRegisterLater,
   enterBlueprintName,
   interceptBlueprintRequest,
   openAndDismissSaveAndBuildModal,
   interceptEditBlueprintRequest,
+  renderCreateMode,
   renderEditMode,
   verifyCancelButton,
   selectRhel9,
 } from '../../wizardTestUtils';
-import { clickRegisterLater, renderCreateMode } from '../../wizardTestUtils';
 
 let router: RemixRouter | undefined = undefined;
 
diff --git a/src/test/Components/CreateImageWizard/steps/Snapshot/Snapshot.test.tsx b/src/test/Components/CreateImageWizard/steps/Snapshot/Snapshot.test.tsx
index cc79f8d7..81e717d3 100644
--- a/src/test/Components/CreateImageWizard/steps/Snapshot/Snapshot.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Snapshot/Snapshot.test.tsx
@@ -10,15 +10,13 @@ import {
   expectedPayloadRepositories,
   snapshotCreateBlueprintRequest,
 } from '../../../../fixtures/editMode';
-import {
-  clickNext,
-  clickReviewAndFinish,
-  getNextButton,
-} from '../../wizardTestUtils';
 import {
   blueprintRequest,
+  clickNext,
   clickRegisterLater,
+  clickReviewAndFinish,
   enterBlueprintName,
+  getNextButton,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
diff --git a/src/test/Components/CreateImageWizard/steps/TargetEnvironment/AwsTarget.test.tsx b/src/test/Components/CreateImageWizard/steps/TargetEnvironment/AwsTarget.test.tsx
index 8c8eca33..806e51a6 100644
--- a/src/test/Components/CreateImageWizard/steps/TargetEnvironment/AwsTarget.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/TargetEnvironment/AwsTarget.test.tsx
@@ -16,20 +16,18 @@ import { mockBlueprintIds } from '../../../../fixtures/blueprints';
 import { awsCreateBlueprintRequest } from '../../../../fixtures/editMode';
 import { server } from '../../../../mocks/server';
 import {
+  blueprintRequest,
   clickBack,
   clickNext,
-  getNextButton,
-  verifyCancelButton,
-} from '../../wizardTestUtils';
-import {
-  blueprintRequest,
   clickRegisterLater,
   enterBlueprintName,
+  getNextButton,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
   renderCreateMode,
   renderEditMode,
+  verifyCancelButton,
 } from '../../wizardTestUtils';
 
 const goToAwsStep = async () => {
diff --git a/src/test/Components/CreateImageWizard/steps/TargetEnvironment/AzureTarget.test.tsx b/src/test/Components/CreateImageWizard/steps/TargetEnvironment/AzureTarget.test.tsx
index 484e61c4..5fa248b8 100644
--- a/src/test/Components/CreateImageWizard/steps/TargetEnvironment/AzureTarget.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/TargetEnvironment/AzureTarget.test.tsx
@@ -3,8 +3,7 @@ import { screen, waitFor, within } from '@testing-library/react';
 import { userEvent } from '@testing-library/user-event';
 import { http, HttpResponse } from 'msw';
 
-import { CREATE_BLUEPRINT, EDIT_BLUEPRINT } from '../../../../../constants';
-import { PROVISIONING_API } from '../../../../../constants';
+import { CREATE_BLUEPRINT, EDIT_BLUEPRINT, PROVISIONING_API } from '../../../../../constants';
 import {
   CreateBlueprintRequest,
   ImageRequest,
@@ -13,20 +12,18 @@ import { mockBlueprintIds } from '../../../../fixtures/blueprints';
 import { azureCreateBlueprintRequest } from '../../../../fixtures/editMode';
 import { server } from '../../../../mocks/server';
 import {
+  blueprintRequest,
   clickBack,
   clickNext,
-  getNextButton,
-  verifyCancelButton,
-} from '../../wizardTestUtils';
-import {
-  blueprintRequest,
   clickRegisterLater,
   enterBlueprintName,
+  getNextButton,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
   renderCreateMode,
   renderEditMode,
+  verifyCancelButton,
 } from '../../wizardTestUtils';
 
 // The router is just initiliazed here, it's assigned a value in the tests
diff --git a/src/test/Components/CreateImageWizard/steps/TargetEnvironment/GCPTarget.test.tsx b/src/test/Components/CreateImageWizard/steps/TargetEnvironment/GCPTarget.test.tsx
index 7603fb12..5337897f 100644
--- a/src/test/Components/CreateImageWizard/steps/TargetEnvironment/GCPTarget.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/TargetEnvironment/GCPTarget.test.tsx
@@ -12,21 +12,19 @@ import {
 import { mockBlueprintIds } from '../../../../fixtures/blueprints';
 import { gcpCreateBlueprintRequest } from '../../../../fixtures/editMode';
 import {
+  blueprintRequest,
   clickBack,
   clickNext,
-  getNextButton,
-  verifyCancelButton,
-} from '../../wizardTestUtils';
-import {
-  blueprintRequest,
   clickRegisterLater,
   enterBlueprintName,
+  getNextButton,
   imageRequest,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
   renderCreateMode,
   renderEditMode,
+  verifyCancelButton,
 } from '../../wizardTestUtils';
 
 const GCP_ACCOUNT = 'test@gmail.com';
diff --git a/src/test/Components/CreateImageWizard/steps/Timezone/Timezone.test.tsx b/src/test/Components/CreateImageWizard/steps/Timezone/Timezone.test.tsx
index 3ff422f3..5adf8503 100644
--- a/src/test/Components/CreateImageWizard/steps/Timezone/Timezone.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Timezone/Timezone.test.tsx
@@ -9,14 +9,15 @@ import {
   blueprintRequest,
   clickBack,
   clickNext,
+  clickRegisterLater,
   enterBlueprintName,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
+  renderCreateMode,
   renderEditMode,
   verifyCancelButton,
 } from '../../wizardTestUtils';
-import { clickRegisterLater, renderCreateMode } from '../../wizardTestUtils';
 
 let router: RemixRouter | undefined = undefined;
 
diff --git a/src/test/Components/CreateImageWizard/steps/Users/Users.test.tsx b/src/test/Components/CreateImageWizard/steps/Users/Users.test.tsx
index 68b463d9..ad0ddf97 100644
--- a/src/test/Components/CreateImageWizard/steps/Users/Users.test.tsx
+++ b/src/test/Components/CreateImageWizard/steps/Users/Users.test.tsx
@@ -9,16 +9,17 @@ import {
   blueprintRequest,
   clickBack,
   clickNext,
+  clickRegisterLater,
   enterBlueprintName,
   getNextButton,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
+  renderCreateMode,
   renderEditMode,
   selectGuestImageTarget,
   verifyCancelButton,
 } from '../../wizardTestUtils';
-import { clickRegisterLater, renderCreateMode } from '../../wizardTestUtils';
 
 let router: RemixRouter | undefined = undefined;