diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml
index 1e3e067..64c645a 100644
--- a/.forgejo/workflows/check.yml
+++ b/.forgejo/workflows/check.yml
@@ -12,6 +12,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.12.6'
+          python-version: '3.13' 
       - run: pip install -r requirements.txt
       - run: make check
\ No newline at end of file
diff --git a/Makefile b/Makefile
index cc95b6a..4d8df3d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,5 +12,11 @@ setup: ## Create Python virtualenv and install dependencies
 	@if [ ! -d .venv ]; then python3 -m venv .venv; fi
 	@if [ -d .venv ]; then . .venv/bin/activate && pip3 install -r requirements.txt; fi
 
-check: ## Run linter, formatter and typechecks
-	ruff check && ruff format && mypy config/master.cfg
\ No newline at end of file
+check: ## Check linting, formatting and types
+	ruff check
+	ruff format --check
+	mypy config/master.cfg
+
+format: ## Autofix linting and formatting issues
+	ruff check --fix
+	ruff format
\ No newline at end of file
diff --git a/config/master.cfg b/config/master.cfg
index a11d998..b1e1d40 100644
--- a/config/master.cfg
+++ b/config/master.cfg
@@ -1,116 +1,8 @@
 # -*- python -*-
 # ex: set filetype=python:
-
+import importlib
 import os
-
-from buildbot.plugins import *
-
-# This is a sample buildmaster config file. It must be installed as
-# 'master.cfg' in your buildmaster's base directory.
-
-# This is the dictionary that the buildmaster pays attention to. We also use
-# a shorter alias to save typing.
-c = BuildmasterConfig = {}
-
-####### WORKERS
-
-# The 'workers' list defines the set of recognized workers. Each element is
-# a Worker object, specifying a unique worker name and password.  The same
-# worker name and password must be configured on the worker.
-
-c['workers'] = [worker.Worker("example-worker", 'pass')]
-
-if 'BUILDBOT_MQ_URL' in os.environ:
-    c['mq'] = {
-        'type' : 'wamp',
-        'router_url': os.environ['BUILDBOT_MQ_URL'],
-        'realm': os.environ.get('BUILDBOT_MQ_REALM', 'buildbot').decode('utf-8'),
-        'debug' : 'BUILDBOT_MQ_DEBUG' in os.environ,
-        'debug_websockets' : 'BUILDBOT_MQ_DEBUG' in os.environ,
-        'debug_lowlevel' : 'BUILDBOT_MQ_DEBUG' in os.environ,
-    }
-# 'protocols' contains information about protocols which master will use for
-# communicating with workers. You must define at least 'port' option that workers
-# could connect to your master with this protocol.
-# 'port' must match the value configured into the workers (with their
-# --master option)
-c['protocols'] = {'pb': {'port': os.environ.get("BUILDBOT_WORKER_PORT", 9989)}}
-
-####### CHANGESOURCES
-
-# the 'change_source' setting tells the buildmaster how it should find out
-# about source code changes.  Here we point to the buildbot clone of pyflakes.
-
-c['change_source'] = []
-c['change_source'].append(changes.GitPoller(
-        'git://github.com/buildbot/pyflakes.git',
-        workdir='gitpoller-workdir', branch='master',
-        pollInterval=300))
-
-####### SCHEDULERS
-
-# Configure the Schedulers, which decide how to react to incoming changes.  In this
-# case, just kick off a 'runtests' build
-
-c['schedulers'] = []
-c['schedulers'].append(schedulers.SingleBranchScheduler(
-                            name="all",
-                            change_filter=util.ChangeFilter(branch='master'),
-                            treeStableTimer=None,
-                            builderNames=["runtests"]))
-c['schedulers'].append(schedulers.ForceScheduler(
-                            name="force",
-                            builderNames=["runtests"]))
-
-####### BUILDERS
-
-# The 'builders' list defines the Builders, which tell Buildbot how to perform a build:
-# what steps, and which workers can execute them.  Note that any particular build will
-# only take place on one worker.
-
-factory = util.BuildFactory()
-# check out the source
-factory.addStep(steps.Git(repourl='http://github.com/buildbot/pyflakes.git', mode='incremental'))
-# run the tests (note that this will require that 'trial' is installed)
-factory.addStep(steps.ShellCommand(command=["trial", "pyflakes"]))
-
-c['builders'] = []
-c['builders'].append(
-    util.BuilderConfig(name="runtests",
-      workernames=["example-worker"],
-      factory=factory))
-
-####### REPORTER TARGETS
-
-# 'services' is a list of Reporter Targets. The results of each build will be
-# pushed to these targets. buildbot/reporters/*.py has a variety to choose from,
-# like IRC bots.
-
-c['services'] = []
-
-####### PROJECT IDENTITY
-
-# the 'title' string will appear at the top of this buildbot installation's
-# home pages (linked to the 'titleURL').
-
-c['title'] = "Blender"
-c['titleURL'] = "https://blender.org/download"
-
-# the 'buildbotURL' string should point to the location where the buildbot's
-# internal web server is visible. This typically uses the port number set in
-# the 'www' entry below, but with an externally-visible host name which the
-# buildbot cannot figure out without some help.
-
-c['buildbotURL'] = os.environ.get("BUILDBOT_WEB_URL", "http://localhost:8010/")
-
-# minimalistic config to activate new web UI
-c['www'] = dict(port=os.environ.get("BUILDBOT_WEB_PORT", 8010),
-                plugins=dict(waterfall_view={}, console_view={}))
-
-####### DB URL
-
-c['db'] = {
-    # This specifies what database buildbot uses to store its state.  You can leave
-    # this at its default for all but the largest installations.
-    'db_url' : os.environ.get("BUILDBOT_DB_URL", "sqlite://").format(**os.environ),
-}
\ No newline at end of file
+import sys
+import setup
+importlib.reload(setup)
+BuildmasterConfig = setup.setup()
diff --git a/config/setup.py b/config/setup.py
index a4fdb9e..661c973 100644
--- a/config/setup.py
+++ b/config/setup.py
@@ -36,7 +36,7 @@ devops_host_id = os.environ.get("DEVOPS_HOST_ID", default="localhost")
 
 
 def setup() -> Dict[str, Any]:
-    ####### MAIN CONFIGURATION
+    ####### MAIN - configuration
     c = {}
 
     # Change Source