diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8549d5d9..7cd662c6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,7 +5,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    target-branch: master
+    target-branch: main
     reviewers:
       - stephendolan
 
@@ -13,7 +13,7 @@ updates:
     directory: "/src/browser-app-skeleton"
     schedule:
       interval: daily
-    target-branch: master
+    target-branch: main
     versioning-strategy: increase
     reviewers:
       - stephendolan
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd12fa7d..3f51e10b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: Lucky CLI CI
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
     branches: "*"
 
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index 33a720f0..69dc41fb 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -2,7 +2,7 @@ name: Lucky CLI Weekly CI
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
   schedule:
     - cron: "0 1 * * MON"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c22830a5..d805b2ac 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -52,7 +52,7 @@ already been submitted.
   asking for help. We love helping!
 * Please don't update the Gem version.
 
-[repo]: https://github.com/luckyframework/lucky_cli/tree/master
+[repo]: https://github.com/luckyframework/lucky_cli/
 [fork]: https://help.github.com/articles/fork-a-repo/
 [branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/
 [pr]: https://help.github.com/articles/using-pull-requests/
diff --git a/README.md b/README.md
index 1b65bdcb..ab313783 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Run `which lucky` from the command line to make sure it is installed.
 
 ## API Documentation
 
-[API (master)](https://luckyframework.github.io/lucky_cli/)
+[API (main)](https://luckyframework.github.io/lucky_cli/)
 
 ## Contributing
 
diff --git a/shard.edge.yml b/shard.edge.yml
index efef8375..057f7188 100644
--- a/shard.edge.yml
+++ b/shard.edge.yml
@@ -1,22 +1,22 @@
 dependencies:
   lucky:
     github: luckyframework/lucky
-    branch: master
+    branch: main
   authentic:
     github: luckyframework/authentic
-    branch: master
+    branch: main
   carbon:
     github: luckyframework/carbon
-    branch: master
+    branch: main
   carbon_sendgrid_adapter:
     github: luckyframework/carbon_sendgrid_adapter
-    branch: master
+    branch: main
   lucky_env:
     github: luckyframework/lucky_env
-    branch: master
+    branch: main
   lucky_task:
     github: luckyframework/lucky_task
-    branch: master
+    branch: main
   jwt:
     github: crystal-community/jwt
     branch: master
@@ -24,4 +24,4 @@ dependencies:
 development_dependencies:
   lucky_flow:
     github: luckyframework/lucky_flow
-    branch: master
+    branch: main
diff --git a/shard.override.yml b/shard.override.yml
index d12fb660..43ce942d 100644
--- a/shard.override.yml
+++ b/shard.override.yml
@@ -7,4 +7,4 @@
 dependencies:
   lucky:
     github: luckyframework/lucky
-    branch: master
+    branch: main
diff --git a/spec/integration/deploy_to_heroku_spec.cr b/spec/integration/deploy_to_heroku_spec.cr
index 045211c1..bf0348b7 100644
--- a/spec/integration/deploy_to_heroku_spec.cr
+++ b/spec/integration/deploy_to_heroku_spec.cr
@@ -63,7 +63,7 @@ require "../spec_helper"
       should_run_successfully "heroku addons:create heroku-postgresql:hobby-dev"
       should_run_successfully "git add -A"
       should_run_successfully "git commit -m 'Init'"
-      should_run_successfully "git push heroku master"
+      should_run_successfully "git push heroku main"
       wait_to_boot
     end
   end
diff --git a/src/web_app_skeleton/config/server.cr.ecr b/src/web_app_skeleton/config/server.cr.ecr
index ea98ace1..517aeea7 100644
--- a/src/web_app_skeleton/config/server.cr.ecr
+++ b/src/web_app_skeleton/config/server.cr.ecr
@@ -10,7 +10,7 @@ Lucky::Server.configure do |settings|
     settings.gzip_enabled = true
     # By default certain content types will be gzipped.
     # For a full list look in
-    # https://github.com/luckyframework/lucky/blob/master/src/lucky/server.cr
+    # https://github.com/luckyframework/lucky/blob/main/src/lucky/server.cr
     # To add additional extensions do something like this:
     # settings.gzip_content_types << "content/type"
   else