diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
index f870129..624adae 100644
--- a/.github/workflows/black.yml
+++ b/.github/workflows/black.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
index 97c7dfa..fad8f11 100644
--- a/.github/workflows/flake8.yml
+++ b/.github/workflows/flake8.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
diff --git a/.github/workflows/pyroma.yml b/.github/workflows/pyroma.yml
index bbad3c2..271b834 100644
--- a/.github/workflows/pyroma.yml
+++ b/.github/workflows/pyroma.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -28,7 +28,7 @@ jobs:
 
       # install pyroma
       - name: install pyroma
-        run: pip install pyroma
+        run: pip install pyroma==4.2
 
       # run pyroma
       - name: run pyroma
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index adfbdce..872638d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,15 +8,15 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python: ["3.7"]
-        plone: ["52"]
+        python: ["3.11"]
+        plone: ["60"]
         # exclude:
         #   - python: "3.7"
         #     plone: "51"
     steps:
       - uses: actions/checkout@v1
       - name: Cache eggs
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: eggs
           key: ${{ runner.OS }}-build-python${{ matrix.python }}-${{ matrix.plone }}
diff --git a/.github/workflows/zpretty.yml b/.github/workflows/zpretty.yml
index 180f0e9..99de6a8 100644
--- a/.github/workflows/zpretty.yml
+++ b/.github/workflows/zpretty.yml
@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       # python cache
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
diff --git a/CHANGES.rst b/CHANGES.rst
index 40e9409..3cbaaf9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 2.1.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Plone 6 compatibility.
+  [cekk]
 
 
 2.1.0 (2023-05-31)
diff --git a/constraints_plone60.txt b/constraints_plone60.txt
new file mode 100644
index 0000000..005e694
--- /dev/null
+++ b/constraints_plone60.txt
@@ -0,0 +1 @@
+-c https://dist.plone.org/release/6.0-latest/requirements.txt
diff --git a/constraints_plone61.txt b/constraints_plone61.txt
new file mode 100644
index 0000000..4b1a25e
--- /dev/null
+++ b/constraints_plone61.txt
@@ -0,0 +1 @@
+-c https://dist.plone.org/release/6.1-latest/requirements.txt
diff --git a/requirements.txt b/requirements.txt
index 06390bd..bcb25bb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,2 @@
--c constraints.txt
 setuptools
 zc.buildout
diff --git a/src/redturtle/chefcookie/transformers/transform.py b/src/redturtle/chefcookie/transformers/transform.py
index 9749345..36753b2 100644
--- a/src/redturtle/chefcookie/transformers/transform.py
+++ b/src/redturtle/chefcookie/transformers/transform.py
@@ -12,7 +12,7 @@
 from zope.component import getMultiAdapter
 from zope.component import getUtility
 from zope.component import queryMultiAdapter
-from zope.component.interfaces import ComponentLookupError
+from zope.interface.interfaces import ComponentLookupError
 from zope.interface import implementer
 from zope.interface import Interface
 
diff --git a/test_plone52.cfg b/test_plone52.cfg
index 54cfda0..f8a7c22 100644
--- a/test_plone52.cfg
+++ b/test_plone52.cfg
@@ -9,25 +9,3 @@ update-versions-file = test_plone52.cfg
 
 [versions]
 plone.testing = 7.0.1
-
-# Added by buildout at 2021-12-30 15:58:32.220210
-collective.recipe.vscode = 0.1.7
-flake8 = 3.9.2
-mccabe = 0.6.1
-plone.recipe.codeanalysis = 3.0.1
-pycodestyle = 2.7.0
-pyflakes = 2.3.1
-
-# Required by:
-# redturtle.chefcookie==1.0
-collective.jsconfiguration = 0.1.1
-
-# Required by:
-# redturtle.chefcookie==1.0
-collective.regjsonify = 0.3.0
-
-# Added by buildout at 2022-01-05 09:23:45.884226
-zpretty = 2.1.0
-
-# Added by buildout at 2022-02-02 17:29:45.340786
-zipp = 1.1.1
diff --git a/test_plone60.cfg b/test_plone60.cfg
new file mode 100644
index 0000000..3c739e0
--- /dev/null
+++ b/test_plone60.cfg
@@ -0,0 +1,8 @@
+[buildout]
+
+extends =
+    https://raw.github.com/collective/buildout.plonetest/master/test-6.0.x.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
+    base.cfg
+
+[versions]
diff --git a/test_plone61.cfg b/test_plone61.cfg
new file mode 100644
index 0000000..3da9fdc
--- /dev/null
+++ b/test_plone61.cfg
@@ -0,0 +1,6 @@
+[buildout]
+extends =
+    https://raw.github.com/collective/buildout.plonetest/master/test-6.1.x.cfg
+    https://raw.githubusercontent.com/collective/buildout.plonetest/master/qa.cfg
+    base.cfg
+[versions]