diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3decd7b3313e717fc059c56438fb2eb4be849756..9810d72f7473a30b3782199a130d33c1e68ad301 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: normal
   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
@@ -13,7 +13,6 @@ before_script:
   - uname -a
   - python3 -m pylint --version
   - python3 -m coverage --version
-  - echo "${CI_COMMIT_TAG}" | grep -qE "v[0-9]+[.][0-9]+[.][0-9]+.*" && export PACKAGE_VERSION="${CI_COMMIT_TAG#v}" || export PACKAGE_VERSION="${CI_COMMIT_SHA}"
 
 .build:
   stage: build
diff --git a/.pylintrc b/.pylintrc
index 86c7c867f74725784ebd9d590e7cfa40074f1982..fae513018db28b8bc3bd3079ce1fefe198a9920e 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -380,13 +380,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
@@ -507,5 +500,5 @@ min-public-methods=2
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtin.BaseException,
+                       builtin.Exception
diff --git a/uffd-ldapd b/uffd-ldapd
index 10fad3f15710aa1224746265e69ae6837004ea30..6beac0bd363d5d598ba057bec8832c5af9cb4912 100755
--- a/uffd-ldapd
+++ b/uffd-ldapd
@@ -326,6 +326,6 @@ def main(socket_address, socket_path, socket_fd, api_url, api_user, api_secret,
 	server.serve_forever()
 
 if __name__ == '__main__':
-	# Pylint does not seem to understand the click's decorators
+	# Pylint does not seem to understand click's decorators
 	# pylint: disable=unexpected-keyword-arg,no-value-for-parameter
 	main(auto_envvar_prefix='SERVER')