diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index 3f22fa5..b368a67 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -2,7 +2,7 @@ name: Sync with private repo
 
 on:
   push:
-    branches: [ master, main, nightly ]
+    branches: [ release, main ]
 
 jobs:
   sync:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 23a429f..d887c00 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,9 @@ name: Run tests
 
 on:
   pull_request:
-    branches: [master]
+    branches: [release, main]
+  push:
+    branches: [release, main]
 
 jobs:
   tests:
diff --git a/README.rst b/README.rst
index 967111d..bbc70fa 100644
--- a/README.rst
+++ b/README.rst
@@ -218,4 +218,4 @@ License
 
 This work is licensed under the terms of the `GNU Affero General Public License (AGPL)`_.
 
-.. _GNU Affero General Public License (AGPL): https://github.com/overhangio/tutor/blob/master/LICENSE.txt
+.. _GNU Affero General Public License (AGPL): https://github.com/overhangio/tutor/blob/release/LICENSE.txt
diff --git a/changelog.d/20241119_123431_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_123431_dawoud.sheraz_branch_rename.md
new file mode 100644
index 0000000..fb6e264
--- /dev/null
+++ b/changelog.d/20241119_123431_dawoud.sheraz_branch_rename.md
@@ -0,0 +1,3 @@
+- 💥[Improvement] Rename Tutor's two branches (by @DawoudSheraz):
+  * Rename **master** to **release**, as this branch runs the latest official Open edX release tag.
+  * Rename **nightly** to **main**, as this branch runs the Open edX master branches, which are the basis for the next Open edX release.
\ No newline at end of file
diff --git a/tutordiscovery/plugin.py b/tutordiscovery/plugin.py
index 5fcdc22..6633d5d 100644
--- a/tutordiscovery/plugin.py
+++ b/tutordiscovery/plugin.py
@@ -10,7 +10,7 @@ from tutor.__about__ import __version_suffix__
 
 from .__about__ import __version__
 
-# Handle version suffix in nightly mode, just like tutor core
+# Handle version suffix in main mode, just like tutor core
 if __version_suffix__:
     __version__ += "-" + __version_suffix__