diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 87b9aabf6..45448ec13 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -36,7 +36,7 @@ assignees: ''
 
 ### Configuration
 
-- Kanboard version: <!-- provide exact version (not master) -->
+- Kanboard version: <!-- provide exact version (not master or main) -->
 - Database type and version:
 - PHP version:
 - OS:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4fc8b3da3..521225a95 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,7 +16,7 @@ jobs:
         id: docker_tag
         run: |
           SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`
-          APP_VERSION="master.${SHORT_SHA}"
+          APP_VERSION="main.${SHORT_SHA}"
           DOCKER_IMAGE=kanboard/kanboard
           DOCKER_VERSION=dev
           if [ "${{ github.event_name }}" = "schedule" ]; then
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 82b56fb8c..bfcaa63ed 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -2,7 +2,7 @@ name: Integration Tests
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   Sqlite:
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 1b9be3cfe..f8bf91b6d 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -2,7 +2,7 @@ name: Linters
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   jshint:
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 4279e853c..a29242dc4 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -2,7 +2,7 @@ name: Unit Tests
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   Sqlite:
diff --git a/Makefile b/Makefile
index f3a0f1ab1..8bbb11ae1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 DOCKER_IMAGE := docker.io/kanboard/kanboard
-DOCKER_TAG := master
+DOCKER_TAG := main
 VERSION := $(shell git rev-parse --short HEAD)
 
 .PHONY: archive test-sqlite test-mysql test-postgres sql \
@@ -46,7 +46,7 @@ docker-images:
 	docker buildx build \
 		--platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 \
 		--file Dockerfile \
-		--build-arg VERSION=master.$(VERSION) \
+		--build-arg VERSION=main.$(VERSION) \
 		--tag $(DOCKER_IMAGE):$(VERSION) \
 		.
 
diff --git a/README.md b/README.md
index a59e90588..447ebe52e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Pull-requests are still accepted as long as the [guidelines](.github/pull_reques
 
 - Official website: <https://kanboard.org/>
 - [List of features](https://kanboard.org/#features)
-- [Change Log](https://github.com/kanboard/kanboard/blob/master/ChangeLog)
+- [Change Log](https://github.com/kanboard/kanboard/blob/main/ChangeLog)
 - [Forum](https://kanboard.discourse.group/)
 - Official documentation: <https://docs.kanboard.org/>
     - [Requirements](https://docs.kanboard.org/en/latest/admin_guide/requirements.html)
@@ -22,4 +22,4 @@ Credits
 
 - Main developer: Frédéric Guillot
 - [Contributors](https://github.com/kanboard/kanboard/graphs/contributors)
-- Distributed under [MIT License](https://github.com/kanboard/kanboard/blob/master/LICENSE)
+- Distributed under [MIT License](https://github.com/kanboard/kanboard/blob/main/LICENSE)
diff --git a/app/Core/Plugin/Version.php b/app/Core/Plugin/Version.php
index ba5e04430..13f720965 100644
--- a/app/Core/Plugin/Version.php
+++ b/app/Core/Plugin/Version.php
@@ -19,7 +19,7 @@ class Version
      */
     public static function isCompatible($pluginCompatibleVersion, $appVersion = APP_VERSION)
     {
-        if (strpos($appVersion, 'master') !== false) {
+        if (strpos($appVersion, 'master') !== false || strpos($appVersion, 'main') !== false) {
             return true;
         }
 
diff --git a/app/functions.php b/app/functions.php
index d6f0c7a33..e5d548ec5 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -197,12 +197,12 @@ function build_app_version($ref, $commit_hash)
     }
 
     if ($commit_hash !== '$Format:%H$') {
-        return 'master.'.$commit_hash;
+        return 'main.'.$commit_hash;
     } else if (file_exists('/version.txt')) {
         return rtrim(file_get_contents('/version.txt'));
     }
 
-    return 'master.unknown_revision';
+    return 'main.unknown_revision';
 }
 
 /**
diff --git a/tests/integration/AppProcedureTest.php b/tests/integration/AppProcedureTest.php
index 2859dfdef..bf11521ae 100644
--- a/tests/integration/AppProcedureTest.php
+++ b/tests/integration/AppProcedureTest.php
@@ -11,7 +11,7 @@ class AppProcedureTest extends BaseProcedureTest
 
     public function testGetVersion()
     {
-        $this->assertEquals('master.unknown_revision', $this->app->getVersion());
+        $this->assertEquals('main.unknown_revision', $this->app->getVersion());
     }
 
     public function testGetApplicationRoles()