diff --git a/app/assets/javascripts/discourse-common/addon/lib/discourse-template-map.js b/app/assets/javascripts/discourse-common/addon/lib/discourse-template-map.js
index 51ec2c6c3c3..2a254f54606 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/discourse-template-map.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/discourse-template-map.js
@@ -8,7 +8,7 @@ function appendToCache(cache, key, value) {
   cache.set(key, cachedValue);
 }
 
-const NAMESPACES = ["discourse/", "wizard/", "admin/"];
+const NAMESPACES = ["discourse/", "admin/"];
 
 function isInRecognisedNamespace(moduleName) {
   for (const ns of NAMESPACES) {
diff --git a/app/assets/javascripts/discourse-common/addon/lib/loader-shim.js b/app/assets/javascripts/discourse-common/addon/lib/loader-shim.js
index 6fe66c42deb..f0368c42fa8 100644
--- a/app/assets/javascripts/discourse-common/addon/lib/loader-shim.js
+++ b/app/assets/javascripts/discourse-common/addon/lib/loader-shim.js
@@ -16,7 +16,7 @@ let { define: __define__, require: __require__ } = globalThis;
 // it appears to be unused in the static analysis.
 //
 // For Discourse, the AMD/loader.js mechanism is an important glue. It is what
-// allows Discourse core/admin/wizard/plugins to all be separate .js bundlers
+// allows Discourse core/admin/plugins to all be separate .js bundlers
 // and be "glued back together" as full module graph in the browser.
 //
 // For instance, a plugin module can `import Post from "discourse/models/post";
diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js
index 651e48be51f..9db4d96d80c 100644
--- a/app/assets/javascripts/discourse-common/addon/resolver.js
+++ b/app/assets/javascripts/discourse-common/addon/resolver.js
@@ -135,7 +135,6 @@ function lookupModuleBySuffix(suffix) {
       "discourse-common/",
       "select-kit/",
       "admin/",
-      "wizard/",
       "truth-helpers/",
     ];
     Object.keys(requirejs.entries).forEach((name) => {
@@ -215,18 +214,12 @@ export function buildResolver(baseName) {
           const dashed = dasherize(split[1].replace(/[\.\/]/g, "-"));
 
           const adminBase = `admin/${type}s/`;
-          const wizardBase = `wizard/${type}s/`;
           if (
             lookupModuleBySuffix(`${type}s/${dashed}`) ||
             requirejs.entries[adminBase + dashed] ||
             requirejs.entries[adminBase + dashed.replace(/^admin[-]/, "")] ||
             requirejs.entries[
               adminBase + dashed.replace(/^admin[-]/, "").replace(/-/g, "_")
-            ] ||
-            requirejs.entries[wizardBase + dashed] ||
-            requirejs.entries[wizardBase + dashed.replace(/^wizard[-]/, "")] ||
-            requirejs.entries[
-              wizardBase + dashed.replace(/^wizard[-]/, "").replace(/-/g, "_")
             ]
           ) {
             corrected = type + ":" + dashed;
@@ -282,7 +275,6 @@ export function buildResolver(baseName) {
         this.findMobileTemplate(parsedName) ||
         this.findTemplate(parsedName) ||
         this.findAdminTemplate(parsedName) ||
-        this.findWizardTemplate(parsedName) ||
         this.findLoadingTemplate(parsedName) ||
         this.findConnectorTemplate(parsedName) ||
         this.discourseTemplateModule("not_found")
@@ -386,28 +378,5 @@ export function buildResolver(baseName) {
 
       return resolved;
     }
-
-    findWizardTemplate(parsedName) {
-      if (parsedName.fullNameWithoutType === "wizard") {
-        return this.discourseTemplateModule("wizard/templates/wizard");
-      }
-
-      let namespaced;
-
-      if (parsedName.fullNameWithoutType.startsWith("components/")) {
-        // Look up components as-is
-        namespaced = parsedName.fullNameWithoutType;
-      } else if (/^wizard[_\.-]/.test(parsedName.fullNameWithoutType)) {
-        // This may only get hit for the loading routes and may be removable.
-        namespaced = parsedName.fullNameWithoutType.slice(7);
-      }
-
-      if (namespaced) {
-        let wizardParsedName = this.parseName(
-          `template:wizard/templates/${namespaced}`
-        );
-        return this.findTemplate(wizardParsedName);
-      }
-    }
   };
 }
diff --git a/app/assets/javascripts/discourse/app/mapping-router.js b/app/assets/javascripts/discourse/app/mapping-router.js
index 6844a751554..a64d1de642e 100644
--- a/app/assets/javascripts/discourse/app/mapping-router.js
+++ b/app/assets/javascripts/discourse/app/mapping-router.js
@@ -1,10 +1,10 @@
-import EmberRouter from "@ember/routing/router";
+import EmbroiderRouter from "@embroider/router";
 import Site from "discourse/models/site";
 import { isTesting } from "discourse-common/config/environment";
 import getURL from "discourse-common/lib/get-url";
 import applyRouterHomepageOverrides from "./lib/homepage-router-overrides";
 
-class BareRouter extends EmberRouter {
+class BareRouter extends EmbroiderRouter {
   location = isTesting() ? "none" : "history";
 
   setupRouter() {
diff --git a/app/assets/javascripts/discourse/app/routes/app-route-map.js b/app/assets/javascripts/discourse/app/routes/app-route-map.js
index 96a9017994f..51b5c29f6b3 100644
--- a/app/assets/javascripts/discourse/app/routes/app-route-map.js
+++ b/app/assets/javascripts/discourse/app/routes/app-route-map.js
@@ -276,4 +276,8 @@ export default function () {
   this.route("invites", { resetNamespace: true }, function () {
     this.route("show", { path: "/:token" });
   });
+
+  this.route("wizard", function () {
+    this.route("step", { path: "/steps/:step_id" });
+  });
 }
diff --git a/app/assets/javascripts/wizard/addon/routes/wizard.js b/app/assets/javascripts/discourse/app/routes/wizard.js
similarity index 91%
rename from app/assets/javascripts/wizard/addon/routes/wizard.js
rename to app/assets/javascripts/discourse/app/routes/wizard.js
index c78c766adb5..f32f0409a34 100644
--- a/app/assets/javascripts/wizard/addon/routes/wizard.js
+++ b/app/assets/javascripts/discourse/app/routes/wizard.js
@@ -1,6 +1,6 @@
 import Route from "@ember/routing/route";
 import DisableSidebar from "discourse/mixins/disable-sidebar";
-import Wizard from "wizard/models/wizard";
+import Wizard from "discourse/static/wizard/models/wizard";
 
 export default class WizardRoute extends Route.extend(DisableSidebar) {
   model() {
diff --git a/app/assets/javascripts/wizard/addon/routes/wizard-index.js b/app/assets/javascripts/discourse/app/routes/wizard/index.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/routes/wizard-index.js
rename to app/assets/javascripts/discourse/app/routes/wizard/index.js
diff --git a/app/assets/javascripts/wizard/addon/routes/wizard-step.js b/app/assets/javascripts/discourse/app/routes/wizard/step.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/routes/wizard-step.js
rename to app/assets/javascripts/discourse/app/routes/wizard/step.js
diff --git a/app/assets/javascripts/wizard/addon/components/discourse-logo.gjs b/app/assets/javascripts/discourse/app/static/wizard/components/discourse-logo.gjs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/discourse-logo.gjs
rename to app/assets/javascripts/discourse/app/static/wizard/components/discourse-logo.gjs
diff --git a/app/assets/javascripts/wizard/addon/components/fields/checkbox.hbs b/app/assets/javascripts/discourse/app/static/wizard/components/fields/checkbox.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/checkbox.hbs
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/checkbox.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/fields/checkbox.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/checkbox.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/checkbox.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/checkbox.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/checkboxes.hbs b/app/assets/javascripts/discourse/app/static/wizard/components/fields/checkboxes.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/checkboxes.hbs
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/checkboxes.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/fields/checkboxes.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/checkboxes.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/checkboxes.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/checkboxes.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/dropdown.hbs b/app/assets/javascripts/discourse/app/static/wizard/components/fields/dropdown.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/dropdown.hbs
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/dropdown.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/fields/dropdown.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/dropdown.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/dropdown.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/dropdown.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/image-previews/generic.hbs b/app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/generic.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/image-previews/generic.hbs
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/generic.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/fields/image-previews/generic.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/generic.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/image-previews/generic.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/generic.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/image-previews/index.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/index.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/image-previews/index.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/index.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/image-previews/logo-small.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/logo-small.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/image-previews/logo-small.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/logo-small.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/image-previews/logo.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/logo.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/image-previews/logo.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/image-previews/logo.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/image.hbs b/app/assets/javascripts/discourse/app/static/wizard/components/fields/image.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/image.hbs
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/image.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/fields/image.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/image.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/image.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/image.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/index.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/index.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/index.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/index.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/styling-preview/-homepage-preview.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/-homepage-preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/styling-preview/-homepage-preview.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/-homepage-preview.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/styling-preview/-preview-base.hbs b/app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/-preview-base.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/styling-preview/-preview-base.hbs
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/-preview-base.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/fields/styling-preview/-preview-base.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/-preview-base.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/styling-preview/-preview-base.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/-preview-base.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/styling-preview/index.hbs b/app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/index.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/styling-preview/index.hbs
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/index.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/fields/styling-preview/index.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/index.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/styling-preview/index.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/styling-preview/index.js
diff --git a/app/assets/javascripts/wizard/addon/components/fields/text.hbs b/app/assets/javascripts/discourse/app/static/wizard/components/fields/text.hbs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/text.hbs
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/text.hbs
diff --git a/app/assets/javascripts/wizard/addon/components/fields/text.js b/app/assets/javascripts/discourse/app/static/wizard/components/fields/text.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/fields/text.js
rename to app/assets/javascripts/discourse/app/static/wizard/components/fields/text.js
diff --git a/app/assets/javascripts/wizard/addon/components/wizard-canvas.gjs b/app/assets/javascripts/discourse/app/static/wizard/components/wizard-canvas.gjs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/wizard-canvas.gjs
rename to app/assets/javascripts/discourse/app/static/wizard/components/wizard-canvas.gjs
diff --git a/app/assets/javascripts/wizard/addon/components/wizard-field.gjs b/app/assets/javascripts/discourse/app/static/wizard/components/wizard-field.gjs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/wizard-field.gjs
rename to app/assets/javascripts/discourse/app/static/wizard/components/wizard-field.gjs
diff --git a/app/assets/javascripts/wizard/addon/components/wizard-step.gjs b/app/assets/javascripts/discourse/app/static/wizard/components/wizard-step.gjs
similarity index 100%
rename from app/assets/javascripts/wizard/addon/components/wizard-step.gjs
rename to app/assets/javascripts/discourse/app/static/wizard/components/wizard-step.gjs
diff --git a/app/assets/javascripts/wizard/addon/lib/preview.js b/app/assets/javascripts/discourse/app/static/wizard/lib/preview.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/lib/preview.js
rename to app/assets/javascripts/discourse/app/static/wizard/lib/preview.js
diff --git a/app/assets/javascripts/wizard/addon/models/wizard.js b/app/assets/javascripts/discourse/app/static/wizard/models/wizard.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/models/wizard.js
rename to app/assets/javascripts/discourse/app/static/wizard/models/wizard.js
diff --git a/app/assets/javascripts/wizard/addon/templates/wizard.gjs b/app/assets/javascripts/discourse/app/templates/wizard.gjs
similarity index 78%
rename from app/assets/javascripts/wizard/addon/templates/wizard.gjs
rename to app/assets/javascripts/discourse/app/templates/wizard.gjs
index 1b35aa10bc2..80dc4d944f4 100644
--- a/app/assets/javascripts/wizard/addon/templates/wizard.gjs
+++ b/app/assets/javascripts/discourse/app/templates/wizard.gjs
@@ -1,6 +1,6 @@
 import RouteTemplate from "ember-route-template";
 import hideApplicationFooter from "discourse/helpers/hide-application-footer";
-import DiscourseLogo from "../components/discourse-logo";
+import DiscourseLogo from "discourse/static/wizard/components/discourse-logo";
 
 export default RouteTemplate(<template>
   {{hideApplicationFooter}}
diff --git a/app/assets/javascripts/wizard/addon/templates/step.gjs b/app/assets/javascripts/discourse/app/templates/wizard/step.gjs
similarity index 89%
rename from app/assets/javascripts/wizard/addon/templates/step.gjs
rename to app/assets/javascripts/discourse/app/templates/wizard/step.gjs
index 4c2051ac829..cee1413f21b 100644
--- a/app/assets/javascripts/wizard/addon/templates/step.gjs
+++ b/app/assets/javascripts/discourse/app/templates/wizard/step.gjs
@@ -2,9 +2,9 @@ import Component from "@glimmer/component";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import RouteTemplate from "ember-route-template";
+import WizardCanvas from "discourse/static/wizard/components/wizard-canvas";
+import WizardStep from "discourse/static/wizard/components/wizard-step";
 import getUrl from "discourse-common/lib/get-url";
-import WizardCanvas from "../components/wizard-canvas";
-import WizardStep from "../components/wizard-step";
 
 export default RouteTemplate(
   class extends Component {
diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js
index 1718aedfad3..15da1446952 100644
--- a/app/assets/javascripts/discourse/ember-cli-build.js
+++ b/app/assets/javascripts/discourse/ember-cli-build.js
@@ -122,8 +122,6 @@ module.exports = function (defaults) {
 
   const adminTree = app.project.findAddonByName("admin").treeForAddonBundle();
 
-  const wizardTree = app.project.findAddonByName("wizard").treeForAddonBundle();
-
   const testStylesheetTree = mergeTrees([
     discourseScss(`${discourseRoot}/app/assets/stylesheets`, "qunit.scss"),
     discourseScss(
@@ -147,12 +145,6 @@ module.exports = function (defaults) {
         outputFile: `assets/admin.js`,
       })
     ),
-    applyTerser(
-      concat(wizardTree, {
-        inputFiles: ["**/*.js"],
-        outputFile: `assets/wizard.js`,
-      })
-    ),
     applyTerser(generateScriptsTree(app)),
     applyTerser(discoursePluginsTree),
     testStylesheetTree,
@@ -166,6 +158,7 @@ module.exports = function (defaults) {
     .slice(0, 8);
 
   const appTree = compatBuild(app, Webpack, {
+    splitAtRoutes: ["wizard"],
     staticAppPaths: ["static"],
     packagerOptions: {
       webpackConfig: {
@@ -195,7 +188,6 @@ module.exports = function (defaults) {
               // TODO: delete special case for jquery when removing app.import() above
               ((EMBER_MAJOR_VERSION < 4 && request === "jquery") ||
                 request.startsWith("admin/") ||
-                request.startsWith("wizard/") ||
                 request.startsWith("discourse/plugins/") ||
                 request.startsWith("discourse/theme-"))
             ) {
diff --git a/app/assets/javascripts/discourse/package.json b/app/assets/javascripts/discourse/package.json
index 51ee2600a83..bc3ea4ba4bd 100644
--- a/app/assets/javascripts/discourse/package.json
+++ b/app/assets/javascripts/discourse/package.json
@@ -41,6 +41,7 @@
     "@embroider/compat": "^3.4.2",
     "@embroider/core": "^3.4.3",
     "@embroider/macros": "^1.13.1",
+    "@embroider/router": "^2.1.4",
     "@embroider/webpack": "^3.2.1",
     "@floating-ui/dom": "^1.5.0",
     "@glimmer/component": "^1.1.2",
@@ -133,7 +134,6 @@
     "virtual-dom": "^2.1.1",
     "webpack": "^5.89.0",
     "webpack-stats-plugin": "^1.1.3",
-    "wizard": "1.0.0",
     "workbox-cacheable-response": "^7.0.0",
     "workbox-core": "^7.0.0",
     "workbox-expiration": "^7.0.0",
diff --git a/app/assets/javascripts/wizard/addon/test-helpers/wizard-pretender.js b/app/assets/javascripts/discourse/tests/helpers/wizard-pretender.js
similarity index 100%
rename from app/assets/javascripts/wizard/addon/test-helpers/wizard-pretender.js
rename to app/assets/javascripts/discourse/tests/helpers/wizard-pretender.js
diff --git a/app/assets/javascripts/discourse/tests/index.html b/app/assets/javascripts/discourse/tests/index.html
index 0d3195c65d5..ae195159535 100644
--- a/app/assets/javascripts/discourse/tests/index.html
+++ b/app/assets/javascripts/discourse/tests/index.html
@@ -57,7 +57,6 @@
     <script src="{{rootURL}}assets/test-i18n.js" data-embroider-ignore></script>
     <script src="{{rootURL}}assets/test-site-settings.js" data-embroider-ignore></script>
     <script src="{{rootURL}}assets/admin.js" data-embroider-ignore></script>
-    <script src="{{rootURL}}assets/wizard.js" data-embroider-ignore></script>
 
     <template id="dynamic-test-js">
       {{content-for "test-plugin-css"}}
diff --git a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
index 0f0d2121a6d..09dacc57e23 100644
--- a/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/ember/resolver-test.js
@@ -598,96 +598,6 @@ module("Unit | Ember | resolver", function (hooks) {
     );
   });
 
-  test("resolves templates with 'wizard' prefix", function (assert) {
-    setTemplates([
-      "wizard/templates/foo",
-      "discourse/templates/wizard_bar",
-      "discourse/templates/wizard.bar",
-      "wizard/templates/bar",
-      "wizard/templates/dashboard_general",
-      "discourse/templates/wizard-baz-qux",
-      "javascripts/wizard/plugin-template",
-    ]);
-
-    // Switches prefix to wizard/templates when underscored
-    lookupTemplate(
-      assert,
-      "template:wizard_foo",
-      "wizard/templates/foo",
-      "when prefix is separated by underscore"
-    );
-
-    // Switches prefix to wizard/templates when dotted
-    lookupTemplate(
-      assert,
-      "template:wizard.foo",
-      "wizard/templates/foo",
-      "when prefix is separated by dot"
-    );
-
-    // Doesn't match unseparated prefix
-    lookupTemplate(
-      assert,
-      "template:wizardfoo",
-      undefined,
-      "but not when prefix is not separated in any way"
-    );
-
-    // Prioritized the default match when underscored
-    lookupTemplate(
-      assert,
-      "template:wizard_bar",
-      "discourse/templates/wizard_bar",
-      "but not when template with the exact underscored name exists"
-    );
-
-    // Prioritized the default match when dotted
-    lookupTemplate(
-      assert,
-      "template:wizard.bar",
-      "discourse/templates/wizard.bar",
-      "but not when template with the exact dotted name exists"
-    );
-
-    lookupTemplate(
-      assert,
-      "template:wizard-dashboard-general",
-      "wizard/templates/dashboard_general",
-      "finds namespaced and underscored version"
-    );
-
-    lookupTemplate(
-      assert,
-      "template:wizard-baz/qux",
-      "discourse/templates/wizard-baz-qux",
-      "also tries dasherized"
-    );
-  });
-
-  test("resolves component templates with 'wizard' prefix to 'wizard/templates/' namespace", function (assert) {
-    setTemplates([
-      "wizard/templates/components/foo",
-      "discourse/templates/components/bar",
-      "wizard/templates/components/bar",
-    ]);
-
-    // Looks for components in wizard/templates
-    lookupTemplate(
-      assert,
-      "template:components/foo",
-      "wizard/templates/components/foo",
-      "uses wizard template component when no standard match"
-    );
-
-    // Prioritized non-wizard component
-    lookupTemplate(
-      assert,
-      "template:components/bar",
-      "discourse/templates/components/bar",
-      "uses standard match when both exist"
-    );
-  });
-
   test("resolves plugin/theme components with and without /index", function (assert) {
     registerTemporaryModule(
       "discourse/plugins/my-fake-plugin/discourse/components/my-component",
diff --git a/app/assets/javascripts/discourse/tests/unit/models/wizard-field-test.js b/app/assets/javascripts/discourse/tests/unit/models/wizard-field-test.js
index f510d4c39f9..93a1b3fb034 100644
--- a/app/assets/javascripts/discourse/tests/unit/models/wizard-field-test.js
+++ b/app/assets/javascripts/discourse/tests/unit/models/wizard-field-test.js
@@ -1,6 +1,6 @@
 import { setupTest } from "ember-qunit";
 import { module, test } from "qunit";
-import { Field } from "wizard/models/wizard";
+import { Field } from "discourse/static/wizard/models/wizard";
 
 module("Unit | Model | Wizard | wizard-field", function (hooks) {
   setupTest(hooks);
diff --git a/app/assets/javascripts/package-ember3.json b/app/assets/javascripts/package-ember3.json
index 4ec33768945..120e173d690 100644
--- a/app/assets/javascripts/package-ember3.json
+++ b/app/assets/javascripts/package-ember3.json
@@ -21,8 +21,7 @@
     "pretty-text",
     "select-kit",
     "theme-transpiler",
-    "truth-helpers",
-    "wizard"
+    "truth-helpers"
   ],
   "resolutions": {
     "**/unset-value": "2.0.1"
diff --git a/app/assets/javascripts/package-ember5.json b/app/assets/javascripts/package-ember5.json
index c02b40db7b2..f3eba3dbc6e 100644
--- a/app/assets/javascripts/package-ember5.json
+++ b/app/assets/javascripts/package-ember5.json
@@ -21,8 +21,7 @@
     "pretty-text",
     "select-kit",
     "theme-transpiler",
-    "truth-helpers",
-    "wizard"
+    "truth-helpers"
   ],
   "resolutions": {
     "**/unset-value": "2.0.1",
diff --git a/app/assets/javascripts/wizard/.npmrc b/app/assets/javascripts/wizard/.npmrc
deleted file mode 100644
index c42da845b44..00000000000
--- a/app/assets/javascripts/wizard/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-engine-strict = true
diff --git a/app/assets/javascripts/wizard/addon/routes/wizard-route-map.js b/app/assets/javascripts/wizard/addon/routes/wizard-route-map.js
deleted file mode 100644
index 62ed3323784..00000000000
--- a/app/assets/javascripts/wizard/addon/routes/wizard-route-map.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default function () {
-  this.route("wizard", function () {
-    this.route("step", { path: "/steps/:step_id" });
-  });
-}
diff --git a/app/assets/javascripts/wizard/app/.gitkeep b/app/assets/javascripts/wizard/app/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/wizard/config/ember-cli-update.json b/app/assets/javascripts/wizard/config/ember-cli-update.json
deleted file mode 100644
index 994928cd9c9..00000000000
--- a/app/assets/javascripts/wizard/config/ember-cli-update.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "schemaVersion": "1.0.0",
-  "packages": [
-    {
-      "name": "ember-cli",
-      "version": "5.0.0",
-      "blueprints": [
-        {
-          "name": "addon",
-          "outputRepo": "https://github.com/ember-cli/ember-addon-output",
-          "codemodsSource": "ember-addon-codemods-manifest@1",
-          "isBaseBlueprint": true,
-          "options": [
-            "--no-welcome"
-          ]
-        }
-      ]
-    }
-  ]
-}
diff --git a/app/assets/javascripts/wizard/ember-cli-build.js b/app/assets/javascripts/wizard/ember-cli-build.js
deleted file mode 100644
index 653ad41e79c..00000000000
--- a/app/assets/javascripts/wizard/ember-cli-build.js
+++ /dev/null
@@ -1,20 +0,0 @@
-"use strict";
-
-const EmberAddon = require("ember-cli/lib/broccoli/ember-addon");
-
-module.exports = function (defaults) {
-  const app = new EmberAddon(defaults, {
-    autoImport: {
-      publicAssetURL: "",
-    },
-  });
-
-  const { maybeEmbroider } = require("@embroider/test-setup");
-  return maybeEmbroider(app, {
-    skipBabel: [
-      {
-        package: "qunit",
-      },
-    ],
-  });
-};
diff --git a/app/assets/javascripts/wizard/index.js b/app/assets/javascripts/wizard/index.js
deleted file mode 100644
index afc67ba45b9..00000000000
--- a/app/assets/javascripts/wizard/index.js
+++ /dev/null
@@ -1,31 +0,0 @@
-"use strict";
-
-const calculateCacheKeyForTree = require("calculate-cache-key-for-tree");
-const path = require("path");
-
-module.exports = {
-  name: require("./package").name,
-
-  // return an empty tree here as we do not want the addon modules to be
-  // included into vendor.js; instead, we will produce a separate bundle
-  // (wizard.js) to be included via a script tag as needed
-  treeForAddon() {
-    return;
-  },
-
-  // custom method to produce the tree for wizard.js
-  // called by ember-cli-build.js in discourse core
-  treeForAddonBundle() {
-    let addonTreePath = path.resolve(this.root, this.treePaths.addon);
-    let addonTree = this.treeGenerator(addonTreePath);
-    return this._super.treeForAddon.call(this, addonTree);
-  },
-
-  cacheKeyForTree(tree) {
-    return calculateCacheKeyForTree(tree, this);
-  },
-
-  isDevelopingAddon() {
-    return true;
-  },
-};
diff --git a/app/assets/javascripts/wizard/package.json b/app/assets/javascripts/wizard/package.json
deleted file mode 100644
index d133e636273..00000000000
--- a/app/assets/javascripts/wizard/package.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "name": "wizard",
-  "version": "1.0.0",
-  "description": "Discourse's setup wizard",
-  "author": "Discourse",
-  "license": "GPL-2.0-only",
-  "keywords": [
-    "ember-addon"
-  ],
-  "scripts": {
-    "build": "ember build",
-    "lint:hbs": "ember-template-lint .",
-    "lint:js": "eslint .",
-    "start": "ember serve"
-  },
-  "dependencies": {
-    "ember-cli-babel": "^8.2.0",
-    "ember-cli-htmlbars": "^6.3.0",
-    "ember-template-imports": "^4.0.0"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.23.6",
-    "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.1.1",
-    "@embroider/test-setup": "^3.0.3",
-    "@glimmer/component": "^1.1.2",
-    "@types/ember": "^4.0.10",
-    "@types/ember__application": "^4.0.10",
-    "@types/ember__array": "^4.0.9",
-    "@types/ember__component": "^4.0.21",
-    "@types/ember__controller": "^4.0.11",
-    "@types/ember__debug": "^4.0.7",
-    "@types/ember__destroyable": "^4.0.4",
-    "@types/ember__engine": "^4.0.10",
-    "@types/ember__error": "^4.0.5",
-    "@types/ember__object": "^4.0.11",
-    "@types/ember__polyfills": "^4.0.5",
-    "@types/ember__routing": "^4.0.19",
-    "@types/ember__runloop": "^4.0.8",
-    "@types/ember__service": "^4.0.8",
-    "@types/ember__string": "^3.0.13",
-    "@types/ember__template": "^4.0.5",
-    "@types/ember__test": "^4.0.5",
-    "@types/ember__utils": "^4.0.6",
-    "@types/jquery": "^3.5.29",
-    "@types/qunit": "^2.19.9",
-    "@types/rsvp": "^4.0.8",
-    "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~5.0.0",
-    "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-sri": "^2.1.1",
-    "ember-cli-terser": "^4.0.2",
-    "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-load-initializers": "^2.1.1",
-    "ember-resolver": "^10.1.1",
-    "ember-source": "~3.28.12",
-    "ember-source-channel-url": "^3.0.0",
-    "loader.js": "^4.7.0",
-    "webpack": "^5.89.0"
-  },
-  "engines": {
-    "node": "16.* || >= 18",
-    "npm": "please-use-yarn",
-    "yarn": ">= 1.21.1"
-  },
-  "ember": {
-    "edition": "default"
-  }
-}
diff --git a/app/assets/javascripts/yarn-ember3.lock b/app/assets/javascripts/yarn-ember3.lock
index d8b678baa01..7a03b23e94d 100644
--- a/app/assets/javascripts/yarn-ember3.lock
+++ b/app/assets/javascripts/yarn-ember3.lock
@@ -1201,6 +1201,16 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.5"
 
+"@ember/test-waiters@^3.0.2":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.1.0.tgz#61399919cbf793978da0b8bfdfdb7bca0cb80e9e"
+  integrity sha512-bb9h95ktG2wKY9+ja1sdsFBdOms2lB19VWs8wmNpzgHv1NCetonBoV5jHBV4DHt0uS1tg9z66cZqhUVlYs96KQ==
+  dependencies:
+    calculate-cache-key-for-tree "^2.0.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-version-checker "^5.1.2"
+    semver "^7.3.5"
+
 "@embroider/addon-shim@^1.0.0", "@embroider/addon-shim@^1.8.3", "@embroider/addon-shim@^1.8.4", "@embroider/addon-shim@^1.8.7":
   version "1.8.7"
   resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.7.tgz#ba2dcb0647ed2cb0c500c835326266b89ceec595"
@@ -1314,6 +1324,14 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
+"@embroider/router@^2.1.4":
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@embroider/router/-/router-2.1.6.tgz#c706794075ecc214fa456ce0131e8be3aab15733"
+  integrity sha512-geEJF0iKpGQ4YcP2oc30BGPgxer7Umeeg/C07m6xe2OYltQxIzSNWm//A7F/ZrwhVwSSai1W7YyFw8r5wS3OsA==
+  dependencies:
+    "@ember/test-waiters" "^3.0.2"
+    "@embroider/addon-shim" "^1.8.7"
+
 "@embroider/shared-internals@2.5.1", "@embroider/shared-internals@^2.0.0", "@embroider/shared-internals@^2.5.1":
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.5.1.tgz#a4d8c057cbff293ef6eb29ee6537f263d206b444"
diff --git a/app/assets/javascripts/yarn-ember5.lock b/app/assets/javascripts/yarn-ember5.lock
index 16bc0ef351b..531603d5936 100644
--- a/app/assets/javascripts/yarn-ember5.lock
+++ b/app/assets/javascripts/yarn-ember5.lock
@@ -1201,6 +1201,16 @@
     ember-cli-version-checker "^5.1.2"
     semver "^7.3.5"
 
+"@ember/test-waiters@^3.0.2":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.1.0.tgz#61399919cbf793978da0b8bfdfdb7bca0cb80e9e"
+  integrity sha512-bb9h95ktG2wKY9+ja1sdsFBdOms2lB19VWs8wmNpzgHv1NCetonBoV5jHBV4DHt0uS1tg9z66cZqhUVlYs96KQ==
+  dependencies:
+    calculate-cache-key-for-tree "^2.0.0"
+    ember-cli-babel "^7.26.6"
+    ember-cli-version-checker "^5.1.2"
+    semver "^7.3.5"
+
 "@embroider/addon-shim@^1.0.0", "@embroider/addon-shim@^1.8.3", "@embroider/addon-shim@^1.8.4", "@embroider/addon-shim@^1.8.7":
   version "1.8.7"
   resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.8.7.tgz#ba2dcb0647ed2cb0c500c835326266b89ceec595"
@@ -1314,6 +1324,14 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
+"@embroider/router@^2.1.4":
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@embroider/router/-/router-2.1.6.tgz#c706794075ecc214fa456ce0131e8be3aab15733"
+  integrity sha512-geEJF0iKpGQ4YcP2oc30BGPgxer7Umeeg/C07m6xe2OYltQxIzSNWm//A7F/ZrwhVwSSai1W7YyFw8r5wS3OsA==
+  dependencies:
+    "@ember/test-waiters" "^3.0.2"
+    "@embroider/addon-shim" "^1.8.7"
+
 "@embroider/shared-internals@2.5.1", "@embroider/shared-internals@^2.0.0", "@embroider/shared-internals@^2.5.1":
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.5.1.tgz#a4d8c057cbff293ef6eb29ee6537f263d206b444"
diff --git a/jsconfig.json b/jsconfig.json
index 39c7aaddc9a..d2677bbdb94 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -18,9 +18,6 @@
       "admin/*": [
         "./app/assets/javascripts/admin/addon/*"
       ],
-      "wizard/*": [
-        "./app/assets/javascripts/wizard/addon/*"
-      ],
       "pretty-text/*": [
         "./app/assets/javascripts/pretty-text/addon/*"
       ],
@@ -79,7 +76,6 @@
     "./app/assets/javascripts/discourse/tests",
     "./app/assets/javascripts/discourse-common/addon",
     "./app/assets/javascripts/admin/addon",
-    "./app/assets/javascripts/wizard/addon",
     "./app/assets/javascripts/pretty-text/addon",
     "./app/assets/javascripts/select-kit/addon",
     "./app/assets/javascripts/float-kit/addon",
diff --git a/spec/integrity/coding_style_spec.rb b/spec/integrity/coding_style_spec.rb
index 7d91c4fbc0c..f22851a4f11 100644
--- a/spec/integrity/coding_style_spec.rb
+++ b/spec/integrity/coding_style_spec.rb
@@ -50,7 +50,6 @@ RSpec.describe "Coding style" do
     {
       "discourse" => "app/assets/javascripts/discourse/app/templates/components",
       "admin" => "app/assets/javascripts/admin/addon/templates/components",
-      "wizard" => "app/assets/javascripts/wizard/addon/templates/components",
       "chat/discourse" => "plugins/chat/assets/javascripts/discourse/templates/components",
       "chat/admin" => "plugins/chat/assets/javascripts/admin/templates/components",
       "styleguide" => "plugins/styleguide/assets/javascripts/discourse/templates/components",