diff --git a/app/models/onboarding_scenarios/beest.rb b/app/models/onboarding_scenarios/beest.rb
index 5678b1cd..8fa5e34a 100644
--- a/app/models/onboarding_scenarios/beest.rb
+++ b/app/models/onboarding_scenarios/beest.rb
@@ -6,9 +6,11 @@ def title = "Welcome to Hack Club Beest"
 
     def form_fields = [ :first_name, :last_name, :primary_email, :birthday, :country ]
 
-    def slack_user_type = :multi_channel_guest
+    def slack_user_type = :full_member
 
-    def slack_channels = chans(:beest, :beest_bulletin, :beest_help, :welcome_to_hack_club, :help)
+    def slack_channels = chans(:beest, :beest_bulletin, :beest_help, :identity_help, :help, :welcome_to_hack_club, :slack_guide, :library, :lounge, :welcome, :happenings, :community, :announcements, :news_wire)
+
+    def first_step = :welcome
 
     def slack_onboarding_flow = :internal_tutorial
 
diff --git a/app/models/onboarding_scenarios/horizons.rb b/app/models/onboarding_scenarios/horizons.rb
index 8b6bfa8e..c2481da1 100644
--- a/app/models/onboarding_scenarios/horizons.rb
+++ b/app/models/onboarding_scenarios/horizons.rb
@@ -6,9 +6,11 @@ def title = "Welcome to Horizons!"
 
     def form_fields = [ :first_name, :last_name, :primary_email, :birthday, :country ]
 
-    def slack_user_type = :multi_channel_guest
+    def slack_user_type = :full_member
 
-    def slack_channels = chans(:horizons, :horizons_help, :horizons_bulletin, :welcome_to_hack_club)
+    def slack_channels = chans(:horizons, :horizons_help, :horizons_bulletin, :identity_help, :help, :welcome_to_hack_club, :slack_guide, :library, :lounge, :welcome, :happenings, :community, :announcements, :news_wire)
+
+    def first_step = :welcome
 
     def slack_onboarding_flow = :internal_tutorial
 
@@ -21,7 +23,6 @@ def card_attributes = { wide_logo: true }
 
     def dialogue_flow
       {
-        intro: { template: "tutorial/horizons/intro", next: :welcome },
         welcome: { template: "tutorial/horizons/03_welcome", next: nil },
         horizons_arcana: { template: "tutorial/horizons/04a_arcana", next: nil },
         horizons_sol: { template: "tutorial/horizons/04b_sol", next: nil },
diff --git a/app/models/onboarding_scenarios/macondo.rb b/app/models/onboarding_scenarios/macondo.rb
index 7f86514f..8c52311d 100644
--- a/app/models/onboarding_scenarios/macondo.rb
+++ b/app/models/onboarding_scenarios/macondo.rb
@@ -6,8 +6,12 @@ def title = "time to go on an adventure!"
 
     def form_fields = [ :first_name, :last_name, :primary_email, :birthday, :country ]
 
+    def slack_user_type = :full_member
+
     def slack_onboarding_flow = :internal_tutorial
-    def slack_channels = chans(:macondo, :macondo_help, :macondo_announcements, :welcome_to_hack_club)
+    def slack_channels = chans(:macondo, :macondo_help, :macondo_announcements, :identity_help, :help, :welcome_to_hack_club, :slack_guide, :library, :lounge, :welcome, :happenings, :community, :announcements, :news_wire)
+
+    def first_step = :welcome
 
     def next_action = :home
 
diff --git a/app/views/slack/tutorial/horizons/03_welcome.slack_message.slocks b/app/views/slack/tutorial/horizons/03_welcome.slack_message.slocks
index 53ae1577..11cb5d09 100644
--- a/app/views/slack/tutorial/horizons/03_welcome.slack_message.slocks
+++ b/app/views/slack/tutorial/horizons/03_welcome.slack_message.slocks
@@ -23,9 +23,9 @@ when 0
   header "🎉 welcome in!"
 
   section <<~TEXT, markdown: true
-    Great! The Code of Conduct is enforced by the Fire Department. DM <@U07K4TS9HQE> if you ever have a concern.
+    You're in! All channels are open to you, reload Slack to see them.
 
-    You now have access to all channels! Reload Slack to see them.
+    We take our <https://hackclub.com/conduct|Code of Conduct> seriously, it's enforced by the Fire Department. DM <@U07K4TS9HQE> if you ever have a concern.
 
     Visit <##{chan_welcome}> for questions, advice, or just to introduce yourself!
 
@@ -40,6 +40,12 @@ when 0
     **Horizons is a series of hackathons being run all around the world. Our flagship event is Horizons Nexus, but we have a selection of subevents around the world that you can join.
   TEXT
 
+  actions [
+    button("I'll follow the CoC!", "tutorial_agree", style: "primary")
+  ]
+
+  divider
+
   section "? Click a button below to be added!", markdown: true
 
   actions [