diff --git a/console/app/components/onboarding/yield.hbs b/console/app/components/onboarding/yield.hbs
index f75a6146..af626235 100644
--- a/console/app/components/onboarding/yield.hbs
+++ b/console/app/components/onboarding/yield.hbs
@@ -1,7 +1,9 @@
 <section class="onboarding step-host">
     {{#if this.initialized}}
-        {{#if this.currentComponent}}
-            {{component this.currentComponent context=this.context orchestrator=this.orchestrator brand=@brand}}
+        {{#if this.orchestrator.wrapper}}
+            {{component (lazy-engine-component this.orchestrator.wrapper) currentStepComponent=this.currentComponent context=this.context orchestrator=this.orchestrator brand=@brand}}
+        {{else if this.currentComponent}}
+            {{component (lazy-engine-component this.currentComponent) context=this.context orchestrator=this.orchestrator brand=@brand}}
         {{/if}}
     {{else}}
         <div class="flex items-center justify-center min-h-24">
diff --git a/console/app/services/onboarding-orchestrator.js b/console/app/services/onboarding-orchestrator.js
index b7793b73..df199f6a 100644
--- a/console/app/services/onboarding-orchestrator.js
+++ b/console/app/services/onboarding-orchestrator.js
@@ -7,6 +7,7 @@ export default class OnboardingOrchestratorService extends Service {
     @service onboardingContext;
 
     @tracked flow = null;
+    @tracked wrapper = null;
     @tracked current = null;
     @tracked history = [];
     @tracked sessionId = null;
@@ -15,6 +16,7 @@ export default class OnboardingOrchestratorService extends Service {
         const flow = this.onboardingRegistry.getFlow(flowId ?? this.onboardingRegistry.defaultFlow);
         if (!flow) throw new Error(`Onboarding flow '${flowId}' not found`);
         this.flow = flow;
+        this.wrapper = flow.wrapper || null;
         this.sessionId = opts.sessionId || null;
         this.history = [];
         this.goto(flow.entry);
diff --git a/console/app/templates/onboard.hbs b/console/app/templates/onboard.hbs
index 9ecdc38f..ed203704 100644
--- a/console/app/templates/onboard.hbs
+++ b/console/app/templates/onboard.hbs
@@ -1,6 +1,3 @@
-<div class="flex items-center justify-center h-screen min-h-screen px-4 py-12 bg-gray-50 dark:bg-gray-900 sm:px-6 lg:px-8 overflow-y-scroll">
-    <div class="w-full max-w-md h-screen flex items-center justify-center py-4">
-        {{outlet}}
-    </div>
-    <Spacer @height="300px" />
+<div class="onboard-route-wrapper">
+    {{outlet}}
 </div>
\ No newline at end of file