diff --git a/Components/WizardSteps/WizardStep2/WizardStep2.tsx b/Components/WizardSteps/WizardStep2/WizardStep2.tsx
index d9b634a..51fe880 100644
--- a/Components/WizardSteps/WizardStep2/WizardStep2.tsx
+++ b/Components/WizardSteps/WizardStep2/WizardStep2.tsx
@@ -1,16 +1,16 @@
 //Lib
-import React from 'react';
-import classes from '../WizardStep1/WizardStep1.module.css';
-import { IconTool, IconAlertCircle } from '@tabler/icons-react';
-import CopyButton from '../../UI/CopyButton/CopyButton';
+import { IconAlertCircle, IconTool } from '@tabler/icons-react';
 import lanCommandOption from '../../../helpers/functions/lanCommandOption';
+import CopyButton from '../../UI/CopyButton/CopyButton';
+import { WizardStepProps } from '../wizard.types';
+import classes from '../WizardStep1/WizardStep1.module.css';
 
-function WizardStep2(props) {
+function WizardStep2(props: WizardStepProps) {
   ////Vars
   const wizardEnv = props.wizardEnv;
-  const UNIX_USER = wizardEnv.UNIX_USER;
+  const UNIX_USER = wizardEnv?.UNIX_USER;
   //Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled.
-  const { FQDN, SSH_SERVER_PORT } = lanCommandOption(wizardEnv, props.selectedOption.lanCommand);
+  const { FQDN, SSH_SERVER_PORT } = lanCommandOption(wizardEnv, props.selectedRepo?.lanCommand);
 
   return (
     <div className={classes.container}>
@@ -32,10 +32,10 @@ function WizardStep2(props) {
             borg init -e repokey-blake2 ssh://
             {UNIX_USER}@{FQDN}
             {SSH_SERVER_PORT}/./
-            {props.selectedOption.repositoryName}
+            {props.selectedRepo?.repositoryName}
           </div>
           <CopyButton
-            dataToCopy={`borg init -e repokey-blake2 ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
+            dataToCopy={`borg init -e repokey-blake2 ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedRepo?.repositoryName}`}
           />
         </div>
         <div className={classes.note}>
@@ -85,10 +85,10 @@ function WizardStep2(props) {
             ssh://
             {UNIX_USER}@{FQDN}
             {SSH_SERVER_PORT}/./
-            {props.selectedOption.repositoryName}
+            {props.selectedRepo?.repositoryName}
           </div>
           <CopyButton
-            dataToCopy={`ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
+            dataToCopy={`ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedRepo?.repositoryName}`}
           />
         </div>
       </div>
@@ -103,16 +103,18 @@ function WizardStep2(props) {
         following key's fingerprint when you first connect :
         <li>
           <span className={classes.sshPublicKey}>
-            ECDSA : {wizardEnv.SSH_SERVER_FINGERPRINT_ECDSA}
+            ECDSA : {wizardEnv?.SSH_SERVER_FINGERPRINT_ECDSA}
           </span>
         </li>
         <li>
           <span className={classes.sshPublicKey}>
-            ED25519 : {wizardEnv.SSH_SERVER_FINGERPRINT_ED25519}
+            ED25519 : {wizardEnv?.SSH_SERVER_FINGERPRINT_ED25519}
           </span>
         </li>
         <li>
-          <span className={classes.sshPublicKey}>RSA : {wizardEnv.SSH_SERVER_FINGERPRINT_RSA}</span>
+          <span className={classes.sshPublicKey}>
+            RSA : {wizardEnv?.SSH_SERVER_FINGERPRINT_RSA}
+          </span>
         </li>
       </div>
 
diff --git a/Components/WizardSteps/WizardStep3/WizardStep3.tsx b/Components/WizardSteps/WizardStep3/WizardStep3.tsx
index 6c8706f..2fcdb71 100644
--- a/Components/WizardSteps/WizardStep3/WizardStep3.tsx
+++ b/Components/WizardSteps/WizardStep3/WizardStep3.tsx
@@ -4,13 +4,14 @@ import classes from '../WizardStep1/WizardStep1.module.css';
 import { IconChecks, IconPlayerPlay } from '@tabler/icons-react';
 import CopyButton from '../../UI/CopyButton/CopyButton';
 import lanCommandOption from '../../../helpers/functions/lanCommandOption';
+import { WizardStepProps } from '../wizard.types';
 
-function WizardStep3(props) {
+function WizardStep3(props: WizardStepProps) {
   ////Vars
   const wizardEnv = props.wizardEnv;
-  const UNIX_USER = wizardEnv.UNIX_USER;
+  const UNIX_USER = wizardEnv?.UNIX_USER;
   //Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled.
-  const { FQDN, SSH_SERVER_PORT } = lanCommandOption(wizardEnv, props.selectedOption.lanCommand);
+  const { FQDN, SSH_SERVER_PORT } = lanCommandOption(wizardEnv, props.selectedRepo?.lanCommand);
 
   return (
     <div className={classes.container}>
@@ -31,11 +32,11 @@ function WizardStep3(props) {
             borg create ssh://
             {UNIX_USER}@{FQDN}
             {SSH_SERVER_PORT}/./
-            {props.selectedOption.repositoryName}
+            {props.selectedRepo?.repositoryName}
             ::archive1 /your/pathToBackup
           </div>
           <CopyButton
-            dataToCopy={`borg create ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /your/pathToBackup`}
+            dataToCopy={`borg create ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedRepo?.repositoryName}::archive1 /your/pathToBackup`}
           />
         </div>
       </div>
@@ -70,10 +71,10 @@ function WizardStep3(props) {
             borg check -v --progress ssh://
             {UNIX_USER}@{FQDN}
             {SSH_SERVER_PORT}/./
-            {props.selectedOption.repositoryName}
+            {props.selectedRepo?.repositoryName}
           </div>
           <CopyButton
-            dataToCopy={`borg check -v --progress ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
+            dataToCopy={`borg check -v --progress ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedRepo?.repositoryName}`}
           />
         </div>
         <li>List the remote archives with :</li>
@@ -88,10 +89,10 @@ function WizardStep3(props) {
             borg list ssh://
             {UNIX_USER}@{FQDN}
             {SSH_SERVER_PORT}/./
-            {props.selectedOption.repositoryName}
+            {props.selectedRepo?.repositoryName}
           </div>
           <CopyButton
-            dataToCopy={`borg list ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}`}
+            dataToCopy={`borg list ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedRepo?.repositoryName}`}
           />
         </div>
         <li>Download a remote archive with the following command :</li>
@@ -106,11 +107,11 @@ function WizardStep3(props) {
             borg export-tar --tar-filter="gzip -9" ssh://
             {UNIX_USER}@{FQDN}
             {SSH_SERVER_PORT}/./
-            {props.selectedOption.repositoryName}
+            {props.selectedRepo?.repositoryName}
             ::archive1 archive1.tar.gz
           </div>
           <CopyButton
-            dataToCopy={`borg export-tar --tar-filter="gzip -9" ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 archive1.tar.gz`}
+            dataToCopy={`borg export-tar --tar-filter="gzip -9" ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedRepo?.repositoryName}::archive1 archive1.tar.gz`}
           />
         </div>
         <li>Mount an archive to compare or backup some files without download all the archive :</li>
@@ -125,11 +126,11 @@ function WizardStep3(props) {
             borg mount ssh://
             {UNIX_USER}@{FQDN}
             {SSH_SERVER_PORT}/./
-            {props.selectedOption.repositoryName}
+            {props.selectedRepo?.repositoryName}
             ::archive1 /tmp/yourMountPoint
           </div>
           <CopyButton
-            dataToCopy={`borg mount ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}::archive1 /tmp/yourMountPoint`}
+            dataToCopy={`borg mount ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedRepo?.repositoryName}::archive1 /tmp/yourMountPoint`}
           />
         </div>
         <br />
diff --git a/Components/WizardSteps/WizardStep4/WizardStep4.tsx b/Components/WizardSteps/WizardStep4/WizardStep4.tsx
index e989798..8a7209c 100644
--- a/Components/WizardSteps/WizardStep4/WizardStep4.tsx
+++ b/Components/WizardSteps/WizardStep4/WizardStep4.tsx
@@ -4,13 +4,14 @@ import classes from '../WizardStep1/WizardStep1.module.css';
 import { IconWand } from '@tabler/icons-react';
 import CopyButton from '../../UI/CopyButton/CopyButton';
 import lanCommandOption from '../../../helpers/functions/lanCommandOption';
+import { WizardStepProps } from '../wizard.types';
 
-function WizardStep4(props) {
+function WizardStep4(props: WizardStepProps) {
   ////Vars
   const wizardEnv = props.wizardEnv;
-  const UNIX_USER = wizardEnv.UNIX_USER;
+  const UNIX_USER = wizardEnv?.UNIX_USER;
   //Needed to generate command for borg over LAN instead of WAN if env vars are set and option enabled.
-  const { FQDN, SSH_SERVER_PORT } = lanCommandOption(wizardEnv, props.selectedOption.lanCommand);
+  const { FQDN, SSH_SERVER_PORT } = lanCommandOption(wizardEnv, props.selectedRepo?.lanCommand);
 
   const configBorgmatic = `location:
     # List of source directories to backup.
@@ -20,7 +21,7 @@ function WizardStep4(props) {
 
 repositories:
     # Paths of local or remote repositories to backup to.
-    - ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedOption.repositoryName}
+    - ssh://${UNIX_USER}@${FQDN}${SSH_SERVER_PORT}/./${props.selectedRepo?.repositoryName}
 
 storage:
     archive_name_format: '{FQDN}-documents-{now}'
diff --git a/Components/WizardSteps/WizardStepBar/WizardStepBar.tsx b/Components/WizardSteps/WizardStepBar/WizardStepBar.tsx
index 757cbe5..19094a0 100644
--- a/Components/WizardSteps/WizardStepBar/WizardStepBar.tsx
+++ b/Components/WizardSteps/WizardStepBar/WizardStepBar.tsx
@@ -3,10 +3,17 @@ import React from 'react';
 import classes from './WizardStepBar.module.css';
 import { IconChevronLeft, IconChevronRight } from '@tabler/icons-react';
 
-function WizardStepBar(props) {
+type WizardStepBarProps = {
+  step: number;
+  setStep: (step: number) => void;
+  previousStepHandler: () => void;
+  nextStepHandler: () => void;
+};
+
+function WizardStepBar(props: WizardStepBarProps) {
   ////Functions
   //Color onClick on a step
-  const colorHandler = (step) => {
+  const colorHandler = (step: number) => {
     if (step <= props.step) {
       return classes.active;
     } else {
diff --git a/Components/WizardSteps/wizard.types.ts b/Components/WizardSteps/wizard.types.ts
new file mode 100644
index 0000000..f4479ad
--- /dev/null
+++ b/Components/WizardSteps/wizard.types.ts
@@ -0,0 +1,14 @@
+import { WizardEnvType } from '~/domain/config.types';
+
+export type SelectedRepoWizard = {
+  label: string;
+  value: string;
+  id: string;
+  repositoryName: string;
+  lanCommand: boolean;
+};
+
+export type WizardStepProps = {
+  selectedRepo?: SelectedRepoWizard;
+  wizardEnv?: WizardEnvType;
+};
diff --git a/Containers/SetupWizard/SetupWizard.tsx b/Containers/SetupWizard/SetupWizard.tsx
index ba10f80..41f5115 100644
--- a/Containers/SetupWizard/SetupWizard.tsx
+++ b/Containers/SetupWizard/SetupWizard.tsx
@@ -1,36 +1,39 @@
 //Lib
-import React from 'react';
-import classes from './SetupWizard.module.css';
-import { useState, useEffect } from 'react';
 import { useRouter } from 'next/router';
-import Select from 'react-select';
+import { useEffect, useState } from 'react';
+import Select, { SingleValue } from 'react-select';
+import classes from './SetupWizard.module.css';
 
 //Components
-import WizardStepBar from '../../Components/WizardSteps/WizardStepBar/WizardStepBar';
+import { SelectedRepoWizard } from '~/Components/WizardSteps/wizard.types';
+import { Repository, WizardEnvType } from '~/domain/config.types';
+import { Optional } from '~/types';
 import WizardStep1 from '../../Components/WizardSteps/WizardStep1/WizardStep1';
 import WizardStep2 from '../../Components/WizardSteps/WizardStep2/WizardStep2';
 import WizardStep3 from '../../Components/WizardSteps/WizardStep3/WizardStep3';
 import WizardStep4 from '../../Components/WizardSteps/WizardStep4/WizardStep4';
+import WizardStepBar from '../../Components/WizardSteps/WizardStepBar/WizardStepBar';
 
-function SetupWizard(props) {
+type SetupWizardProps = {
+  step?: number;
+};
+
+function SetupWizard(props: SetupWizardProps) {
   ////Var
   const router = useRouter();
 
   ////States
-  const [list, setList] = useState([]);
-  const [listIsLoading, setListIsLoading] = useState(true);
-  const [step, setStep] = useState();
-  const [wizardEnv, setWizardEnv] = useState({});
-  const [selectedOption, setSelectedOption] = useState({
-    id: '#id',
-    repository: 'repo',
-  });
+  const [repoList, setRepoList] = useState<Optional<Array<Repository>>>();
+  const [repoListIsLoading, setRepoListIsLoading] = useState<boolean>(true);
+  const [step, setStep] = useState<number>(1);
+  const [wizardEnv, setWizardEnv] = useState<Optional<WizardEnvType>>();
+  const [selectedItem, setSelectedItem] = useState<Optional<SelectedRepoWizard>>();
 
   ////LifeCycle
   //ComponentDidMount
   useEffect(() => {
     //retrieve the repository list
-    const repoList = async () => {
+    const fetchRepoList = async () => {
       try {
         const response = await fetch('/api/repo', {
           method: 'GET',
@@ -38,13 +41,13 @@ function SetupWizard(props) {
             'Content-type': 'application/json',
           },
         });
-        setList((await response.json()).repoList);
-        setListIsLoading(false);
+        setRepoList((await response.json()).repoList);
+        setRepoListIsLoading(false);
       } catch (error) {
         console.log('Fetching datas error');
       }
     };
-    repoList();
+    fetchRepoList();
     //Fetch wizardEnv to hydrate Wizard' steps
     const fetchWizardEnv = async () => {
       try {
@@ -64,47 +67,55 @@ function SetupWizard(props) {
   //Component did update
   useEffect(() => {
     //Go to the step in the URL param when URL change
-    setStep(props.step);
+    props.step && setStep(props.step);
   }, [props.step]);
 
   ////Functions
 
   //Options for react-select
-  const options = list.map((repo) => ({
+  const options: Optional<Array<SelectedRepoWizard>> = repoList?.map((repo) => ({
     label: `${repo.alias} - #${repo.id}`,
     value: `${repo.alias} - #${repo.id}`,
-    id: repo.id,
+    id: repo.id.toString(),
     repositoryName: repo.repositoryName,
     lanCommand: repo.lanCommand,
   }));
 
   //Step button (free selection of user)
-  const changeStepHandler = (x) => router.push('/setup-wizard/' + x);
+  const changeStepHandler = (x: number) => router.push('/setup-wizard/' + x.toString());
 
   //Next Step button
   const nextStepHandler = () => {
-    if (step < 4) {
-      router.push('/setup-wizard/' + `${Number(step) + 1}`);
+    if (step && step < 4) {
+      router.push('/setup-wizard/' + `${step + 1}`);
     }
   };
 
   //Previous Step button
   const previousStepHandler = () => {
-    if (step > 1) {
-      router.push('/setup-wizard/' + `${Number(step) - 1}`);
+    if (step && step > 1) {
+      router.push('/setup-wizard/' + `${step - 1}`);
+    }
+  };
+
+  const onChangeSelect = (option: SingleValue<SelectedRepoWizard>) => {
+    if (option) {
+      setSelectedItem(option);
+    } else {
+      setSelectedItem(undefined);
     }
   };
 
   //Change Step with State
-  const wizardStep = (step) => {
-    if (step == 1) {
+  const wizardStep = (step?: number) => {
+    if (!step || step === 1) {
       return <WizardStep1 />;
-    } else if (step == 2) {
-      return <WizardStep2 selectedOption={selectedOption} wizardEnv={wizardEnv} />;
-    } else if (step == 3) {
-      return <WizardStep3 selectedOption={selectedOption} wizardEnv={wizardEnv} />;
+    } else if (step === 2) {
+      return <WizardStep2 selectedRepo={selectedItem} wizardEnv={wizardEnv} />;
+    } else if (step === 3) {
+      return <WizardStep3 selectedRepo={selectedItem} wizardEnv={wizardEnv} />;
     } else {
-      return <WizardStep4 selectedOption={selectedOption} wizardEnv={wizardEnv} />;
+      return <WizardStep4 selectedRepo={selectedItem} wizardEnv={wizardEnv} />;
     }
   };
 
@@ -118,15 +129,15 @@ function SetupWizard(props) {
       />
       <div className={classes.selectRepo}>
         <Select
-          onChange={setSelectedOption}
-          isLoading={listIsLoading}
-          isDisabled={listIsLoading}
+          onChange={(item) => onChangeSelect(item)}
+          isLoading={repoListIsLoading}
+          isDisabled={repoListIsLoading}
           options={options}
           isSearchable
           placeholder='Select your repository...'
           theme={(theme) => ({
             ...theme,
-            borderRadius: '5px',
+            borderRadius: 5,
             colors: {
               ...theme.colors,
               primary25: '#c3b6fa',
diff --git a/domain/config.types.ts b/domain/config.types.ts
index 69d6a60..482fbc3 100644
--- a/domain/config.types.ts
+++ b/domain/config.types.ts
@@ -25,15 +25,17 @@ export type BorgWarehouseUser = {
   appriseAlert?: boolean;
 };
 
-export enum WizardEnv {
+export enum WizardEnvEnum {
   UNIX_USER = 'UNIX_USER',
   FQDN = 'FQDN',
   SSH_SERVER_PORT = 'SSH_SERVER_PORT',
   FQDN_LAN = 'FQDN_LAN',
-  SSH_SERVER_PORT_LAN = 'SSH_SERVER',
+  SSH_SERVER_PORT_LAN = 'SSH_SERVER_PORT_LAN',
   SSH_SERVER_FINGERPRINT_RSA = 'SSH_SERVER_FINGERPRINT_RSA',
   SSH_SERVER_FINGERPRINT_ECDSA = 'SSH_SERVER_FINGERPRINT_ECDSA',
   SSH_SERVER_FINGERPRINT_ED25519 = 'SSH_SERVER_FINGERPRINT_ED25519',
   HIDE_SSH_PORT = 'HIDE_SSH_PORT',
   DISABLE_INTEGRATIONS = 'DISABLE_INTEGRATIONS',
 }
+
+export type WizardEnvType = Record<WizardEnvEnum, string>;
diff --git a/helpers/functions/lanCommandOption.ts b/helpers/functions/lanCommandOption.ts
index 174421d..381f3aa 100644
--- a/helpers/functions/lanCommandOption.ts
+++ b/helpers/functions/lanCommandOption.ts
@@ -1,13 +1,27 @@
-export default function lanCommandOption(wizardEnv, lanCommand) {
-  let FQDN;
-  let SSH_SERVER_PORT;
-  if (lanCommand && wizardEnv.FQDN_LAN && wizardEnv.SSH_SERVER_PORT_LAN) {
-    FQDN = wizardEnv.FQDN_LAN;
-    SSH_SERVER_PORT = wizardEnv.HIDE_SSH_PORT === 'true' ? '' : ':' + wizardEnv.SSH_SERVER_PORT_LAN;
-  } else {
-    FQDN = wizardEnv.FQDN;
-    SSH_SERVER_PORT = wizardEnv.HIDE_SSH_PORT === 'true' ? '' : ':' + wizardEnv.SSH_SERVER_PORT;
+import { WizardEnvType } from '~/domain/config.types';
+import { Optional } from '~/types';
+
+export default function lanCommandOption(
+  wizardEnv?: WizardEnvType,
+  lanCommand?: boolean
+): { FQDN: Optional<string>; SSH_SERVER_PORT: Optional<string> } {
+  if (!wizardEnv) {
+    return { FQDN: undefined, SSH_SERVER_PORT: undefined };
   }
 
-  return { FQDN, SSH_SERVER_PORT };
+  const { FQDN, FQDN_LAN, SSH_SERVER_PORT, SSH_SERVER_PORT_LAN, HIDE_SSH_PORT } = wizardEnv;
+
+  const isPortHidden = HIDE_SSH_PORT === 'true';
+
+  // Sélection des valeurs en fonction de lanCommand
+  const selectedFQDN = lanCommand && FQDN_LAN ? FQDN_LAN : FQDN;
+  const selectedPort = lanCommand ? SSH_SERVER_PORT_LAN : SSH_SERVER_PORT;
+
+  // Construire le port final uniquement si disponible et non masqué
+  const formattedPort = !isPortHidden && selectedPort ? `:${selectedPort}` : undefined;
+
+  return {
+    FQDN: selectedFQDN,
+    SSH_SERVER_PORT: formattedPort,
+  };
 }
diff --git a/pages/api/account/getWizardEnv.ts b/pages/api/account/getWizardEnv.ts
index 5f8ab0d..496f6ed 100644
--- a/pages/api/account/getWizardEnv.ts
+++ b/pages/api/account/getWizardEnv.ts
@@ -1,7 +1,7 @@
 //Lib
 import { authOptions } from '~/pages/api/auth/[...nextauth]';
 import { getServerSession } from 'next-auth/next';
-import { WizardEnv } from '~/domain/config.types';
+import { WizardEnvEnum } from '~/domain/config.types';
 import { NextApiRequest, NextApiResponse } from 'next';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -14,21 +14,23 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     }
 
     try {
-      function getEnvVariable(envName: WizardEnv, defaultValue = '') {
+      function getEnvVariable(envName: WizardEnvEnum, defaultValue = '') {
         return process.env[envName] || defaultValue;
       }
 
       const wizardEnv = {
-        UNIX_USER: getEnvVariable(WizardEnv.UNIX_USER, 'borgwarehouse'),
-        FQDN: getEnvVariable(WizardEnv.FQDN, 'localhost'),
-        SSH_SERVER_PORT: getEnvVariable(WizardEnv.SSH_SERVER_PORT, '22'),
-        FQDN_LAN: getEnvVariable(WizardEnv.FQDN_LAN),
-        SSH_SERVER_PORT_LAN: getEnvVariable(WizardEnv.SSH_SERVER_PORT_LAN),
-        SSH_SERVER_FINGERPRINT_RSA: getEnvVariable(WizardEnv.SSH_SERVER_FINGERPRINT_RSA),
-        SSH_SERVER_FINGERPRINT_ED25519: getEnvVariable(WizardEnv.SSH_SERVER_FINGERPRINT_ED25519),
-        SSH_SERVER_FINGERPRINT_ECDSA: getEnvVariable(WizardEnv.SSH_SERVER_FINGERPRINT_ECDSA),
-        HIDE_SSH_PORT: getEnvVariable(WizardEnv.HIDE_SSH_PORT, 'false'),
-        DISABLE_INTEGRATIONS: getEnvVariable(WizardEnv.DISABLE_INTEGRATIONS, 'false'),
+        UNIX_USER: getEnvVariable(WizardEnvEnum.UNIX_USER, 'borgwarehouse'),
+        FQDN: getEnvVariable(WizardEnvEnum.FQDN, 'localhost'),
+        SSH_SERVER_PORT: getEnvVariable(WizardEnvEnum.SSH_SERVER_PORT, '22'),
+        FQDN_LAN: getEnvVariable(WizardEnvEnum.FQDN_LAN),
+        SSH_SERVER_PORT_LAN: getEnvVariable(WizardEnvEnum.SSH_SERVER_PORT_LAN),
+        SSH_SERVER_FINGERPRINT_RSA: getEnvVariable(WizardEnvEnum.SSH_SERVER_FINGERPRINT_RSA),
+        SSH_SERVER_FINGERPRINT_ED25519: getEnvVariable(
+          WizardEnvEnum.SSH_SERVER_FINGERPRINT_ED25519
+        ),
+        SSH_SERVER_FINGERPRINT_ECDSA: getEnvVariable(WizardEnvEnum.SSH_SERVER_FINGERPRINT_ECDSA),
+        HIDE_SSH_PORT: getEnvVariable(WizardEnvEnum.HIDE_SSH_PORT, 'false'),
+        DISABLE_INTEGRATIONS: getEnvVariable(WizardEnvEnum.DISABLE_INTEGRATIONS, 'false'),
       };
 
       res.status(200).json({ wizardEnv });
diff --git a/pages/setup-wizard/[slug].js b/pages/setup-wizard/[slug].tsx
similarity index 68%
rename from pages/setup-wizard/[slug].js
rename to pages/setup-wizard/[slug].tsx
index 3d1691a..e7607e5 100644
--- a/pages/setup-wizard/[slug].js
+++ b/pages/setup-wizard/[slug].tsx
@@ -2,13 +2,15 @@
 import SetupWizard from '../../Containers/SetupWizard/SetupWizard';
 import { useRouter } from 'next/router';
 import Head from 'next/head';
-import { authOptions } from '../../pages/api/auth/[...nextauth]';
+import { authOptions } from '../api/auth/[...nextauth]';
 import { getServerSession } from 'next-auth/next';
+import { GetServerSidePropsContext } from 'next';
 
 export default function SetupWizardStep() {
   ////Var
   const router = useRouter();
-  const step = router.query.slug;
+  const slug = router.query.slug;
+  const step = Array.isArray(slug) ? parseInt(slug[0], 10) : slug ? parseInt(slug, 10) : 1;
 
   return (
     <>
@@ -20,7 +22,7 @@ export default function SetupWizardStep() {
   );
 }
 
-export async function getServerSideProps(context) {
+export async function getServerSideProps(context: GetServerSidePropsContext) {
   //Var
   const session = await getServerSession(context.req, context.res, authOptions);