diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index cabcd573..7ea3a3ba 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -11,9 +11,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       #//TEMP we need to check only modified files WRT main
-      - name: run pre-commit (all)
+      - name: Install requirements (apt)
         run: |
+          sudo apt-get update
+          sudo apt-get install -y libvirt-dev
+      - name: Install requirements (uv pip)
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
           make venv
+          make install
           make install-pre-commit
+      - name: Run pre-commit (all)
+        run: |
           source .venv/bin/activate
           make pre-commit-run-all
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3b55cc83..abbec409 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 exclude: "dockerfiles|ci_build_images/qpress|cross-reference/crossreference/cr/static/cr/font-awesome"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -28,7 +28,7 @@ repos:
   #     - id: flake8
   #       name: Check python (flake8)
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.32.0
+    rev: v1.35.1
     hooks:
       - id: yamllint
         name: Check yaml files (yamllint)
@@ -53,6 +53,24 @@ repos:
         name: Checks for common misspellings in text files
         entry: codespell
         language: python
+  - repo: https://github.com/PyCQA/pylint.git
+    rev: v3.1.0
+    hooks:
+      - id: pylint
+        name: Check python (pylint)
+        entry: pylint
+        language: system
+        types: [file]
+        files: \.(cfg|py|tac)$
+        # TODO add cross-reference in the future
+        # exclude: ^cross-reference/.*$
+        args:
+          [
+            "--errors-only",
+            "-sn", # Don't display the score
+            "--rcfile=.pylintrc", # Config file
+            "--disable=django-not-configured", # Silence django warning
+          ]
   - repo: local
     hooks:
       - id: docker-hadolint
diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 00000000..f5c1e7cb
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,642 @@
+[MAIN]
+
+# customized disabled
+disable=
+    C0114, # missing-module-docstring
+    C0116, # missing-function-docstring
+    C0103, # invalid-name
+    C0301, # line-too-long
+    W0401, # wildcard-import
+    W0122, # exec-used
+    W1514, # unspecified-encoding
+    E0611, # no-name-in-module
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Clear in-memory caches upon conclusion of linting. Useful if running pylint
+# in a server-like mode.
+clear-cache-post-run=no
+
+# Load and enable all available extensions. Use --list-extensions to see a list
+# all available extensions.
+#enable-all-extensions=
+
+# In error mode, messages with a category besides ERROR or FATAL are
+# suppressed, and no reports are done by default. Error mode is compatible with
+# disabling specific errors.
+; errors-only=true
+
+# Always return a 0 (non-error) status code, even if lint errors are found.
+# This is primarily useful in continuous integration scripts.
+#exit-zero=true
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code.
+extension-pkg-allow-list=
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code. (This is an alternative name to extension-pkg-allow-list
+# for backward compatibility.)
+extension-pkg-whitelist=
+
+# Return non-zero exit code if any of these messages/categories are detected,
+# even if score is above --fail-under value. Syntax same as enable. Messages
+# specified are enabled, while categories only check already-enabled messages.
+fail-on=
+
+# Specify a score threshold under which the program will exit with error.
+fail-under=10
+
+# Interpret the stdin as a python script, whose filename needs to be passed as
+# the module_or_package argument.
+#from-stdin=
+
+# Files or directories to be skipped. They should be base names, not paths.
+ignore=CVS
+
+# Add files or directories matching the regular expressions patterns to the
+# ignore-list. The regex matches against paths and can be in Posix or Windows
+# format. Because '\\' represents the directory delimiter on Windows systems,
+# it can't be used as an escape character.
+ignore-paths=
+
+# Files or directories matching the regular expression patterns are skipped.
+# The regex matches against base names, not paths. The default value ignores
+# Emacs file locks
+ignore-patterns=^\.#
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis). It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use, and will cap the count on Windows to
+# avoid hangs.
+jobs=1
+
+# Control the amount of potential inferred values when inferring a single
+# object. This can help the performance when dealing with large functions or
+# complex, nested conditions.
+limit-inference-results=100
+
+# List of plugins (as comma separated values of python module names) to load,
+# usually to register additional checkers.
+load-plugins=pylint_django
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Minimum Python version to use for version dependent checks. Will default to
+# the version used to run pylint.
+py-version=3.11
+
+# Discover python modules and packages in the file system subtree.
+recursive=no
+
+# Add paths to the list of the source roots. Supports globbing patterns. The
+# source root is an absolute path or a path relative to the current working
+# directory used to determine a package namespace for modules located under the
+# source root.
+source-roots=
+
+# When enabled, pylint would attempt to guess common misconfiguration and emit
+# user-friendly hints instead of false-positive error messages.
+suggestion-mode=yes
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+# In verbose mode, extra non-checker-related info will be displayed.
+#verbose=
+
+
+[BASIC]
+
+# Naming style matching correct argument names.
+argument-naming-style=snake_case
+
+# Regular expression matching correct argument names. Overrides argument-
+# naming-style. If left empty, argument names will be checked with the set
+# naming style.
+#argument-rgx=
+
+# Naming style matching correct attribute names.
+attr-naming-style=snake_case
+
+# Regular expression matching correct attribute names. Overrides attr-naming-
+# style. If left empty, attribute names will be checked with the set naming
+# style.
+#attr-rgx=
+
+# Bad variable names which should always be refused, separated by a comma.
+bad-names=foo,
+          bar,
+          baz,
+          toto,
+          tutu,
+          tata
+
+# Bad variable names regexes, separated by a comma. If names match any regex,
+# they will always be refused
+bad-names-rgxs=
+
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
+
+# Regular expression matching correct class attribute names. Overrides class-
+# attribute-naming-style. If left empty, class attribute names will be checked
+# with the set naming style.
+#class-attribute-rgx=
+
+# Naming style matching correct class constant names.
+class-const-naming-style=UPPER_CASE
+
+# Regular expression matching correct class constant names. Overrides class-
+# const-naming-style. If left empty, class constant names will be checked with
+# the set naming style.
+#class-const-rgx=
+
+# Naming style matching correct class names.
+class-naming-style=PascalCase
+
+# Regular expression matching correct class names. Overrides class-naming-
+# style. If left empty, class names will be checked with the set naming style.
+#class-rgx=
+
+# Naming style matching correct constant names.
+const-naming-style=UPPER_CASE
+
+# Regular expression matching correct constant names. Overrides const-naming-
+# style. If left empty, constant names will be checked with the set naming
+# style.
+#const-rgx=
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming style matching correct function names.
+function-naming-style=snake_case
+
+# Regular expression matching correct function names. Overrides function-
+# naming-style. If left empty, function names will be checked with the set
+# naming style.
+#function-rgx=
+
+# Good variable names which should always be accepted, separated by a comma.
+good-names=i,
+           j,
+           k,
+           ex,
+           Run,
+           _
+
+# Good variable names regexes, separated by a comma. If names match any regex,
+# they will always be accepted
+good-names-rgxs=
+
+# Include a hint for the correct naming format with invalid-name.
+include-naming-hint=no
+
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
+
+# Regular expression matching correct inline iteration names. Overrides
+# inlinevar-naming-style. If left empty, inline iteration names will be checked
+# with the set naming style.
+#inlinevar-rgx=
+
+# Naming style matching correct method names.
+method-naming-style=snake_case
+
+# Regular expression matching correct method names. Overrides method-naming-
+# style. If left empty, method names will be checked with the set naming style.
+#method-rgx=
+
+# Naming style matching correct module names.
+module-naming-style=snake_case
+
+# Regular expression matching correct module names. Overrides module-naming-
+# style. If left empty, module names will be checked with the set naming style.
+#module-rgx=
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+# These decorators are taken in consideration only for invalid-name.
+property-classes=abc.abstractproperty
+
+# Regular expression matching correct type alias names. If left empty, type
+# alias names will be checked with the set naming style.
+#typealias-rgx=
+
+# Regular expression matching correct type variable names. If left empty, type
+# variable names will be checked with the set naming style.
+#typevar-rgx=
+
+# Naming style matching correct variable names.
+variable-naming-style=snake_case
+
+# Regular expression matching correct variable names. Overrides variable-
+# naming-style. If left empty, variable names will be checked with the set
+# naming style.
+#variable-rgx=
+
+
+[CLASSES]
+
+# Warn about protected attribute access inside special methods
+check-protected-access-in-special-methods=no
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+                      __new__,
+                      setUp,
+                      asyncSetUp,
+                      __post_init__
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,_fields,_replace,_source,_make,os._exit
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[DESIGN]
+
+# List of regular expressions of class ancestor names to ignore when counting
+# public methods (see R0903)
+exclude-too-few-public-methods=
+
+# List of qualified class names to ignore when counting class parents (see
+# R0901)
+ignored-parents=
+
+# Maximum number of arguments for function / method.
+max-args=5
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Maximum number of boolean expressions in an if statement (see R0916).
+max-bool-expr=5
+
+# Maximum number of branch for function / method body.
+max-branches=12
+
+# Maximum number of locals for function / method body.
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body.
+max-returns=6
+
+# Maximum number of statements in function / method body.
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when caught.
+overgeneral-exceptions=builtins.BaseException,builtins.Exception
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module.
+max-module-lines=1000
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[IMPORTS]
+
+# List of modules that can be imported at any level, not just the top level
+# one.
+allow-any-import-level=
+
+# Allow explicit reexports by alias from a package __init__.
+allow-reexport-from-package=no
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=true
+
+# Deprecated modules which should not be used, separated by a comma.
+deprecated-modules=
+
+# Output a graph (.gv or any supported image format) of external dependencies
+# to the given file (report RP0402 must not be disabled).
+ext-import-graph=
+
+# Output a graph (.gv or any supported image format) of all (i.e. internal and
+# external) dependencies to the given file (report RP0402 must not be
+# disabled).
+import-graph=
+
+# Output a graph (.gv or any supported image format) of internal dependencies
+# to the given file (report RP0402 must not be disabled).
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+# Couples of modules and preferred modules, separated by a comma.
+preferred-modules=
+
+
+[LOGGING]
+
+# The type of string formatting that logging methods do. `old` means using %
+# formatting, `new` is for `{}` formatting.
+logging-format-style=old
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format.
+logging-modules=logging
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE,
+# UNDEFINED.
+confidence=HIGH,
+           CONTROL_FLOW,
+           INFERENCE,
+           INFERENCE_FAILURE,
+           UNDEFINED
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once). You can also use "--disable=all" to
+# disable everything first and then re-enable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use "--disable=all --enable=classes
+# --disable=W".
+disable=raw-checker-failed,
+        bad-inline-option,
+        locally-disabled,
+        file-ignored,
+        suppressed-message,
+        useless-suppression,
+        deprecated-pragma,
+        use-symbolic-message-instead
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member
+
+
+[METHOD_ARGS]
+
+# List of qualified names (i.e., library.method) which require a timeout
+# parameter e.g. 'requests.api.get,requests.api.post'
+timeout-methods=requests.api.delete,requests.api.get,requests.api.head,requests.api.options,requests.api.patch,requests.api.post,requests.api.put,requests.api.request
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,
+      XXX,
+      TODO
+
+# Regular expression of note tags to take in consideration.
+notes-rgx=
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit,argparse.parse_error
+
+
+[REPORTS]
+
+# Python expression which should return a score less than or equal to 10. You
+# have access to the variables 'fatal', 'error', 'warning', 'refactor',
+# 'convention', and 'info' which contain the number of messages in each
+# category, as well as 'statement' which is the total number of statements
+# analyzed. This score is used by the global evaluation report (RP0004).
+evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10))
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details.
+msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio). You can also give a reporter class, e.g.
+# mypackage.mymodule.MyReporterClass.
+#output-format=
+
+# Tells whether to display a full report or only the messages.
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[SIMILARITIES]
+
+# Comments are removed from the similarity computation
+ignore-comments=yes
+
+# Docstrings are removed from the similarity computation
+ignore-docstrings=yes
+
+# Imports are removed from the similarity computation
+ignore-imports=yes
+
+# Signatures are removed from the similarity computation
+ignore-signatures=yes
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[SPELLING]
+
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
+
+# Spelling dictionary name. No available dictionaries : You need to install
+# both the python package and the system dependency for enchant to work..
+spelling-dict=
+
+# List of comma separated words that should be considered directives if they
+# appear at the beginning of a comment and should not be checked.
+spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy:
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains the private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to the private dictionary (see the
+# --spelling-private-dict-file option) instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[STRING]
+
+# This flag controls whether inconsistent-quotes generates a warning when the
+# character used as a quote delimiter is used inconsistently within a module.
+check-quote-consistency=no
+
+# This flag controls whether the implicit-str-concat should generate a warning
+# on implicit string concatenation in sequences defined over several lines.
+check-str-concat-over-line-jumps=no
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of symbolic message names to ignore for Mixin members.
+ignored-checks-for-mixins=no-member,
+                          not-async-context-manager,
+                          not-context-manager,
+                          attribute-defined-outside-init
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+# Regex pattern to define which classes are considered mixins.
+mixin-class-rgx=.*[Mm]ixin
+
+# List of decorators that change the signature of a decorated function.
+signature-mutators=
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid defining new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of names allowed to shadow builtins
+allowed-redefined-builtins=
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+          _cb
+
+# A regular expression matching the name of dummy variables (i.e. expected to
+# not be used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored.
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
diff --git a/Makefile b/Makefile
index 0e7f4493..38efc096 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,8 @@ venv: ## Create python3 venv if it does not exists
 
 install-pip-packages: ## Install python3 requirements
 	$(info --> Install requirements via `pip`)
-	pip install pip -U
-	pip install wheel
-	pip install -r requirements.txt
+	uv pip install wheel
+	uv pip install -r requirements.txt
 
 install-vlad-bb-fork: ## Install vlad bb fork
 	$(info --> Install vlad's bb fork)
@@ -39,12 +38,12 @@ install-vlad-bb-fork: ## Install vlad bb fork
 	if [[ ! -d $(VENDOR_DIR) ]]; then \
 		git clone --branch grid https://github.com/vladbogo/buildbot $(VENDOR_DIR); \
 	  cd $(VENDOR_DIR)/master && python setup.py bdist_wheel; \
-	  pip install ./dist/*.whl; \
+	  uv pip install ./dist/*.whl; \
 	fi
 
 install-pre-commit: ## Install pre-commit tool
 	$(info --> Install pre-commit tool via `pip`)
-	pip install pre-commit
+	uv pip install pre-commit
 
 pre-commit-run: ## Run pre-commit hooks with $PRE_COMMIT_ARGS default to (diff master...[current_branch])
 	$(info --> run pre-commit on changed files (pre-commit run))
diff --git a/README.md b/README.md
index f7df9787..f647c7b7 100644
--- a/README.md
+++ b/README.md
@@ -10,15 +10,17 @@
 
 [![pre-commit](https://github.com/MariaDB/buildbot/actions/workflows/pre-commit.yml/badge.svg)](https://github.com/MariaDB/buildbot/actions/workflows/pre-commit.yml)
 
-Any code submitted to this project is checked with the
-[pre-commit](https://pre-commit.com/) framework. To make sure that your
-code will pass the checks, you can execute the pre-commit checks locally before
-"git pushing" your code.
+Any code submitted to this project is checked with the [pre-commit](https://pre-commit.com/) framework. To make sure that your code will pass the checks, you can execute the pre-commit checks locally before "git pushing" your code.
 
-Here is how:
+You will need the following:
+
+- uv (see: <https://github.com/astral-sh/uv>)
+- libvirt-dev
+
+Then you should be able to setup your environment with:
 
 ```console
-make venv
+make install
 source .venv/bin/activate
 make install-pre-commit
 make pre-commit-run
diff --git a/master-galera/master.cfg b/master-galera/master.cfg
index 52b7c249..f4f55a6e 100644
--- a/master-galera/master.cfg
+++ b/master-galera/master.cfg
@@ -80,9 +80,6 @@ def upstream_branch_fn(branch):
     )
 
 
-def fnmatch_any(s, list_of_patterns):
-    return any(fnmatch.fnmatch(s, p) for p in list_of_patterns)
-
 
 c["schedulers"] = []
 
diff --git a/master-libvirt/master.cfg b/master-libvirt/master.cfg
index 455cbd28..a1264a24 100644
--- a/master-libvirt/master.cfg
+++ b/master-libvirt/master.cfg
@@ -119,28 +119,11 @@ def getRpmInstallStep():
         command=["./rpm-install.sh"],
     )
 
-
 def getDebGaleraStep(port):
     def if_run_galera_test(step):
         if step.getProperty("sst_mode") == "off":
             return False
         return True
-        if not branch_is_10_1_or_later(step):
-            return False
-        if step.getProperty("branch") == "bb-10.2-compatibility":
-            return False
-        if sst_mode == "xtrabackup-v2":
-            if branch_is_10_3_or_later(step):
-                return (
-                    False  # because of "The redo log was created with MariaDB 10.3.6"
-                )
-            if branch_is_10_2_or_later(step):
-                return False  # because of MDEV-12289, this might be fixable
-            if arch not in ["x86", "i386", "amd64", "x86_64"]:
-                return False  # no xtrabackup for other architectures
-            if arch in ["x86", "i386"] and version_name in ["artful", "stretch"]:
-                return False  # no 32-bit debs for ubuntu stable and debian 9
-        return True
 
     return Test(
         name="galera",
@@ -253,7 +236,6 @@ f_deb_install = util.BuildFactory()
 f_deb_install.addStep(getScript("deb-install.sh"))
 f_deb_install.addStep(getDebInstallStep())
 f_deb_install.addStep(getScript("deb-galera.sh"))
-f_deb_install.addStep(getDebGaleraStep("2223"))
 
 ## f_deb_upgrade
 f_deb_upgrade = util.BuildFactory()
diff --git a/master-web/master.cfg b/master-web/master.cfg
index 68685760..5243504d 100644
--- a/master-web/master.cfg
+++ b/master-web/master.cfg
@@ -1,6 +1,14 @@
 # -*- python -*-
 # ex: set filetype=python:
 
+from __future__ import absolute_import
+from __future__ import print_function
+
+import os
+import sys
+import time
+import requests
+
 from buildbot.plugins import *
 from buildbot.process.properties import Property, Properties
 from buildbot.steps.shell import ShellCommand, Compile, Test, SetPropertyFromCommand
@@ -8,11 +16,13 @@ from buildbot.steps.mtrlogobserver import MTR, MtrLogObserver
 from buildbot.steps.source.github import GitHub
 from buildbot.process.remotecommand import RemoteCommand
 from twisted.internet import defer
-import os
-import sys
-import docker
 from datetime import timedelta
 
+from flask import Flask
+from flask import render_template
+
+from buildbot.process.results import statusToString
+
 sys.setrecursionlimit(10000)
 
 sys.path.append(os.getcwd() + "/..")
@@ -49,7 +59,28 @@ c["www"]["auth"] = util.GitHubAuth(
 )
 
 # Sponsor plugin
-exec(open("../sponsor.py").read())
+sponsorapp = Flask('Sponsors', root_path=os.path.dirname(__file__))
+# this allows to work on the template without having to restart Buildbot
+sponsorapp.config['TEMPLATES_AUTO_RELOAD'] = True
+
+
+@sponsorapp.route("/index.html")
+def main():
+    # sponsor.html is a template inside the template directory
+    return render_template('sponsor.html')
+
+c['www']['plugins']['wsgi_dashboards'] = [  # This is a list of dashboards, you can create several
+    {
+        'name': 'sponsor',  # as used in URLs
+        'caption': 'Sponsors',  # Title displayed in the UI'
+        'app': sponsorapp,
+        # priority of the dashboard in the left menu (lower is higher in the
+        # menu)
+        'order': 20,
+        # available icon list can be found at http://fontawesome.io/icons/
+        'icon': 'share-alt-square'
+    }
+]
 
 ####### DB URL
 c["db"] = {"db_url": config["private"]["db_url"]}
diff --git a/requirements.txt b/requirements.txt
index 0e3841e6..8fad62f9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,6 @@ python-dotenv
 pyzabbix
 sqlalchemy==1.3.23
 treq
+pylint
+pylint-django
+django
diff --git a/sponsor.py b/sponsor.py
deleted file mode 100644
index abb7c37a..00000000
--- a/sponsor.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- python -*-
-# ex: set filetype=python:
-
-from __future__ import absolute_import
-from __future__ import print_function
-
-import os
-import time
-
-import requests
-from flask import Flask
-from flask import render_template
-
-from buildbot.process.results import statusToString
-
-sponsorapp = Flask('test', root_path=os.path.dirname(__file__))
-# this allows to work on the template without having to restart Buildbot
-sponsorapp.config['TEMPLATES_AUTO_RELOAD'] = True
-
-
-@sponsorapp.route("/index.html")
-def main():
-    # sponsor.html is a template inside the template directory
-    return render_template('sponsor.html')
-
-# Here we assume c['www']['plugins'] has already be created earlier.
-# Please see the web server documentation to understand how to configure
-# the other parts.
-c['www']['plugins']['wsgi_dashboards'] = [  # This is a list of dashboards, you can create several
-    {
-        'name': 'sponsor',  # as used in URLs
-        'caption': 'Sponsors',  # Title displayed in the UI'
-        'app': sponsorapp,
-        # priority of the dashboard in the left menu (lower is higher in the
-        # menu)
-        'order': 20,
-        # available icon list can be found at http://fontawesome.io/icons/
-        'icon': 'share-alt-square'
-    }
-]
diff --git a/utilities.py b/utilities.py
index d3d1d489..53e04aa9 100644
--- a/utilities.py
+++ b/utilities.py
@@ -1,3 +1,6 @@
+from buildbot.plugins import *
+from buildbot.steps.shell import ShellCommand
+
 # This file is for storing all utility functions used within buildbot's master.cfg
 # The goal is to clean up the master.cfg such that only basic declarative logic is
 # needed in master.cfg
diff --git a/utils.py b/utils.py
index 2861fd71..276aa3cc 100644
--- a/utils.py
+++ b/utils.py
@@ -101,15 +101,7 @@ def createWorker(
         dockerfile_str = open("dockerfiles/" + dockerfile).read()
         image_str = None
         need_pull = False
-    if (
-        "rhel" in worker_type
-        and dockerfile_str is not None
-        and not "download" in dockerfile
-    ):
-        dockerfile_str = dockerfile_str % (
-            private_config["private"]["rhel_sub"]["user"],
-            config["private"]["rhel_sub"]["password"],
-        )
+
     worker_instance = worker.DockerLatentWorker(
         name + worker_name_suffix,
         None,
@@ -280,20 +272,6 @@ def nextBuild(bldr, requests):
     return requests[0]
 
 
-@defer.inlineCallbacks
-def shell(command, worker, builder):
-    args = {
-        "command": command,
-        "logEnviron": False,
-        "workdir": "/srv/buildbot/worker",
-        "want_stdout": False,
-        "want_stderr": False,
-    }
-    cmd = RemoteCommand("shell", args, stdioLogName=None)
-    cmd.worker = worker
-    yield cmd.run(FakeStep(), worker.conn, builder.name)
-    return cmd.rc
-
 
 def canStartBuild(builder, wfb, request):
     worker = wfb.worker