diff --git a/crates/defguard_common/src/db/models/migration_wizard.rs b/crates/defguard_common/src/db/models/migration_wizard.rs
index ad0fe2ca1e..c05c5aed37 100644
--- a/crates/defguard_common/src/db/models/migration_wizard.rs
+++ b/crates/defguard_common/src/db/models/migration_wizard.rs
@@ -12,6 +12,8 @@ pub enum MigrationWizardStep {
     Ca,
     #[serde(rename = "caSummary")]
     CaSummary,
+    #[serde(rename = "edgeDeployment")]
+    EdgeDeployment,
     #[serde(rename = "edge")]
     Edge,
     #[serde(rename = "edgeAdoption")]
diff --git a/web/biome.json b/web/biome.json
index b3afa87211..29a571b936 100644
--- a/web/biome.json
+++ b/web/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.4.5/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.6/schema.json",
   "vcs": {
     "enabled": false,
     "clientKind": "git",
diff --git a/web/package.json b/web/package.json
index 78bb032d6f..17425c5fd5 100644
--- a/web/package.json
+++ b/web/package.json
@@ -15,14 +15,14 @@
   "dependencies": {
     "@axa-ch/react-polymorphic-types": "^1.4.1",
     "@floating-ui/react": "^0.27.19",
-    "@inlang/paraglide-js": "^2.13.2",
+    "@inlang/paraglide-js": "^2.14.0",
     "@react-hook/resize-observer": "^2.0.2",
     "@shortercode/webzip": "1.1.1-0",
     "@stablelib/base64": "^2.0.1",
     "@stablelib/x25519": "^2.0.1",
     "@tanstack/react-form": "^1.28.4",
     "@tanstack/react-query": "^5.90.21",
-    "@tanstack/react-router": "^1.166.3",
+    "@tanstack/react-router": "^1.166.6",
     "@tanstack/react-table": "^8.21.3",
     "@tanstack/react-virtual": "^3.13.21",
     "@uidotdev/usehooks": "^2.4.1",
@@ -34,7 +34,7 @@
     "humanize-duration": "^3.33.2",
     "ipaddr.js": "^2.3.0",
     "lodash-es": "^4.17.23",
-    "motion": "^12.35.1",
+    "motion": "^12.35.2",
     "qrcode.react": "^4.2.0",
     "qs": "^6.15.0",
     "radashi": "^12.7.2",
@@ -51,17 +51,17 @@
     "zustand": "^5.0.11"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.4.5",
-    "@inlang/paraglide-js": "2.13.1",
+    "@biomejs/biome": "2.4.6",
+    "@inlang/paraglide-js": "2.14.0",
     "@tanstack/devtools-vite": "^0.5.3",
     "@tanstack/react-devtools": "^0.9.10",
     "@tanstack/react-query-devtools": "^5.91.3",
-    "@tanstack/react-router-devtools": "^1.166.3",
-    "@tanstack/router-plugin": "^1.166.3",
+    "@tanstack/react-router-devtools": "^1.166.6",
+    "@tanstack/router-plugin": "^1.166.6",
     "@types/byte-size": "^8.1.2",
     "@types/humanize-duration": "^3.27.4",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^25.3.5",
+    "@types/node": "^25.4.0",
     "@types/qs": "^6.15.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
index a1c5f77b57..3d8844b647 100644
--- a/web/pnpm-lock.yaml
+++ b/web/pnpm-lock.yaml
@@ -15,8 +15,8 @@ importers:
         specifier: ^0.27.19
         version: 0.27.19(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@inlang/paraglide-js':
-        specifier: ^2.13.2
-        version: 2.13.2
+        specifier: ^2.14.0
+        version: 2.14.0
       '@react-hook/resize-observer':
         specifier: ^2.0.2
         version: 2.0.2(react@19.2.4)
@@ -36,8 +36,8 @@ importers:
         specifier: ^5.90.21
         version: 5.90.21(react@19.2.4)
       '@tanstack/react-router':
-        specifier: ^1.166.3
-        version: 1.166.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+        specifier: ^1.166.6
+        version: 1.166.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@tanstack/react-table':
         specifier: ^8.21.3
         version: 8.21.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
@@ -72,8 +72,8 @@ importers:
         specifier: ^4.17.23
         version: 4.17.23
       motion:
-        specifier: ^12.35.1
-        version: 12.35.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+        specifier: ^12.35.2
+        version: 12.35.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       qrcode.react:
         specifier: ^4.2.0
         version: 4.2.0(react@19.2.4)
@@ -118,11 +118,11 @@ importers:
         version: 5.0.11(@types/react@19.2.14)(immer@11.1.4)(react@19.2.4)(use-sync-external-store@1.6.0(react@19.2.4))
     devDependencies:
       '@biomejs/biome':
-        specifier: 2.4.5
-        version: 2.4.5
+        specifier: 2.4.6
+        version: 2.4.6
       '@tanstack/devtools-vite':
         specifier: ^0.5.3
-        version: 0.5.3(vite@7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0))
+        version: 0.5.3(vite@7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0))
       '@tanstack/react-devtools':
         specifier: ^0.9.10
         version: 0.9.10(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(csstype@3.2.3)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(solid-js@1.9.9)
@@ -130,11 +130,11 @@ importers:
         specifier: ^5.91.3
         version: 5.91.3(@tanstack/react-query@5.90.21(react@19.2.4))(react@19.2.4)
       '@tanstack/react-router-devtools':
-        specifier: ^1.166.3
-        version: 1.166.3(@tanstack/react-router@1.166.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(@tanstack/router-core@1.166.2)(csstype@3.2.3)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+        specifier: ^1.166.6
+        version: 1.166.6(@tanstack/react-router@1.166.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(@tanstack/router-core@1.166.6)(csstype@3.2.3)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@tanstack/router-plugin':
-        specifier: ^1.166.3
-        version: 1.166.3(@tanstack/react-router@1.166.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0))
+        specifier: ^1.166.6
+        version: 1.166.6(@tanstack/react-router@1.166.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0))
       '@types/byte-size':
         specifier: ^8.1.2
         version: 8.1.2
@@ -145,8 +145,8 @@ importers:
         specifier: ^4.17.12
         version: 4.17.12
       '@types/node':
-        specifier: ^25.3.5
-        version: 25.3.5
+        specifier: ^25.4.0
+        version: 25.4.0
       '@types/qs':
         specifier: ^6.15.0
         version: 6.15.0
@@ -158,7 +158,7 @@ importers:
         version: 19.2.3(@types/react@19.2.14)
       '@vitejs/plugin-react-swc':
         specifier: ^4.2.3
-        version: 4.2.3(vite@7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0))
+        version: 4.2.3(vite@7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0))
       autoprefixer:
         specifier: ^10.4.27
         version: 10.4.27(postcss@8.5.8)
@@ -188,10 +188,10 @@ importers:
         version: 5.9.3
       vite:
         specifier: ^7.3.1
-        version: 7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0)
+        version: 7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0)
       vite-plugin-image-optimizer:
         specifier: ^2.0.3
-        version: 2.0.3(sharp@0.34.5)(vite@7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0))
+        version: 2.0.3(sharp@0.34.5)(vite@7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0))
 
 packages:
 
@@ -284,59 +284,59 @@ packages:
     resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
     engines: {node: '>=6.9.0'}
 
-  '@biomejs/biome@2.4.5':
-    resolution: {integrity: sha512-OWNCyMS0Q011R6YifXNOg6qsOg64IVc7XX6SqGsrGszPbkVCoaO7Sr/lISFnXZ9hjQhDewwZ40789QmrG0GYgQ==}
+  '@biomejs/biome@2.4.6':
+    resolution: {integrity: sha512-QnHe81PMslpy3mnpL8DnO2M4S4ZnYPkjlGCLWBZT/3R9M6b5daArWMMtEfP52/n174RKnwRIf3oT8+wc9ihSfQ==}
     engines: {node: '>=14.21.3'}
     hasBin: true
 
-  '@biomejs/cli-darwin-arm64@2.4.5':
-    resolution: {integrity: sha512-lGS4Nd5O3KQJ6TeWv10mElnx1phERhBxqGP/IKq0SvZl78kcWDFMaTtVK+w3v3lusRFxJY78n07PbKplirsU5g==}
+  '@biomejs/cli-darwin-arm64@2.4.6':
+    resolution: {integrity: sha512-NW18GSyxr+8sJIqgoGwVp5Zqm4SALH4b4gftIA0n62PTuBs6G2tHlwNAOj0Vq0KKSs7Sf88VjjmHh0O36EnzrQ==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [darwin]
 
-  '@biomejs/cli-darwin-x64@2.4.5':
-    resolution: {integrity: sha512-6MoH4tyISIBNkZ2Q5T1R7dLd5BsITb2yhhhrU9jHZxnNSNMWl+s2Mxu7NBF8Y3a7JJcqq9nsk8i637z4gqkJxQ==}
+  '@biomejs/cli-darwin-x64@2.4.6':
+    resolution: {integrity: sha512-4uiE/9tuI7cnjtY9b07RgS7gGyYOAfIAGeVJWEfeCnAarOAS7qVmuRyX6d7JTKw28/mt+rUzMasYeZ+0R/U1Mw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [darwin]
 
-  '@biomejs/cli-linux-arm64-musl@2.4.5':
-    resolution: {integrity: sha512-iqLDgpzobG7gpBF0fwEVS/LT8kmN7+S0E2YKFDtqliJfzNLnAiV2Nnyb+ehCDCJgAZBASkYHR2o60VQWikpqIg==}
+  '@biomejs/cli-linux-arm64-musl@2.4.6':
+    resolution: {integrity: sha512-F/JdB7eN22txiTqHM5KhIVt0jVkzZwVYrdTR1O3Y4auBOQcXxHK4dxULf4z43QyZI5tsnQJrRBHZy7wwtL+B3A==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@biomejs/cli-linux-arm64@2.4.5':
-    resolution: {integrity: sha512-U1GAG6FTjhAO04MyH4xn23wRNBkT6H7NentHh+8UxD6ShXKBm5SY4RedKJzkUThANxb9rUKIPc7B8ew9Xo/cWg==}
+  '@biomejs/cli-linux-arm64@2.4.6':
+    resolution: {integrity: sha512-kMLaI7OF5GN1Q8Doymjro1P8rVEoy7BKQALNz6fiR8IC1WKduoNyteBtJlHT7ASIL0Cx2jR6VUOBIbcB1B8pew==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@biomejs/cli-linux-x64-musl@2.4.5':
-    resolution: {integrity: sha512-NlKa7GpbQmNhZf9kakQeddqZyT7itN7jjWdakELeXyTU3pg/83fTysRRDPJD0akTfKDl6vZYNT9Zqn4MYZVBOA==}
+  '@biomejs/cli-linux-x64-musl@2.4.6':
+    resolution: {integrity: sha512-C9s98IPDu7DYarjlZNuzJKTjVHN03RUnmHV5htvqsx6vEUXCDSJ59DNwjKVD5XYoSS4N+BYhq3RTBAL8X6svEg==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@biomejs/cli-linux-x64@2.4.5':
-    resolution: {integrity: sha512-NdODlSugMzTlENPTa4z0xB82dTUlCpsrOxc43///aNkTLblIYH4XpYflBbf5ySlQuP8AA4AZd1qXhV07IdrHdQ==}
+  '@biomejs/cli-linux-x64@2.4.6':
+    resolution: {integrity: sha512-oHXmUFEoH8Lql1xfc3QkFLiC1hGR7qedv5eKNlC185or+o4/4HiaU7vYODAH3peRCfsuLr1g6v2fK9dFFOYdyw==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@biomejs/cli-win32-arm64@2.4.5':
-    resolution: {integrity: sha512-EBfrTqRIWOFSd7CQb/0ttjHMR88zm3hGravnDwUA9wHAaCAYsULKDebWcN5RmrEo1KBtl/gDVJMrFjNR0pdGUw==}
+  '@biomejs/cli-win32-arm64@2.4.6':
+    resolution: {integrity: sha512-xzThn87Pf3YrOGTEODFGONmqXpTwUNxovQb72iaUOdcw8sBSY3+3WD8Hm9IhMYLnPi0n32s3L3NWU6+eSjfqFg==}
     engines: {node: '>=14.21.3'}
     cpu: [arm64]
     os: [win32]
 
-  '@biomejs/cli-win32-x64@2.4.5':
-    resolution: {integrity: sha512-Pmhv9zT95YzECfjEHNl3mN9Vhusw9VA5KHY0ZvlGsxsjwS5cb7vpRnHzJIv0vG7jB0JI7xEaMH9ddfZm/RozBw==}
+  '@biomejs/cli-win32-x64@2.4.6':
+    resolution: {integrity: sha512-7++XhnsPlr1HDbor5amovPjOH6vsrFOCdp93iKXhFn6bcMUI6soodj3WWKfgEO6JosKU1W5n3uky3WW9RlRjTg==}
     engines: {node: '>=14.21.3'}
     cpu: [x64]
     os: [win32]
@@ -719,8 +719,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@inlang/paraglide-js@2.13.2':
-    resolution: {integrity: sha512-ecxw95pmMbasVj7M/B6pu5wqYHomYQBcu3QzDl1svwAkbnRqRmsdrH4IizzFwqeVWd+uluibMIy1VOGywin94A==}
+  '@inlang/paraglide-js@2.14.0':
+    resolution: {integrity: sha512-6Tno8RvEhnALdgueWNQACiEm3YM6hAfbxnYB+JWML9p5s1O4t0DOqgU9YD8fwpixOnZbU6cJRkvt4v9acXDioA==}
     hasBin: true
 
   '@inlang/recommend-sherlock@0.2.1':
@@ -1258,20 +1258,20 @@ packages:
     peerDependencies:
       react: ^18 || ^19
 
-  '@tanstack/react-router-devtools@1.166.3':
-    resolution: {integrity: sha512-tmQMxCXBlaTjUfG5zlYPsB1bF9gFKULAOF1q6ePvFpsvhWz5bTmEdKPF2XIjd4D7alGM0MVB1DJGghmqigw7oA==}
+  '@tanstack/react-router-devtools@1.166.6':
+    resolution: {integrity: sha512-TheVyOgo8ljD8wHHLceFsnKrX7nhTIQv9WokSrPjNTP4H3synUMADxh8yZafVYdr6lS2CBvldd5s7JI8DcwBUg==}
     engines: {node: '>=20.19'}
     peerDependencies:
-      '@tanstack/react-router': ^1.166.3
-      '@tanstack/router-core': ^1.166.2
+      '@tanstack/react-router': ^1.166.6
+      '@tanstack/router-core': ^1.166.6
       react: '>=18.0.0 || >=19.0.0'
       react-dom: '>=18.0.0 || >=19.0.0'
     peerDependenciesMeta:
       '@tanstack/router-core':
         optional: true
 
-  '@tanstack/react-router@1.166.3':
-    resolution: {integrity: sha512-5NOwAnEp+koHYaRkK5+biYiuOxnQe/7q8R7LLAJ5Ryk6hXoIimOv6gWimPxANwhCWg9spfRZCNswi8EQaidYBg==}
+  '@tanstack/react-router@1.166.6':
+    resolution: {integrity: sha512-lfymPCfTkLQaNj/KIPElt+6B9REwPw2/Of3KtMwhNINs7h2xFQMSAOYk+ItCv8i93lBczlg89BRHtRS99qmzyA==}
     engines: {node: '>=20.19'}
     peerDependencies:
       react: '>=18.0.0 || >=19.0.0'
@@ -1296,30 +1296,30 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  '@tanstack/router-core@1.166.2':
-    resolution: {integrity: sha512-zn3NhENOAX9ToQiX077UV2OH3aJKOvV2ZMNZZxZ3gDG3i3WqL8NfWfEgetEAfMN37/Mnt90PpotYgf7IyuoKqQ==}
+  '@tanstack/router-core@1.166.6':
+    resolution: {integrity: sha512-SwVPMQxjoY4jwiNgD9u5kDFp/iSaf3wgf1t93xRCC6qDHmv/xLaawhvwEPNIJaPepWuSYRpywpJWH9hGlBqVbw==}
     engines: {node: '>=20.19'}
 
-  '@tanstack/router-devtools-core@1.166.2':
-    resolution: {integrity: sha512-Ke8HquuwMhLYpo/6nxNgrzi9Ns2lsK9uwDba6WKA8I0K7fyYZoAUu+7AD6gdEcVU4NF6LjtMPfUCHmVtYYRTDw==}
+  '@tanstack/router-devtools-core@1.166.6':
+    resolution: {integrity: sha512-ndPnCDeSGW3bd33u3EMe3+EJGLiFOHZaIKRJRLdZClOB6J6pvzKMELJgizBtjaR6X56FdCsC/STgjPkOeR9paA==}
     engines: {node: '>=20.19'}
     peerDependencies:
-      '@tanstack/router-core': ^1.166.2
+      '@tanstack/router-core': ^1.166.6
       csstype: ^3.0.10
     peerDependenciesMeta:
       csstype:
         optional: true
 
-  '@tanstack/router-generator@1.166.2':
-    resolution: {integrity: sha512-wbvdyP1PKKQKk4aVlGeK9S5uDy8zodTr3tEZ2gRKNavJLusXbEWqtoo42JxHFFNB6dtguehFMt8PyZPAtkgWwQ==}
+  '@tanstack/router-generator@1.166.6':
+    resolution: {integrity: sha512-D7Z6oLP2IfflXUzOOxIgeCD8v3/SXU//cgBon0pbF13HkKdf9Zlt97kQqcaOkbnruJJ6i5xtUIsoAQbMmj+EsQ==}
     engines: {node: '>=20.19'}
 
-  '@tanstack/router-plugin@1.166.3':
-    resolution: {integrity: sha512-yhnJRohpdKB24Fh7fW5mwgffpOcERZlXdk3i8PjXn+OYgAiG/cpuXXOJpZZ6An68vDW+Z5zBuTynXsDi2ZE4JQ==}
+  '@tanstack/router-plugin@1.166.6':
+    resolution: {integrity: sha512-07ZwOMNDlKIoaRtrfP5zO3VfqXNg2Zm7qvqZOBaTbbqgMvaKclW0ylqakweXtDwiNs9GPf/+lH/xyc+CgLGUyg==}
     engines: {node: '>=20.19'}
     peerDependencies:
       '@rsbuild/core': '>=1.0.2'
-      '@tanstack/react-router': ^1.166.3
+      '@tanstack/react-router': ^1.166.6
       vite: '>=5.0.0 || >=6.0.0 || >=7.0.0'
       vite-plugin-solid: ^2.11.10
       webpack: '>=5.92.0'
@@ -1410,8 +1410,8 @@ packages:
   '@types/ms@2.1.0':
     resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
 
-  '@types/node@25.3.5':
-    resolution: {integrity: sha512-oX8xrhvpiyRCQkG1MFchB09f+cXftgIXb3a7UUa4Y3wpmZPw5tyZGTLWhlESOLq1Rq6oDlc8npVU2/9xiCuXMA==}
+  '@types/node@25.4.0':
+    resolution: {integrity: sha512-9wLpoeWuBlcbBpOY3XmzSTG3oscB6xjBEEtn+pYXTfhyXhIxC5FsBer2KTopBlvKEiW9l13po9fq+SJY/5lkhw==}
 
   '@types/qs@6.15.0':
     resolution: {integrity: sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==}
@@ -1841,8 +1841,8 @@ packages:
   flat-cache@6.1.20:
     resolution: {integrity: sha512-AhHYqwvN62NVLp4lObVXGVluiABTHapoB57EyegZVmazN+hhGhLTn3uZbOofoTw4DSDvVCadzzyChXhOAvy8uQ==}
 
-  flatted@3.4.0:
-    resolution: {integrity: sha512-kC6Bb+ooptOIvWj5B63EQWkF0FEnNjV2ZNkLMLZRDDduIiWeFF4iKnslwhiWxjAdbg4NzTNo6h0qLuvFrcx+Sw==}
+  flatted@3.4.1:
+    resolution: {integrity: sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==}
 
   follow-redirects@1.15.11:
     resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
@@ -1860,8 +1860,8 @@ packages:
   fraction.js@5.3.4:
     resolution: {integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==}
 
-  framer-motion@12.35.1:
-    resolution: {integrity: sha512-rL8cLrjYZNShZqKV3U0Qj6Y5WDiZXYEM5giiTLfEqsIZxtspzMDCkKmrO5po76jWfvOg04+Vk+sfBvTD0iMmLw==}
+  framer-motion@12.35.2:
+    resolution: {integrity: sha512-dhfuEMaNo0hc+AEqyHiIfiJRNb9U9UQutE9FoKm5pjf7CMitp9xPEF1iWZihR1q86LBmo6EJ7S8cN8QXEy49AA==}
     peerDependencies:
       '@emotion/is-prop-valid': '*'
       react: ^18.0.0 || ^19.0.0
@@ -2261,14 +2261,14 @@ packages:
     resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
     engines: {node: '>= 0.6'}
 
-  motion-dom@12.35.1:
-    resolution: {integrity: sha512-7n6r7TtNOsH2UFSAXzTkfzOeO5616v9B178qBIjmu/WgEyJK0uqwytCEhwKBTuM/HJA40ptAw7hLFpxtPAMRZQ==}
+  motion-dom@12.35.2:
+    resolution: {integrity: sha512-pWXFMTwvGDbx1Fe9YL5HZebv2NhvGBzRtiNUv58aoK7+XrsuaydQ0JGRKK2r+bTKlwgSWwWxHbP5249Qr/BNpg==}
 
   motion-utils@12.29.2:
     resolution: {integrity: sha512-G3kc34H2cX2gI63RqU+cZq+zWRRPSsNIOjpdl9TN4AQwC4sgwYPl/Q/Obf/d53nOm569T0fYK+tcoSV50BWx8A==}
 
-  motion@12.35.1:
-    resolution: {integrity: sha512-yEt/49kWC0VU/IEduDfeZw82eDemlPwa1cyo/gcEEUCN4WgpSJpUcxz6BUwakGabvJiTzLQ58J73515I5tfykQ==}
+  motion@12.35.2:
+    resolution: {integrity: sha512-8zCi1DkNyU6a/tgEHn/GnnXZDcaMpDHbDOGORY1Rg/6lcNMSOuvwDB3i4hMSOvxqMWArc/vrGaw/Xek1OP69/A==}
     peerDependencies:
       '@emotion/is-prop-valid': '*'
       react: ^18.0.0 || ^19.0.0
@@ -2524,8 +2524,8 @@ packages:
     peerDependencies:
       seroval: ^1.0
 
-  seroval-plugins@1.5.0:
-    resolution: {integrity: sha512-EAHqADIQondwRZIdeW2I636zgsODzoBDwb3PT/+7TLDWyw1Dy/Xv7iGUIEXXav7usHDE9HVhOU61irI3EnyyHA==}
+  seroval-plugins@1.5.1:
+    resolution: {integrity: sha512-4FbuZ/TMl02sqv0RTFexu0SP6V+ywaIe5bAWCCEik0fk17BhALgwvUDVF7e3Uvf9pxmwCEJsRPmlkUE6HdzLAw==}
     engines: {node: '>=10'}
     peerDependencies:
       seroval: ^1.0
@@ -2534,8 +2534,8 @@ packages:
     resolution: {integrity: sha512-RbcPH1n5cfwKrru7v7+zrZvjLurgHhGyso3HTyGtRivGWgYjbOmGuivCQaORNELjNONoK35nj28EoWul9sb1zQ==}
     engines: {node: '>=10'}
 
-  seroval@1.5.0:
-    resolution: {integrity: sha512-OE4cvmJ1uSPrKorFIH9/w/Qwuvi/IMcGbv5RKgcJ/zjA/IohDLU6SVaxFN9FwajbP7nsX0dQqMDes1whk3y+yw==}
+  seroval@1.5.1:
+    resolution: {integrity: sha512-OwrZRZAfhHww0WEnKHDY8OM0U/Qs8OTfIDWhUD4BLpNJUfXK4cGmjiagGze086m+mhI+V2nD0gfbHEnJjb9STA==}
     engines: {node: '>=10'}
 
   sharp@0.34.5:
@@ -3073,39 +3073,39 @@ snapshots:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
 
-  '@biomejs/biome@2.4.5':
+  '@biomejs/biome@2.4.6':
     optionalDependencies:
-      '@biomejs/cli-darwin-arm64': 2.4.5
-      '@biomejs/cli-darwin-x64': 2.4.5
-      '@biomejs/cli-linux-arm64': 2.4.5
-      '@biomejs/cli-linux-arm64-musl': 2.4.5
-      '@biomejs/cli-linux-x64': 2.4.5
-      '@biomejs/cli-linux-x64-musl': 2.4.5
-      '@biomejs/cli-win32-arm64': 2.4.5
-      '@biomejs/cli-win32-x64': 2.4.5
-
-  '@biomejs/cli-darwin-arm64@2.4.5':
+      '@biomejs/cli-darwin-arm64': 2.4.6
+      '@biomejs/cli-darwin-x64': 2.4.6
+      '@biomejs/cli-linux-arm64': 2.4.6
+      '@biomejs/cli-linux-arm64-musl': 2.4.6
+      '@biomejs/cli-linux-x64': 2.4.6
+      '@biomejs/cli-linux-x64-musl': 2.4.6
+      '@biomejs/cli-win32-arm64': 2.4.6
+      '@biomejs/cli-win32-x64': 2.4.6
+
+  '@biomejs/cli-darwin-arm64@2.4.6':
     optional: true
 
-  '@biomejs/cli-darwin-x64@2.4.5':
+  '@biomejs/cli-darwin-x64@2.4.6':
     optional: true
 
-  '@biomejs/cli-linux-arm64-musl@2.4.5':
+  '@biomejs/cli-linux-arm64-musl@2.4.6':
     optional: true
 
-  '@biomejs/cli-linux-arm64@2.4.5':
+  '@biomejs/cli-linux-arm64@2.4.6':
     optional: true
 
-  '@biomejs/cli-linux-x64-musl@2.4.5':
+  '@biomejs/cli-linux-x64-musl@2.4.6':
     optional: true
 
-  '@biomejs/cli-linux-x64@2.4.5':
+  '@biomejs/cli-linux-x64@2.4.6':
     optional: true
 
-  '@biomejs/cli-win32-arm64@2.4.5':
+  '@biomejs/cli-win32-arm64@2.4.6':
     optional: true
 
-  '@biomejs/cli-win32-x64@2.4.5':
+  '@biomejs/cli-win32-x64@2.4.6':
     optional: true
 
   '@cacheable/memory@2.0.8':
@@ -3350,7 +3350,7 @@ snapshots:
   '@img/sharp-win32-x64@0.34.5':
     optional: true
 
-  '@inlang/paraglide-js@2.13.2':
+  '@inlang/paraglide-js@2.14.0':
     dependencies:
       '@inlang/recommend-sherlock': 0.2.1
       '@inlang/sdk': 2.7.0
@@ -3740,7 +3740,7 @@ snapshots:
     transitivePeerDependencies:
       - csstype
 
-  '@tanstack/devtools-vite@0.5.3(vite@7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0))':
+  '@tanstack/devtools-vite@0.5.3(vite@7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0))':
     dependencies:
       '@babel/core': 7.29.0
       '@babel/generator': 7.29.1
@@ -3752,7 +3752,7 @@ snapshots:
       chalk: 5.6.2
       launch-editor: 2.13.1
       picomatch: 4.0.3
-      vite: 7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0)
+      vite: 7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -3820,22 +3820,22 @@ snapshots:
       '@tanstack/query-core': 5.90.20
       react: 19.2.4
 
-  '@tanstack/react-router-devtools@1.166.3(@tanstack/react-router@1.166.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(@tanstack/router-core@1.166.2)(csstype@3.2.3)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+  '@tanstack/react-router-devtools@1.166.6(@tanstack/react-router@1.166.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(@tanstack/router-core@1.166.6)(csstype@3.2.3)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
-      '@tanstack/react-router': 1.166.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@tanstack/router-devtools-core': 1.166.2(@tanstack/router-core@1.166.2)(csstype@3.2.3)
+      '@tanstack/react-router': 1.166.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      '@tanstack/router-devtools-core': 1.166.6(@tanstack/router-core@1.166.6)(csstype@3.2.3)
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
     optionalDependencies:
-      '@tanstack/router-core': 1.166.2
+      '@tanstack/router-core': 1.166.6
     transitivePeerDependencies:
       - csstype
 
-  '@tanstack/react-router@1.166.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
+  '@tanstack/react-router@1.166.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4)':
     dependencies:
       '@tanstack/history': 1.161.4
       '@tanstack/react-store': 0.9.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      '@tanstack/router-core': 1.166.2
+      '@tanstack/router-core': 1.166.6
       isbot: 5.1.35
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
@@ -3861,28 +3861,28 @@ snapshots:
       react: 19.2.4
       react-dom: 19.2.4(react@19.2.4)
 
-  '@tanstack/router-core@1.166.2':
+  '@tanstack/router-core@1.166.6':
     dependencies:
       '@tanstack/history': 1.161.4
       '@tanstack/store': 0.9.2
       cookie-es: 2.0.0
-      seroval: 1.5.0
-      seroval-plugins: 1.5.0(seroval@1.5.0)
+      seroval: 1.5.1
+      seroval-plugins: 1.5.1(seroval@1.5.1)
       tiny-invariant: 1.3.3
       tiny-warning: 1.0.3
 
-  '@tanstack/router-devtools-core@1.166.2(@tanstack/router-core@1.166.2)(csstype@3.2.3)':
+  '@tanstack/router-devtools-core@1.166.6(@tanstack/router-core@1.166.6)(csstype@3.2.3)':
     dependencies:
-      '@tanstack/router-core': 1.166.2
+      '@tanstack/router-core': 1.166.6
       clsx: 2.1.1
       goober: 2.1.18(csstype@3.2.3)
       tiny-invariant: 1.3.3
     optionalDependencies:
       csstype: 3.2.3
 
-  '@tanstack/router-generator@1.166.2':
+  '@tanstack/router-generator@1.166.6':
     dependencies:
-      '@tanstack/router-core': 1.166.2
+      '@tanstack/router-core': 1.166.6
       '@tanstack/router-utils': 1.161.4
       '@tanstack/virtual-file-routes': 1.161.4
       prettier: 3.8.1
@@ -3893,7 +3893,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/router-plugin@1.166.3(@tanstack/react-router@1.166.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0))':
+  '@tanstack/router-plugin@1.166.6(@tanstack/react-router@1.166.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4))(vite@7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0))':
     dependencies:
       '@babel/core': 7.29.0
       '@babel/plugin-syntax-jsx': 7.28.6(@babel/core@7.29.0)
@@ -3901,16 +3901,16 @@ snapshots:
       '@babel/template': 7.28.6
       '@babel/traverse': 7.29.0
       '@babel/types': 7.29.0
-      '@tanstack/router-core': 1.166.2
-      '@tanstack/router-generator': 1.166.2
+      '@tanstack/router-core': 1.166.6
+      '@tanstack/router-generator': 1.166.6
       '@tanstack/router-utils': 1.161.4
       '@tanstack/virtual-file-routes': 1.161.4
       chokidar: 3.6.0
       unplugin: 2.3.11
       zod: 3.25.76
     optionalDependencies:
-      '@tanstack/react-router': 1.166.3(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
-      vite: 7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0)
+      '@tanstack/react-router': 1.166.6(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      vite: 7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -3990,7 +3990,7 @@ snapshots:
 
   '@types/ms@2.1.0': {}
 
-  '@types/node@25.3.5':
+  '@types/node@25.4.0':
     dependencies:
       undici-types: 7.18.2
 
@@ -4017,11 +4017,11 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vitejs/plugin-react-swc@4.2.3(vite@7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0))':
+  '@vitejs/plugin-react-swc@4.2.3(vite@7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-rc.2
       '@swc/core': 1.15.18
-      vite: 7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0)
+      vite: 7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0)
     transitivePeerDependencies:
       - '@swc/helpers'
 
@@ -4381,10 +4381,10 @@ snapshots:
   flat-cache@6.1.20:
     dependencies:
       cacheable: 2.3.3
-      flatted: 3.4.0
+      flatted: 3.4.1
       hookified: 1.15.1
 
-  flatted@3.4.0: {}
+  flatted@3.4.1: {}
 
   follow-redirects@1.15.11: {}
 
@@ -4398,9 +4398,9 @@ snapshots:
 
   fraction.js@5.3.4: {}
 
-  framer-motion@12.35.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+  framer-motion@12.35.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
     dependencies:
-      motion-dom: 12.35.1
+      motion-dom: 12.35.2
       motion-utils: 12.29.2
       tslib: 2.8.1
     optionalDependencies:
@@ -4920,15 +4920,15 @@ snapshots:
     dependencies:
       mime-db: 1.52.0
 
-  motion-dom@12.35.1:
+  motion-dom@12.35.2:
     dependencies:
       motion-utils: 12.29.2
 
   motion-utils@12.29.2: {}
 
-  motion@12.35.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
+  motion@12.35.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4):
     dependencies:
-      framer-motion: 12.35.1(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
+      framer-motion: 12.35.2(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       tslib: 2.8.1
     optionalDependencies:
       react: 19.2.4
@@ -5203,13 +5203,13 @@ snapshots:
     dependencies:
       seroval: 1.3.2
 
-  seroval-plugins@1.5.0(seroval@1.5.0):
+  seroval-plugins@1.5.1(seroval@1.5.1):
     dependencies:
-      seroval: 1.5.0
+      seroval: 1.5.1
 
   seroval@1.3.2: {}
 
-  seroval@1.5.0: {}
+  seroval@1.5.1: {}
 
   sharp@0.34.5:
     dependencies:
@@ -5648,15 +5648,15 @@ snapshots:
       d3-time: 3.1.0
       d3-timer: 3.0.1
 
-  vite-plugin-image-optimizer@2.0.3(sharp@0.34.5)(vite@7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0)):
+  vite-plugin-image-optimizer@2.0.3(sharp@0.34.5)(vite@7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0)):
     dependencies:
       ansi-colors: 4.1.3
       pathe: 2.0.3
-      vite: 7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0)
+      vite: 7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0)
     optionalDependencies:
       sharp: 0.34.5
 
-  vite@7.3.1(@types/node@25.3.5)(sass@1.97.3)(tsx@4.21.0):
+  vite@7.3.1(@types/node@25.4.0)(sass@1.97.3)(tsx@4.21.0):
     dependencies:
       esbuild: 0.27.3
       fdir: 6.5.0(picomatch@4.0.3)
@@ -5665,7 +5665,7 @@ snapshots:
       rollup: 4.59.0
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 25.3.5
+      '@types/node': 25.4.0
       fsevents: 2.3.3
       sass: 1.97.3
       tsx: 4.21.0
diff --git a/web/src/pages/EdgeSetupPage/EdgeSetupPage.tsx b/web/src/pages/EdgeSetupPage/EdgeSetupPage.tsx
index 8a3c457890..3da1998023 100644
--- a/web/src/pages/EdgeSetupPage/EdgeSetupPage.tsx
+++ b/web/src/pages/EdgeSetupPage/EdgeSetupPage.tsx
@@ -15,14 +15,14 @@ import welcomeImage from './assets/welcome_image.svg';
 import { SetupConfirmationStep } from './steps/SetupConfirmationStep';
 import { SetupEdgeAdoptionStep } from './steps/SetupEdgeAdoptionStep';
 import { SetupEdgeComponentStep } from './steps/SetupEdgeComponentStep';
-import { SetupEdgeDeployStep } from './steps/SetupEdgeDeployStep';
+import { SetupEdgeDeployStepAdapter } from './steps/SetupEdgeDeployStepAdapter';
 import { EdgeSetupStep, type EdgeSetupStepValue } from './types';
 import { useEdgeWizardStore } from './useEdgeWizardStore';
 
 export const EdgeSetupPage = () => {
   const activeStep = useEdgeWizardStore((s) => s.activeStep);
   const isOnWelcomePage = useEdgeWizardStore((s) => s.isOnWelcomePage);
-  const setisOnWelcomePage = useEdgeWizardStore((s) => s.setisOnWelcomePage);
+  const setIsOnWelcomePage = useEdgeWizardStore((s) => s.setIsOnWelcomePage);
   const navigate = useNavigate();
 
   const stepsConfig = useMemo(
@@ -57,7 +57,7 @@ export const EdgeSetupPage = () => {
 
   const stepsComponents = useMemo(
     (): Record<EdgeSetupStepValue, ReactNode> => ({
-      edgeDeploy: <SetupEdgeDeployStep />,
+      edgeDeploy: <SetupEdgeDeployStepAdapter />,
       edgeComponent: <SetupEdgeComponentStep />,
       edgeAdoption: <SetupEdgeAdoptionStep />,
       confirmation: <SetupConfirmationStep />,
@@ -78,7 +78,7 @@ export const EdgeSetupPage = () => {
         <Controls>
           <Button
             text={m.edge_setup_controls_configure()}
-            onClick={() => setisOnWelcomePage(false)}
+            onClick={() => setIsOnWelcomePage(false)}
           />
         </Controls>
       </div>
@@ -87,7 +87,12 @@ export const EdgeSetupPage = () => {
 
   return (
     <WizardPage
+      id="edge-setup-wizard"
       activeStep={activeStep}
+      subtitle={m.edge_setup_page_subtitle()}
+      title={m.edge_setup_page_title()}
+      steps={stepsConfig}
+      isOnWelcomePage={isOnWelcomePage}
       onClose={() => {
         navigate({ to: '/vpn-overview', replace: true }).then(() => {
           setTimeout(() => {
@@ -95,11 +100,6 @@ export const EdgeSetupPage = () => {
           }, 100);
         });
       }}
-      subtitle={m.edge_setup_page_subtitle()}
-      title={m.edge_setup_page_title()}
-      steps={stepsConfig}
-      id="setup-wizard"
-      isOnWelcomePage={isOnWelcomePage}
       welcomePageConfig={{
         title: m.edge_setup_welcome_title(),
         subtitle: m.edge_setup_welcome_subtitle(),
diff --git a/web/src/pages/EdgeSetupPage/steps/SetupEdgeComponentStep.tsx b/web/src/pages/EdgeSetupPage/steps/SetupEdgeComponentStep.tsx
index ce8ec3eb71..1854fa3af5 100644
--- a/web/src/pages/EdgeSetupPage/steps/SetupEdgeComponentStep.tsx
+++ b/web/src/pages/EdgeSetupPage/steps/SetupEdgeComponentStep.tsx
@@ -9,10 +9,9 @@ import { SizedBox } from '../../../shared/defguard-ui/components/SizedBox/SizedB
 import { ThemeSpacing } from '../../../shared/defguard-ui/types';
 import { useAppForm } from '../../../shared/form';
 import { formChangeLogic } from '../../../shared/formLogic';
+import { validateIpOrDomain } from '../../../shared/validators';
 import { EdgeSetupStep } from '../types';
 import { useEdgeWizardStore } from '../useEdgeWizardStore';
-import './style.scss';
-import { validateIpOrDomain } from '../../../shared/validators';
 
 type FormFields = StoreValues;
 
diff --git a/web/src/pages/EdgeSetupPage/steps/SetupEdgeDeployStepAdapter.tsx b/web/src/pages/EdgeSetupPage/steps/SetupEdgeDeployStepAdapter.tsx
new file mode 100644
index 0000000000..8c7628c249
--- /dev/null
+++ b/web/src/pages/EdgeSetupPage/steps/SetupEdgeDeployStepAdapter.tsx
@@ -0,0 +1,19 @@
+import { SetupEdgeDeployStep } from '../../../shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep';
+import { EdgeSetupStep } from '../types';
+import { useEdgeWizardStore } from '../useEdgeWizardStore';
+
+export const SetupEdgeDeployStepAdapter = () => {
+  const setIsOnWelcomePage = useEdgeWizardStore((s) => s.setIsOnWelcomePage);
+  const setActiveStep = useEdgeWizardStore((s) => s.setActiveStep);
+
+  return (
+    <SetupEdgeDeployStep
+      onBack={() => {
+        setIsOnWelcomePage(true);
+      }}
+      onNext={() => {
+        setActiveStep(EdgeSetupStep.EdgeComponent);
+      }}
+    />
+  );
+};
diff --git a/web/src/pages/EdgeSetupPage/style.scss b/web/src/pages/EdgeSetupPage/style.scss
index 9ca97f6e8c..751266ff25 100644
--- a/web/src/pages/EdgeSetupPage/style.scss
+++ b/web/src/pages/EdgeSetupPage/style.scss
@@ -1,135 +1,4 @@
-/* stylelint-disable no-descending-specificity */
-#setup-page {
-  background-color: var(--bg-muted);
-  width: 100%;
-  min-height: 100dvh;
-}
-
-#setup-page > .content-limiter {
-  display: flex;
-  flex-flow: row;
-  align-items: flex-start;
-  justify-content: center;
-}
-
-#setup-page .page-grid {
-  display: flex;
-  flex-flow: column;
-  align-items: flex-start;
-  justify-content: flex-start;
-  width: 100%;
-  max-width: 1120px;
-  box-sizing: border-box;
-  min-height: 100dvh;
-}
-
-#setup-page header {
-  height: 60px;
-  display: flex;
-  flex-flow: row;
-  align-items: center;
-  justify-content: flex-start;
-  padding-top: var(--spacing-2xl);
-  padding-bottom: var(--spacing-4xl);
-}
-
-#setup-page #content-card {
-  display: grid;
-  grid-template-columns: 667fr 443fr;
-  border-radius: var(--radius-xxl);
-  background-color: var(--bg-default);
-  box-shadow: var(--menu-shadow);
-  overflow: hidden;
-
-  & > .main-track {
-    box-sizing: border-box;
-    padding: var(--spacing-4xl);
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-  }
-
-  & > .image {
-    height: 100%;
-    width: 100%;
-    max-width: 100%;
-    position: relative;
-    overflow: hidden;
-
-    video {
-      width: 100%;
-      min-height: 657px;
-      min-width: 443px;
-      object-fit: cover;
-    }
-  }
-}
-
-#docs-card {
-  display: grid;
-  grid-template-columns: 54px 1fr;
-  background-color: transparent;
-  border: var(--border-1) solid var(--border-disabled);
-  border-radius: var(--radius-lg);
-  padding: var(--spacing-md);
-  column-gap: var(--spacing-2xl);
-
-  .image-track {
-    width: 100%;
-    max-width: 100%;
-    overflow: hidden;
-
-    img {
-      width: 100%;
-    }
-  }
-
-  .content {
-    display: flex;
-    flex-flow: column;
-    row-gap: var(--spacing-sm);
-
-    p {
-      font: var(--t-body-sm-400);
-      color: var(--fg-muted);
-    }
-  }
-}
-
-#setup-page footer {
-  display: flex;
-  flex-flow: row;
-  align-items: center;
-  justify-content: flex-start;
-  width: 100%;
-  margin-top: auto;
-  padding-top: var(--spacing-4xl);
-  padding-bottom: var(--spacing-2xl);
-
-  & > div:nth-child(2) {
-    margin-left: auto;
-  }
-
-  div p {
-    font: var(--t-body-xs-400);
-    color: var(--fg-muted);
-
-    span {
-      color: inherit;
-      font: inherit;
-    }
-  }
-
-  div:nth-child(1) {
-    a {
-      color: inherit;
-    }
-  }
-
-  div:nth-child(2) {
-    a {
-      color: var(--fg-action);
-      text-decoration: none;
-    }
-  }
+#edge-setup-wizard .wizard-card .code-card {
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
 }
diff --git a/web/src/pages/EdgeSetupPage/useEdgeWizardStore.tsx b/web/src/pages/EdgeSetupPage/useEdgeWizardStore.tsx
index fbacd1ab4e..3727ebe0c8 100644
--- a/web/src/pages/EdgeSetupPage/useEdgeWizardStore.tsx
+++ b/web/src/pages/EdgeSetupPage/useEdgeWizardStore.tsx
@@ -16,7 +16,7 @@ type StoreMethods = {
   reset: () => void;
   start: (values?: Partial<StoreValues>) => void;
   setActiveStep: (step: EdgeSetupStepValue) => void;
-  setisOnWelcomePage: (show: boolean) => void;
+  setIsOnWelcomePage: (show: boolean) => void;
   resetEdgeAdoptionState: () => void;
   setEdgeAdoptionState: (state: EdgeAdoptionState) => void;
 };
@@ -51,7 +51,7 @@ export const useEdgeWizardStore = create<StoreMethods & StoreValues>()(
         });
       },
       setActiveStep: (step) => set({ activeStep: step }),
-      setisOnWelcomePage: (show) => set({ isOnWelcomePage: show }),
+      setIsOnWelcomePage: (show) => set({ isOnWelcomePage: show }),
       resetEdgeAdoptionState: () =>
         set(() => ({
           edgeAdoptionState: { ...edgeAdoptionStateDefaults },
diff --git a/web/src/pages/LocationsMigrationWizardPage/LocationsMigrationWizardPage.tsx b/web/src/pages/LocationsMigrationWizardPage/LocationsMigrationWizardPage.tsx
index 18201fa692..d6ef641d0f 100644
--- a/web/src/pages/LocationsMigrationWizardPage/LocationsMigrationWizardPage.tsx
+++ b/web/src/pages/LocationsMigrationWizardPage/LocationsMigrationWizardPage.tsx
@@ -72,6 +72,8 @@ const Content = () => {
   const handleStart = useCallback(() => {
     if (!locationsState) return;
     useGatewayWizardStore.getState().start({
+      // skip welcome page
+      isOnWelcomePage: false,
       isMigrationWizard: true,
       network_id: locationsState.current_location,
     });
diff --git a/web/src/pages/MigrationWizardPage/MigrationWizardPage.tsx b/web/src/pages/MigrationWizardPage/MigrationWizardPage.tsx
index b48fd3f4ab..30e6f66dd4 100644
--- a/web/src/pages/MigrationWizardPage/MigrationWizardPage.tsx
+++ b/web/src/pages/MigrationWizardPage/MigrationWizardPage.tsx
@@ -16,6 +16,7 @@ import { MigrationWizardCASummaryStep } from './steps/MigrationWizardCASummarySt
 import { MigrationWizardConfirmationStep } from './steps/MigrationWizardConfirmationStep/MigrationWizardConfirmationStep';
 import { MigrationWizardEdgeAdoptionStep } from './steps/MigrationWizardEdgeAdoptionStep';
 import { MigrationWizardEdgeComponentStep } from './steps/MigrationWizardEdgeComponentStep';
+import { MigrationWizardEdgeDeploymentStepAdapter } from './steps/MigrationWizardEdgeDeploymentStepAdapter';
 import { MigrationWizardGeneralConfigurationStep } from './steps/MigrationWizardGeneralConfigurationStep';
 import { MigrationWizardStart } from './steps/MigrationWizardStart';
 import { useMigrationWizardStore } from './store/useMigrationWizardStore';
@@ -56,21 +57,27 @@ export const MigrationWizardPage = () => {
         label: m.migration_wizard_step_certificate_authority_summary_label(),
         description: m.migration_wizard_step_certificate_authority_summary_description(),
       },
+      edgeDeployment: {
+        id: MigrationWizardStep.EdgeDeployment,
+        order: 4,
+        label: m.edge_setup_step_deploy_label(),
+        description: m.edge_setup_step_deploy_description(),
+      },
       edge: {
         id: MigrationWizardStep.Edge,
-        order: 4,
+        order: 5,
         label: m.migration_wizard_step_edge_component_label(),
         description: m.migration_wizard_step_edge_component_description(),
       },
       edgeAdoption: {
         id: MigrationWizardStep.EdgeAdoption,
-        order: 5,
+        order: 6,
         label: m.migration_wizard_step_edge_adoption_label(),
         description: m.migration_wizard_step_edge_adoption_description(),
       },
       confirmation: {
         id: MigrationWizardStep.Confirmation,
-        order: 6,
+        order: 7,
         label: m.migration_wizard_step_confirmation_label(),
         description: m.migration_wizard_step_confirmation_description(),
       },
@@ -84,6 +91,7 @@ export const MigrationWizardPage = () => {
       ca: <MigrationWizardCAStep />,
       caSummary: <MigrationWizardCASummaryStep />,
       edge: <MigrationWizardEdgeComponentStep />,
+      edgeDeployment: <MigrationWizardEdgeDeploymentStepAdapter />,
       edgeAdoption: <MigrationWizardEdgeAdoptionStep />,
       confirmation: <MigrationWizardConfirmationStep />,
       welcome: null,
diff --git a/web/src/pages/MigrationWizardPage/steps/MigrationWizardEdgeDeploymentStepAdapter.tsx b/web/src/pages/MigrationWizardPage/steps/MigrationWizardEdgeDeploymentStepAdapter.tsx
new file mode 100644
index 0000000000..33f4747ab4
--- /dev/null
+++ b/web/src/pages/MigrationWizardPage/steps/MigrationWizardEdgeDeploymentStepAdapter.tsx
@@ -0,0 +1,17 @@
+import { useShallow } from 'zustand/react/shallow';
+import { SetupEdgeDeployStep } from '../../../shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep';
+import { useMigrationWizardStore } from '../store/useMigrationWizardStore';
+
+export const MigrationWizardEdgeDeploymentStepAdapter = () => {
+  const [back, next] = useMigrationWizardStore(useShallow((s) => [s.back, s.next]));
+  return (
+    <SetupEdgeDeployStep
+      onNext={() => {
+        next();
+      }}
+      onBack={() => {
+        back();
+      }}
+    />
+  );
+};
diff --git a/web/src/pages/MigrationWizardPage/store/useMigrationWizardStore.tsx b/web/src/pages/MigrationWizardPage/store/useMigrationWizardStore.tsx
index 9b29a19bf7..03d109ae3b 100644
--- a/web/src/pages/MigrationWizardPage/store/useMigrationWizardStore.tsx
+++ b/web/src/pages/MigrationWizardPage/store/useMigrationWizardStore.tsx
@@ -128,10 +128,13 @@ export const useMigrationWizardStore = create<Store>()(
             stepToSet = MigrationWizardStep.General;
             break;
           case 'caSummary':
+            stepToSet = MigrationWizardStep.Ca;
+            break;
+          case 'edgeDeployment':
             stepToSet = MigrationWizardStep.CaSummary;
             break;
           case 'edge':
-            stepToSet = MigrationWizardStep.CaSummary;
+            stepToSet = MigrationWizardStep.EdgeDeployment;
             break;
           case 'edgeAdoption':
             stepToSet = MigrationWizardStep.Edge;
@@ -161,6 +164,9 @@ export const useMigrationWizardStore = create<Store>()(
             stepToSet = MigrationWizardStep.CaSummary;
             break;
           case 'caSummary':
+            stepToSet = MigrationWizardStep.EdgeDeployment;
+            break;
+          case 'edgeDeployment':
             stepToSet = MigrationWizardStep.Edge;
             break;
           case 'edge':
diff --git a/web/src/pages/MigrationWizardPage/types.ts b/web/src/pages/MigrationWizardPage/types.ts
index b9d430796c..ca0473f652 100644
--- a/web/src/pages/MigrationWizardPage/types.ts
+++ b/web/src/pages/MigrationWizardPage/types.ts
@@ -3,6 +3,7 @@ export const MigrationWizardStep = {
   General: 'general',
   Ca: 'ca',
   CaSummary: 'caSummary',
+  EdgeDeployment: 'edgeDeployment',
   Edge: 'edge',
   EdgeAdoption: 'edgeAdoption',
   Confirmation: 'confirmation',
diff --git a/web/src/pages/SetupPage/initial/SetupPage.tsx b/web/src/pages/SetupPage/initial/SetupPage.tsx
index f8b69e6014..5f1520151d 100644
--- a/web/src/pages/SetupPage/initial/SetupPage.tsx
+++ b/web/src/pages/SetupPage/initial/SetupPage.tsx
@@ -16,7 +16,7 @@ import { SetupCertificateAuthoritySummaryStep } from './steps/SetupCertificateAu
 import { SetupConfirmationStep } from './steps/SetupConfirmationStep';
 import { SetupEdgeAdoptionStep } from './steps/SetupEdgeAdoptionStep';
 import { SetupEdgeComponentStep } from './steps/SetupEdgeComponentStep';
-import { SetupEdgeDeployStep } from './steps/SetupEdgeDeployStep';
+import { SetupEdgeDeployStepAdapter } from './steps/SetupEdgeDeployStepAdapter';
 import { SetupGeneralConfigStep } from './steps/SetupGeneralConfigStep';
 import { SetupPageStep, type SetupPageStepValue } from './types';
 import { useSetupWizardStore } from './useSetupWizardStore';
@@ -104,7 +104,7 @@ export const SetupPage = () => {
       generalConfig: <SetupGeneralConfigStep />,
       certificateAuthority: <SetupCertificateAuthorityStep />,
       certificateAuthoritySummary: <SetupCertificateAuthoritySummaryStep />,
-      edgeDeploy: <SetupEdgeDeployStep />,
+      edgeDeploy: <SetupEdgeDeployStepAdapter />,
       edgeComponent: <SetupEdgeComponentStep />,
       edgeAdoption: <SetupEdgeAdoptionStep />,
       confirmation: <SetupConfirmationStep />,
diff --git a/web/src/pages/SetupPage/initial/steps/SetupEdgeDeployStep.tsx b/web/src/pages/SetupPage/initial/steps/SetupEdgeDeployStep.tsx
deleted file mode 100644
index b9dd7d7d10..0000000000
--- a/web/src/pages/SetupPage/initial/steps/SetupEdgeDeployStep.tsx
+++ /dev/null
@@ -1,279 +0,0 @@
-import { type ReactNode, useMemo, useState } from 'react';
-import { m } from '../../../../paraglide/messages';
-import { Card } from '../../../../shared/components/Card/Card';
-import { CodeSnippet } from '../../../../shared/components/CodeSnippet/CodeSnippet';
-import { Controls } from '../../../../shared/components/Controls/Controls';
-import { WizardCard } from '../../../../shared/components/wizard/WizardCard/WizardCard';
-import { AppText } from '../../../../shared/defguard-ui/components/AppText/AppText';
-import { Button } from '../../../../shared/defguard-ui/components/Button/Button';
-import { Checkbox } from '../../../../shared/defguard-ui/components/Checkbox/Checkbox';
-import { Icon, IconKind } from '../../../../shared/defguard-ui/components/Icon';
-import { RenderMarkdown } from '../../../../shared/defguard-ui/components/RenderMarkdown/RenderMarkdown';
-import { SizedBox } from '../../../../shared/defguard-ui/components/SizedBox/SizedBox';
-import { Tabs } from '../../../../shared/defguard-ui/components/Tabs/Tabs';
-import type { TabsItem } from '../../../../shared/defguard-ui/components/Tabs/types';
-import {
-  TextStyle,
-  ThemeSpacing,
-  ThemeVariable,
-} from '../../../../shared/defguard-ui/types';
-import '../../../EdgeSetupPage/steps/style.scss';
-import amazonImage from '../../../EdgeSetupPage/assets/amazon.png';
-import kubernetesImage from '../../../EdgeSetupPage/assets/kub.png';
-import teraImage from '../../../EdgeSetupPage/assets/terra.png';
-import { SetupPageStep } from '../types';
-import { useSetupWizardStore } from '../useSetupWizardStore';
-
-type TabItem = 'docker' | 'compose' | 'package' | 'virtualImage' | 'other';
-
-export const SetupEdgeDeployStep = () => {
-  const [confirmed, setConfirmed] = useState(false);
-  const [activeTab, setActiveTab] = useState<TabItem>('docker');
-
-  const tabsConfig = useMemo(
-    (): TabsItem[] => [
-      {
-        title: m.edge_setup_step_deploy_tabs_docker(),
-        onClick: () => setActiveTab('docker'),
-        active: activeTab === 'docker',
-        hidden: false,
-      },
-      {
-        title: m.edge_setup_step_deploy_tabs_compose(),
-        onClick: () => setActiveTab('compose'),
-        active: activeTab === 'compose',
-        hidden: false,
-      },
-      {
-        title: m.edge_setup_step_deploy_tabs_package(),
-        onClick: () => setActiveTab('package'),
-        active: activeTab === 'package',
-        hidden: false,
-      },
-      {
-        title: m.edge_setup_step_deploy_tabs_virtual_image(),
-        onClick: () => setActiveTab('virtualImage'),
-        active: activeTab === 'virtualImage',
-        hidden: false,
-      },
-      {
-        title: m.edge_setup_step_deploy_tabs_other(),
-        onClick: () => setActiveTab('other'),
-        active: activeTab === 'other',
-        hidden: false,
-      },
-    ],
-    [activeTab],
-  );
-
-  return (
-    <WizardCard id="edge-deploy-step">
-      <Tabs items={tabsConfig} disablePadding />
-      <SizedBox height={ThemeSpacing.Xl2} />
-      {tabsContent[activeTab]}
-      <SizedBox height={ThemeSpacing.Xl2} />
-      <Checkbox
-        active={confirmed}
-        onClick={() => {
-          setConfirmed((s) => !s);
-        }}
-        text={m.edge_setup_step_deploy_confirm()}
-      />
-      <SizedBox height={ThemeSpacing.Xl3} />
-      <Controls>
-        <Button
-          variant={'outlined'}
-          text={m.controls_back()}
-          onClick={() => {
-            useSetupWizardStore.getState().setActiveStep(SetupPageStep.CASummary);
-          }}
-        />
-        <div className="right">
-          <Button
-            text={m.controls_continue()}
-            disabled={!confirmed}
-            onClick={() => {
-              useSetupWizardStore.getState().setActiveStep(SetupPageStep.EdgeComponent);
-            }}
-          />
-        </div>
-      </Controls>
-    </WizardCard>
-  );
-};
-
-const TabContentHeader = ({ subtitle, title }: { title: string; subtitle: string }) => {
-  return (
-    <div className="tab-content-header">
-      <AppText font={TextStyle.TBodyPrimary500}>{title}</AppText>
-      <SizedBox height={ThemeSpacing.Sm} />
-      <RenderMarkdown content={subtitle} />
-      <SizedBox height={ThemeSpacing.Md} />
-    </div>
-  );
-};
-
-const DockerComposeTab = () => {
-  return (
-    <>
-      <TabContentHeader
-        title={m.edge_setup_step_deploy_tabs_compose_title()}
-        subtitle={m.edge_setup_step_deploy_tabs_compose_subtitle({
-          filename: `docker-compose.yaml`,
-        })}
-      />
-      <CodeSnippet
-        value={`services:
-  proxy:
-    image: ghcr.io/defguard/defguard-proxy:latest
-    restart: unless-stopped
-    ports:
-      - "127.0.0.1:8080:8080"
-      - "50051:50051"`}
-      />
-      <SizedBox height={ThemeSpacing.Xl2} />
-      <AppText font={TextStyle.TBodySm400}>
-        {m.edge_setup_step_deploy_tabs_compose_then()}
-      </AppText>
-      <SizedBox height={ThemeSpacing.Md} />
-      <CodeSnippet value={`docker compose up -d`} />
-    </>
-  );
-};
-
-const DockerTab = () => {
-  return (
-    <>
-      <TabContentHeader
-        title={m.edge_setup_step_deploy_tabs_docker_title()}
-        subtitle={m.edge_setup_step_deploy_tabs_docker_subtitle()}
-      />
-      <CodeSnippet
-        value={`docker run --restart unless-stopped ghcr.io/defguard/defguard-proxy:latest`}
-      />
-    </>
-  );
-};
-
-const PackageTab = () => {
-  return (
-    <>
-      <TabContentHeader
-        title={m.edge_setup_step_deploy_tabs_package_title()}
-        subtitle={m.edge_setup_step_deploy_tabs_package_subtitle()}
-      />
-      <CodeSnippet
-        value={`sudo apt update 
-sudo apt install -y ca-certificates curl 
-#Add official Defguard public GPG key
-sudo install -m 0755 -d /etc/apt/keyrings
-sudo curl -fsSL https://apt.defguard.net/defguard.asc -o /etc/apt/keyrings/defguard.asc
-sudo chmod a+r /etc/apt/keyrings/defguard.asc
-
-#Add APT repository
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/defguard.asc] https://apt.defguard.net/ trixie release " | \
-   sudo tee /etc/apt/sources.list.d/defguard.list > /dev/null 
-
-sudo apt update
-sudo apt install defguard-proxy`}
-      />
-    </>
-  );
-};
-
-const VirtualImageTab = () => {
-  return (
-    <>
-      <TabContentHeader
-        title={m.edge_setup_step_deploy_tabs_virtual_title()}
-        subtitle={m.edge_setup_step_deploy_tabs_virtual_subtitle({
-          url: `https://defguard.net/download/defguard-2x-latest.ovf`,
-          filename: `cloud-init-yaml`,
-        })}
-      />
-      <CodeSnippet
-        value={`launch: gateway
-
-runcmd:
-  - |
-    LAUNCH=$(jq -r '.["user-data"].launch' /run/cloud-init/instance-data.json)
-    
-    echo "Launch option = $LAUNCH"
-    
-    if [ "$LAUNCH" = "gateway" ]; then
-      systemctl enable defguard-gateway
-      systemctl start defguard-gateway
-    else
-      echo "Unknown launch: $LAUNCH"
-    fi`}
-      />
-    </>
-  );
-};
-
-const OtherDeploymentMethod = ({
-  image,
-  link,
-  name,
-}: {
-  image: string;
-  name: string;
-  link: string;
-}) => {
-  return (
-    <Card>
-      <div className="inner-track">
-        <div className="image-tack">
-          <img src={image} width={44} height={44} />
-        </div>
-        <div className="content">
-          <p className="title">{name}</p>
-          <a target="_blank" rel="noopener noreferrer" href={link}>
-            <span>{link}</span>
-            <Icon icon={IconKind.OpenInNewWindow} size={16} />
-          </a>
-        </div>
-      </div>
-    </Card>
-  );
-};
-
-const OthersTab = () => {
-  return (
-    <>
-      <TabContentHeader
-        title={m.edge_setup_step_deploy_tabs_other_title()}
-        subtitle={m.edge_setup_step_deploy_tabs_other_subtitle()}
-      />
-      <div id="other-deployment-methods">
-        <OtherDeploymentMethod
-          name={`Kubernetes`}
-          link={`https://docs.defguard.net/deployment-strategies/kubernetes#deployment`}
-          image={kubernetesImage}
-        />
-        <OtherDeploymentMethod
-          name={`Amazon Machine Image`}
-          link={`https://docs.defguard.net/deployment-strategies/amis-and-aws-cloudformation`}
-          image={amazonImage}
-        />
-        <OtherDeploymentMethod
-          name={`Terraform`}
-          link={`https://docs.defguard.net/deployment-strategies/terraform`}
-          image={teraImage}
-        />
-      </div>
-      <SizedBox height={ThemeSpacing.Lg} />
-      <AppText font={TextStyle.TBodySm400} color={ThemeVariable.FgFaded}>
-        {m.edge_setup_step_deploy_tabs_other_launch()}
-      </AppText>
-    </>
-  );
-};
-
-const tabsContent: Record<TabItem, ReactNode> = {
-  docker: <DockerTab />,
-  compose: <DockerComposeTab />,
-  package: <PackageTab />,
-  virtualImage: <VirtualImageTab />,
-  other: <OthersTab />,
-};
diff --git a/web/src/pages/SetupPage/initial/steps/SetupEdgeDeployStepAdapter.tsx b/web/src/pages/SetupPage/initial/steps/SetupEdgeDeployStepAdapter.tsx
new file mode 100644
index 0000000000..8f74b35824
--- /dev/null
+++ b/web/src/pages/SetupPage/initial/steps/SetupEdgeDeployStepAdapter.tsx
@@ -0,0 +1,17 @@
+import { SetupEdgeDeployStep } from '../../../../shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep';
+import { SetupPageStep } from '../types';
+import { useSetupWizardStore } from '../useSetupWizardStore';
+
+export const SetupEdgeDeployStepAdapter = () => {
+  const setActiveStep = useSetupWizardStore((s) => s.setActiveStep);
+  return (
+    <SetupEdgeDeployStep
+      onBack={() => {
+        setActiveStep(SetupPageStep.CASummary);
+      }}
+      onNext={() => {
+        setActiveStep(SetupPageStep.EdgeComponent);
+      }}
+    />
+  );
+};
diff --git a/web/src/pages/EdgeSetupPage/steps/SetupEdgeDeployStep.tsx b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx
similarity index 77%
rename from web/src/pages/EdgeSetupPage/steps/SetupEdgeDeployStep.tsx
rename to web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx
index 857ce31f3b..c001255da4 100644
--- a/web/src/pages/EdgeSetupPage/steps/SetupEdgeDeployStep.tsx
+++ b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/SetupEdgeDeployStep.tsx
@@ -1,31 +1,32 @@
+import './style.scss';
 import { type ReactNode, useMemo, useState } from 'react';
-import { m } from '../../../paraglide/messages';
-import { Card } from '../../../shared/components/Card/Card';
-import { CodeSnippet } from '../../../shared/components/CodeSnippet/CodeSnippet';
-import { Controls } from '../../../shared/components/Controls/Controls';
-import { WizardCard } from '../../../shared/components/wizard/WizardCard/WizardCard';
-import { AppText } from '../../../shared/defguard-ui/components/AppText/AppText';
-import { Button } from '../../../shared/defguard-ui/components/Button/Button';
-import { Checkbox } from '../../../shared/defguard-ui/components/Checkbox/Checkbox';
-import { Icon, IconKind } from '../../../shared/defguard-ui/components/Icon';
-import { RenderMarkdown } from '../../../shared/defguard-ui/components/RenderMarkdown/RenderMarkdown';
-import { SizedBox } from '../../../shared/defguard-ui/components/SizedBox/SizedBox';
-import { Tabs } from '../../../shared/defguard-ui/components/Tabs/Tabs';
-import type { TabsItem } from '../../../shared/defguard-ui/components/Tabs/types';
-import {
-  TextStyle,
-  ThemeSpacing,
-  ThemeVariable,
-} from '../../../shared/defguard-ui/types';
-import amazonImage from '../assets/amazon.png';
-import kubernetesImage from '../assets/kub.png';
-import teraImage from '../assets/terra.png';
-import { EdgeSetupStep } from '../types';
-import { useEdgeWizardStore } from '../useEdgeWizardStore';
+import { m } from '../../../../paraglide/messages';
+import { AppText } from '../../../defguard-ui/components/AppText/AppText';
+import { Button } from '../../../defguard-ui/components/Button/Button';
+import { Checkbox } from '../../../defguard-ui/components/Checkbox/Checkbox';
+import { Icon, IconKind } from '../../../defguard-ui/components/Icon';
+import { RenderMarkdown } from '../../../defguard-ui/components/RenderMarkdown/RenderMarkdown';
+import { SizedBox } from '../../../defguard-ui/components/SizedBox/SizedBox';
+import { Tabs } from '../../../defguard-ui/components/Tabs/Tabs';
+import type { TabsItem } from '../../../defguard-ui/components/Tabs/types';
+import { TextStyle, ThemeSpacing, ThemeVariable } from '../../../defguard-ui/types';
+import { isPresent } from '../../../defguard-ui/utils/isPresent';
+import { Card } from '../../Card/Card';
+import { CodeSnippet } from '../../CodeSnippet/CodeSnippet';
+import { Controls } from '../../Controls/Controls';
+import { WizardCard } from '../../wizard/WizardCard/WizardCard';
+import amazonImage from './assets/amazon.png';
+import kubernetesImage from './assets/kub.png';
+import teraImage from './assets/terra.png';
 
 type TabItem = 'docker' | 'compose' | 'package' | 'virtualImage' | 'other';
 
-export const SetupEdgeDeployStep = () => {
+interface SetupEdgeDeployStepProps {
+  onBack?: () => void;
+  onNext: () => void;
+}
+
+export const SetupEdgeDeployStep = ({ onBack, onNext }: SetupEdgeDeployStepProps) => {
   const [confirmed, setConfirmed] = useState(false);
   const [activeTab, setActiveTab] = useState<TabItem>('docker');
 
@@ -77,27 +78,12 @@ export const SetupEdgeDeployStep = () => {
         }}
         text={m.edge_setup_step_deploy_confirm()}
       />
-      <SizedBox height={ThemeSpacing.Xl3} />
       <Controls>
-        <Button
-          variant={'outlined'}
-          text={m.controls_back()}
-          onClick={() => {
-            useEdgeWizardStore.setState({
-              isOnWelcomePage: true,
-            });
-          }}
-        />
+        {isPresent(onBack) && (
+          <Button variant={'outlined'} text={m.controls_back()} onClick={onBack} />
+        )}
         <div className="right">
-          <Button
-            text={m.controls_continue()}
-            disabled={!confirmed}
-            onClick={() => {
-              useEdgeWizardStore.setState({
-                activeStep: EdgeSetupStep.EdgeComponent,
-              });
-            }}
-          />
+          <Button text={m.controls_next()} disabled={!confirmed} onClick={onNext} />
         </div>
       </Controls>
     </WizardCard>
diff --git a/web/src/pages/EdgeSetupPage/assets/amazon.png b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/assets/amazon.png
similarity index 100%
rename from web/src/pages/EdgeSetupPage/assets/amazon.png
rename to web/src/shared/components/wizard-steps/SetupEdgeDeployStep/assets/amazon.png
diff --git a/web/src/pages/EdgeSetupPage/assets/kub.png b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/assets/kub.png
similarity index 100%
rename from web/src/pages/EdgeSetupPage/assets/kub.png
rename to web/src/shared/components/wizard-steps/SetupEdgeDeployStep/assets/kub.png
diff --git a/web/src/pages/EdgeSetupPage/assets/terra.png b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/assets/terra.png
similarity index 100%
rename from web/src/pages/EdgeSetupPage/assets/terra.png
rename to web/src/shared/components/wizard-steps/SetupEdgeDeployStep/assets/terra.png
diff --git a/web/src/pages/EdgeSetupPage/steps/style.scss b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/style.scss
similarity index 83%
rename from web/src/pages/EdgeSetupPage/steps/style.scss
rename to web/src/shared/components/wizard-steps/SetupEdgeDeployStep/style.scss
index 9c70c9c0ad..922ad5acca 100644
--- a/web/src/pages/EdgeSetupPage/steps/style.scss
+++ b/web/src/shared/components/wizard-steps/SetupEdgeDeployStep/style.scss
@@ -1,20 +1,3 @@
-.wizard-card {
-  .controls {
-    display: flex;
-    flex-grow: 1;
-    justify-content: space-between;
-  }
-
-  .controls {
-    padding-top: 0;
-  }
-
-  .code-card {
-    white-space: pre-wrap;
-    overflow-wrap: anywhere;
-  }
-}
-
 #edge-deploy-step {
   .tab-content-header .markdown-render {
     p {
diff --git a/web/src/shared/components/wizard/WizardCard/style.scss b/web/src/shared/components/wizard/WizardCard/style.scss
index d46cb97a7f..1caaf7bab5 100644
--- a/web/src/shared/components/wizard/WizardCard/style.scss
+++ b/web/src/shared/components/wizard/WizardCard/style.scss
@@ -8,8 +8,4 @@
   & > * {
     width: 100%;
   }
-
-  .controls {
-    padding-top: var(--spacing-3xl);
-  }
 }
diff --git a/web/src/shared/components/wizard/WizardPage/style.scss b/web/src/shared/components/wizard/WizardPage/style.scss
index 9b7ef34b5f..48f85ea36a 100644
--- a/web/src/shared/components/wizard/WizardPage/style.scss
+++ b/web/src/shared/components/wizard/WizardPage/style.scss
@@ -54,3 +54,7 @@
     grid-column: 1 / 13;
   }
 }
+
+.wizard-page .main .controls {
+  padding-top: var(--spacing-3xl);
+}