diff --git a/master/custom/factories.py b/master/custom/factories.py
index 82961471e..25cedeb91 100644
--- a/master/custom/factories.py
+++ b/master/custom/factories.py
@@ -11,7 +11,7 @@
     UploadTestResults,
 )
 
-main_branch_version = "3.11"
+main_branch_version = "3.12"
 CUSTOM_BRANCH_NAME = "custom"
 
 # This (default) timeout is for each individual test file.
@@ -387,8 +387,8 @@ class RHEL7Build(UnixBuild):
     # sub-directories.
     #
     # On Fedora/RHEL specfile, the following directories are used:
-    # /builddir/build/BUILD/Python-3.10: source code
-    # /builddir/build/BUILD/Python-3.10/build/optimized: configure, make, tests
+    # /builddir/build/BUILD/Python-3.11: source code
+    # /builddir/build/BUILD/Python-3.11/build/optimized: configure, make, tests
     build_out_of_tree = True
 
 
@@ -411,7 +411,7 @@ class FedoraStableBuild(RHEL8Build):
     #
     # Try to be as close as possible to the Fedora specfile used to build
     # the RPM package:
-    # https://src.fedoraproject.org/rpms/python3.10/blob/rawhide/f/python3.10.spec
+    # https://src.fedoraproject.org/rpms/python3.11/blob/rawhide/f/python3.11.spec
     configureFlags = RHEL8Build.configureFlags + [
         # Options specific to Fedora
         # FIXME: enable this flag
diff --git a/master/custom/workers.py b/master/custom/workers.py
index 58758d451..aa3ff411f 100644
--- a/master/custom/workers.py
+++ b/master/custom/workers.py
@@ -162,7 +162,7 @@ def get_workers(settings):
         cpw(
             name="edelsohn-aix-ppc64",
             tags=['aix', 'unix', 'ppc64'],
-            branches=['3.8', '3.9', '3.10', '3.x'],
+            branches=['3.8', '3.9', '3.10', '3.11', '3.x'],
             parallel_tests=10,
         ),
         cpw(
@@ -241,18 +241,18 @@ def get_workers(settings):
         cpw(
             name="kulikjak-solaris-sparcv9",
             tags=['solaris', 'unix', 'sparc', 'sparcv9'],
-            branches=['3.9', '3.10', '3.x'],
+            branches=['3.9', '3.10', '3.11', '3.x'],
             parallel_tests=16,
         ),
         cpw(
             name="pablogsal-arch-x86_64",
             tags=['linux', 'unix', 'arch', 'amd64', 'x86-64'],
-            branches=['3.9', '3.10', '3.x'],
+            branches=['3.9', '3.10', '3.11', '3.x'],
         ),
         cpw(
             name="pablogsal-macos-m1",
             tags=['macOS', 'unix', 'arm', 'arm64'],
-            branches=['3.9', '3.10', '3.x'],
+            branches=['3.9', '3.10', '3.11', '3.x'],
             parallel_tests=4,
         ),
         cpw(
diff --git a/master/master.cfg b/master/master.cfg
index 14dc0b23f..ec784edb2 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -117,6 +117,7 @@ c["workers"] = [w.bb_worker for w in WORKERS]
 git_url = str(settings.git_url)
 git_branches = [
     (git_url, "3.x", "main"),
+    (git_url, "3.11", "3.11"),
     (git_url, "3.10", "3.10"),
     (git_url, "3.9", "3.9"),
     (git_url, "3.8", "3.8"),