diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d1de906c4178b3ae0549fb78d9468e2b9cfdc1a..95fc245395cadef8f92eac4be14dd7892b4ea99d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   PYTHONPATH: deps/ldapalchemy
   APT_API_URL: https://packages.cccv.de
   APT_REPO: uffd
-  PYLINT_PIN: pylint~=2.10.0
+  PYLINT_PIN: pylint~=2.16.2
 
 before_script:
   - python3 -V
diff --git a/.pylintrc b/.pylintrc
index 994bce3be05c722c74febaabebc46ac0a79daea9..81bed2e674e41258fee89d77be2453e2ec78378f 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -64,13 +64,14 @@ disable=unused-argument,                # Too many false-positives, we're implem
         too-few-public-methods,         # Too many false-positives
         no-else-return,                 # Personal stylistic preference
         attribute-defined-outside-init, # False-positives with socketserver
-        no-self-use,                    # Too many false-positives
+        superfluous-parens,             # The extra parens we have aid readability
         missing-module-docstring,       # Temporarily disabled
         missing-class-docstring,        # Temporarily disabled
         missing-function-docstring,     # Temporarily disabled
         empty-docstring,                # Temporarily disabled
         consider-using-f-string,        # Temporarily disabled
         line-too-long,                  # Temporarily disabled
+        broad-exception-raised,         # Temporarily disabled
 
 # 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
@@ -385,13 +386,6 @@ max-line-length=160
 # Maximum number of lines in a module.
 max-module-lines=1000
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
-
 # 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
@@ -512,5 +506,5 @@ min-public-methods=2
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception