diff --git a/app/views/onboardings/_onboarding_nav.html.erb b/app/views/onboardings/_onboarding_nav.html.erb
index 6e24cc0f..903a0f6b 100644
--- a/app/views/onboardings/_onboarding_nav.html.erb
+++ b/app/views/onboardings/_onboarding_nav.html.erb
@@ -7,6 +7,9 @@
   { name: "Start", path: trial_onboarding_path, is_complete: user.onboarded_at.present?, step_number: 4 },
 ] %>
 
+<%# Don't show last step if self hosted %>
+<% steps.pop if self_hosted? %>
+
 <ul class="hidden md:flex items-center gap-2">
   <% steps.each_with_index do |step, idx| %>
     <li class="flex items-center gap-2 group">
diff --git a/app/views/onboardings/goals.html.erb b/app/views/onboardings/goals.html.erb
index 3d237cbd..62385de5 100644
--- a/app/views/onboardings/goals.html.erb
+++ b/app/views/onboardings/goals.html.erb
@@ -20,9 +20,13 @@
     </div>
 
     <%= form_with model: @user do |form| %>
-      <%= form.hidden_field :redirect_to, value: "trial" %>
+      <%= form.hidden_field :redirect_to, value: self_hosted? ? "home" : "trial" %>
       <%= form.hidden_field :set_onboarding_goals_at, value: Time.current %>
 
+      <% if self_hosted? %>
+        <%= form.hidden_field :onboarded_at, value: Time.current %>
+      <% end %>
+
       <div class="space-y-3">
         <% [
           { icon: "layers", label: "See all my accounts in one piece", value: "unified_accounts" },
diff --git a/app/views/onboardings/show.html.erb b/app/views/onboardings/show.html.erb
index 9a2837e6..f5e5a5f9 100644
--- a/app/views/onboardings/show.html.erb
+++ b/app/views/onboardings/show.html.erb
@@ -1,4 +1,6 @@
-<%= content_for :previous_path, onboarding_path %>
+<%= content_for :prev_nav do  %>
+  <%= image_tag "logomark-color.svg", class: "w-10 h-10" %>
+<% end %>
 
 <%= content_for :header_nav do %>
   <%= render "onboardings/onboarding_nav", user: @user %>