diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
index 9d414fc9..48e25e58 100644
--- a/.github/workflows/deploy-production.yml
+++ b/.github/workflows/deploy-production.yml
@@ -2,7 +2,7 @@ name: Deploy To Production
 on:
   push:
     branches:
-      - master
+      - main
 jobs:
   deploy:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index 1326c01b..bf698539 100644
--- a/Makefile
+++ b/Makefile
@@ -62,20 +62,20 @@ html-prod: link-data
 	$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
 
 production_push:
-	cd $(OUTPUTDIR) && git init && git add .
+	cd $(OUTPUTDIR) && git init --initial-branch main && git add .
 	cd $(OUTPUTDIR) && git commit --quiet -m "Initial commit"
 	cd $(OUTPUTDIR) && git remote add origin $(GITHUB_PAGES_REPO)
-	cd $(OUTPUTDIR) && git push origin master --force
+	cd $(OUTPUTDIR) && git push origin main --force
 	echo "Upload complete"
 
 deploy: html-prod production_push
 
 preview_push:
 	cd $(OUTPUTDIR) && echo "preview.pyvideo.org" > CNAME
-	cd $(OUTPUTDIR) && git init && git add .
+	cd $(OUTPUTDIR) && git init --initial-branch main && git add .
 	cd $(OUTPUTDIR) && git commit -m "Initial commit"
 	cd $(OUTPUTDIR) && git remote add origin $(PREVIEW_GITHUB_PAGES_REPO)
-	cd $(OUTPUTDIR) && git push origin master --force
+	cd $(OUTPUTDIR) && git push origin main --force
 	echo "Upload complete"
 
 deploy-preview: html preview_push
diff --git a/content/pages/about.rst b/content/pages/about.rst
index c38f6a67..adb0f07c 100644
--- a/content/pages/about.rst
+++ b/content/pages/about.rst
@@ -42,10 +42,9 @@ PyVideo is maintained by volunteers listed in the `CONTRIBUTORS`_ file.
 Questions or concerns regarding the site can be addressed to
 `https://gitter.im/pyvideo/pyvideo`_.
 
-.. _`CONTRIBUTORS`: https://github.com/pyvideo/pyvideo/blob/master/CONTRIBUTORS.rst
+.. _`CONTRIBUTORS`: https://github.com/pyvideo/pyvideo/blob/main/CONTRIBUTORS.rst
 .. _`https://gitter.im/pyvideo/pyvideo`: https://gitter.im/pyvideo/pyvideo
 .. _`volunteering wiki page`: https://github.com/pyvideo/pyvideo/wiki/How-to-Volunteer
 .. _`Looking to contribute media?`: https://github.com/pyvideo/pyvideo/wiki/How-to-Contribute-Media
 .. _`PyVideo.org`: http://pyvideo.org
 .. _`GitHub.com`: https://github.com/pyvideo/pyvideo
-
diff --git a/themes/pytube-201601/templates/base.html b/themes/pytube-201601/templates/base.html
index df869da4..bc549294 100644
--- a/themes/pytube-201601/templates/base.html
+++ b/themes/pytube-201601/templates/base.html
@@ -121,7 +121,7 @@ <h3 class="text-muted header__title">
     <footer class="footer">
       <p>
         &copy;
-        <a href="https://github.com/pyvideo/pyvideo/blob/master/LICENSE">PyVideo.org</a> |
+        <a href="https://github.com/pyvideo/pyvideo/blob/main/LICENSE">PyVideo.org</a> |
         <a href="https://github.com/pyvideo/data/blob/master/LICENSE">pyvideo/data</a>
       </p>
     </footer>