diff --git a/client/src/app/pages/applications/analysis-wizard/__tests__/analysis-wizard.test.tsx b/client/src/app/pages/applications/analysis-wizard/__tests__/analysis-wizard.test.tsx
index e041083177..6411d1bb16 100644
--- a/client/src/app/pages/applications/analysis-wizard/__tests__/analysis-wizard.test.tsx
+++ b/client/src/app/pages/applications/analysis-wizard/__tests__/analysis-wizard.test.tsx
@@ -99,7 +99,7 @@ describe("<AnalysisWizard />", () => {
       />
     );
 
-    const mode = screen.getByText(/binary/i);
+    const mode = screen.getByText(/binary|source code/i);
     await userEvent.click(mode);
 
     const sourceCode = await screen.findByRole("option", {
@@ -126,7 +126,7 @@ describe("<AnalysisWizard />", () => {
       />
     );
 
-    const mode = screen.getByText(/binary/i);
+    const mode = screen.getByText(/binary|source code/i);
     await userEvent.click(mode);
 
     const sourceCodePlusDependencies = await screen.findByRole("option", {
@@ -219,7 +219,7 @@ describe("<AnalysisWizard />", () => {
       />
     );
 
-    const mode = screen.getByText(/binary/i);
+    const mode = screen.getByText(/binary|source code/i);
     await userEvent.click(mode);
 
     const uploadBinary = screen.queryByRole("option", {
diff --git a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
index 65db4a7afe..58096ff8d2 100644
--- a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
+++ b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx
@@ -93,7 +93,6 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
   isOpen,
 }: IAnalysisWizard) => {
   const { t } = useTranslation();
-  const title = t("dialog.title.applicationAnalysis");
 
   const { identities } = useFetchIdentities();
 
@@ -108,7 +107,7 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
     updateTaskGroup(data);
   };
 
-  const onCreateTaskgroupError = (error: Error | unknown) => {
+  const onCreateTaskgroupError = (_error: Error | unknown) => {
     pushNotification({
       title: "Taskgroup creation failed",
       variant: "danger",
@@ -121,14 +120,14 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
     onCreateTaskgroupError
   );
 
-  const onSubmitTaskgroupSuccess = (data: Taskgroup) =>
+  const onSubmitTaskgroupSuccess = (_data: Taskgroup) =>
     pushNotification({
       title: "Applications",
       message: "Submitted for analysis",
       variant: "info",
     });
 
-  const onSubmitTaskgroupError = (error: Error | unknown) =>
+  const onSubmitTaskgroupError = (_error: Error | unknown) =>
     pushNotification({
       title: "Taskgroup submit failed",
       variant: "danger",
@@ -143,7 +142,7 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
     updateTaskGroup(null);
   };
 
-  const onDeleteTaskgroupError = (error: Error | unknown) => {
+  const onDeleteTaskgroupError = (_error: Error | unknown) => {
     pushNotification({
       title: "Taskgroup: delete failed",
       variant: "danger",
@@ -162,7 +161,7 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
   const methods = useForm<AnalysisWizardFormValues>({
     defaultValues: {
       artifact: null,
-      mode: "binary",
+      mode: "source-code-deps",
       formLabels: [],
       selectedTargets: [],
       selectedSourceLabels: [],
@@ -333,10 +332,12 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
 
   const steps = [
     <WizardStep
-      name={t("wizard.terms.configureAnalysis")}
+      key="wizard-configureAnalysis"
       id="wizard-configureAnalysis"
+      name={t("wizard.terms.configureAnalysis")}
       steps={[
         <WizardStep
+          key={StepId.AnalysisMode}
           id={StepId.AnalysisMode}
           name={t("wizard.terms.analysisMode")}
           footer={{
@@ -352,6 +353,7 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
           </>
         </WizardStep>,
         <WizardStep
+          key={StepId.SetTargets}
           id={StepId.SetTargets}
           name={t("wizard.terms.setTargets")}
           isDisabled={!isStepEnabled(StepId.SetTargets)}
@@ -360,6 +362,7 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
           <SetTargets />
         </WizardStep>,
         <WizardStep
+          key={StepId.Scope}
           id={StepId.Scope}
           name={t("wizard.terms.scope")}
           isDisabled={!isStepEnabled(StepId.Scope)}
@@ -370,10 +373,12 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
       ]}
     ></WizardStep>,
     <WizardStep
-      name={t("wizard.terms.advanced")}
+      key="wizard-advanced"
       id="wizard-advanced"
+      name={t("wizard.terms.advanced")}
       steps={[
         <WizardStep
+          key={StepId.CustomRules}
           id={StepId.CustomRules}
           name={t("wizard.terms.customRules")}
           isDisabled={!isStepEnabled(StepId.CustomRules)}
@@ -382,6 +387,7 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
           <CustomRules />
         </WizardStep>,
         <WizardStep
+          key={StepId.Options}
           id={StepId.Options}
           name={t("wizard.terms.options")}
           isDisabled={!isStepEnabled(StepId.Options)}
@@ -392,8 +398,9 @@ export const AnalysisWizard: React.FC<IAnalysisWizard> = ({
       ]}
     ></WizardStep>,
     <WizardStep
-      name={t("wizard.terms.review")}
+      key={StepId.Review}
       id={StepId.Review}
+      name={t("wizard.terms.review")}
       isDisabled={!isStepEnabled(StepId.Review)}
       footer={{ nextButtonText: "Run" }}
     >
diff --git a/client/src/app/pages/applications/analysis-wizard/set-mode.tsx b/client/src/app/pages/applications/analysis-wizard/set-mode.tsx
index d3294d44aa..5050d3df66 100644
--- a/client/src/app/pages/applications/analysis-wizard/set-mode.tsx
+++ b/client/src/app/pages/applications/analysis-wizard/set-mode.tsx
@@ -22,30 +22,30 @@ interface ISetMode {
 export const SetMode: React.FC<ISetMode> = ({ isSingleApp, isModeValid }) => {
   const { t } = useTranslation();
 
-  const { watch, control, setValue } =
-    useFormContext<AnalysisWizardFormValues>();
+  const { watch, control } = useFormContext<AnalysisWizardFormValues>();
   const mode = watch("mode");
 
   const options: SelectOptionProps[] = [
     {
-      value: "binary",
-      children: "Binary",
+      value: "source-code-deps",
+      children: "Source code + dependencies",
     },
     {
       value: "source-code",
       children: "Source code",
     },
     {
-      value: "source-code-deps",
-      children: "Source code + dependencies",
+      value: "binary",
+      children: "Binary",
     },
   ];
 
-  if (isSingleApp)
+  if (isSingleApp) {
     options.push({
       value: "binary-upload",
       children: "Upload a local binary",
     });
+  }
 
   return (
     <Form