diff --git a/app/views/shipit/merge_status/failure.html.erb b/app/views/shipit/merge_status/failure.html.erb
index dcd0a258e..2fe738881 100644
--- a/app/views/shipit/merge_status/failure.html.erb
+++ b/app/views/shipit/merge_status/failure.html.erb
@@ -15,7 +15,7 @@
   </h4>
   <span class="status-meta">
     <%= link_to @stack.to_param, stack_url(@stack), target: '_blank', rel: 'noopener' %>
-    <strong>master branch is failing!</strong>
+    <strong>main branch is failing!</strong>
   </span>
   <%= render 'commit_count_warning' if display_commit_count_warning?(params[:commits].to_i) %>
 </div>
diff --git a/lib/shipit/stack_commands.rb b/lib/shipit/stack_commands.rb
index 932aced3b..ecc3daf21 100644
--- a/lib/shipit/stack_commands.rb
+++ b/lib/shipit/stack_commands.rb
@@ -106,7 +106,7 @@ def git_cmd_succeeds?(path)
         .success?
     end
 
-    def git_clone(url, path, branch: 'master', **kwargs)
+    def git_clone(url, path, branch: 'main', **kwargs)
       git('clone', '--quiet', *modern_git_args, '--recursive', '--branch', branch, url, path, **kwargs)
     end