diff --git a/Makefile b/Makefile
index 5ffce16..15637b5 100644
--- a/Makefile
+++ b/Makefile
@@ -17,11 +17,11 @@ PYBIN=${VENV_FOLDER}/bin/
 
 # See https://github.com/plone/code-quality
 # Our configuration is in pyproject.toml.
-CODE_QUALITY_VERSION=2.0.0
+CODE_QUALITY_VERSION=2.1.1
 CURRENT_USER=$$(whoami)
 USER_INFO=$$(id -u ${CURRENT_USER}):$$(id -g ${CURRENT_USER})
-LINT=docker run --user="${USER_INFO}" --rm -v "$(PWD)":/github/workspace plone/code-quality:${CODE_QUALITY_VERSION} check
-FORMAT=docker run --user="$(id -u $(whoami)):$(getent group $(whoami)|cut -d: -f3)" --rm -v "$(PWD)":/github/workspace plone/code-quality:${CODE_QUALITY_VERSION} format
+LINT=docker run --rm -v "$(PWD)":/github/workspace plone/code-quality:${CODE_QUALITY_VERSION} check
+FORMAT=docker run --rm -v "$(PWD)":/github/workspace plone/code-quality:${CODE_QUALITY_VERSION} format
 
 
 all: build
diff --git a/pyproject.toml b/pyproject.toml
index bba906f..4b782a9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,35 +4,9 @@ target-version = ["py310"]
 [tool.isort]
 profile = "black"
 
-[tool.flakeheaven]
-format="grouped"
-max_line_length=88
-show_source=true
-max-complexity=25
-
-[tool.flakeheaven.plugins]
-pycodestyle = ["+*"]
-pyflakes = ["+*"]
-"flake8-*" = ["+*"]
-
-[tool.codespell]
-ignore-words-list = "discreet,succeded"
-skip = "*.po,"
-##
-# Add extra configuration options in .meta.toml:
-#  [pyproject]
-#  codespell_ignores = "foo,bar"
-#  codespell_skip = "*.po,*.map,package-lock.json"
-##
-
 [tool.plone-code-analysis]
 checkers = ["black", "flake8", "isort", "pyroma", "zpretty"]
 formatters = ["black", "isort", "zpretty"]
-paths = "."
-paths_pyroma = "."
-paths_black = "."
-paths_flake8 = "."
-paths_isort = "."
-# paths_pyroma = "."
-paths_zpretty = "."
+paths = "src"
+paths_flake8 = "src"
 
diff --git a/src/training/votable/profiles/default/browserlayer.xml b/src/training/votable/profiles/default/browserlayer.xml
index aac9b7d..3a54d60 100644
--- a/src/training/votable/profiles/default/browserlayer.xml
+++ b/src/training/votable/profiles/default/browserlayer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layers>
   <layer interface="training.votable.interfaces.ITrainingVotableLayer"
          name="training.votable"
diff --git a/src/training/votable/profiles/default/catalog.xml b/src/training/votable/profiles/default/catalog.xml
index 0685c9d..de5f459 100644
--- a/src/training/votable/profiles/default/catalog.xml
+++ b/src/training/votable/profiles/default/catalog.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <object name="portal_catalog">
   <!--<column value="my_meta_column"/>-->
 </object>
diff --git a/src/training/votable/profiles/default/metadata.xml b/src/training/votable/profiles/default/metadata.xml
index cc5032b..0bfdd4f 100644
--- a/src/training/votable/profiles/default/metadata.xml
+++ b/src/training/votable/profiles/default/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <metadata>
   <version>1000</version>
   <dependencies>
diff --git a/src/training/votable/profiles/default/rolemap.xml b/src/training/votable/profiles/default/rolemap.xml
index d81d823..78ee0da 100644
--- a/src/training/votable/profiles/default/rolemap.xml
+++ b/src/training/votable/profiles/default/rolemap.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <rolemap>
   <permissions>
     <!-- -*- extra stuff goes here -*- -->
diff --git a/src/training/votable/profiles/testing/types/Document.xml b/src/training/votable/profiles/testing/types/Document.xml
index 7a22b6e..c1af63a 100644
--- a/src/training/votable/profiles/testing/types/Document.xml
+++ b/src/training/votable/profiles/testing/types/Document.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
         meta_type="Dexterity FTI"
         name="Document"
diff --git a/src/training/votable/profiles/uninstall/browserlayer.xml b/src/training/votable/profiles/uninstall/browserlayer.xml
index 7532789..bcd9c9a 100644
--- a/src/training/votable/profiles/uninstall/browserlayer.xml
+++ b/src/training/votable/profiles/uninstall/browserlayer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <layers>
   <layer name="training.votable"
          remove="true"