diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95deeb9..be6f899 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -162,6 +162,12 @@ jobs:
           - typo3-version: "^11.5"
             php-version: "8.1"
             composer-dependencies: highest
+          - typo3-version: "^12.0"
+            php-version: "8.1"
+            composer-dependencies: lowest
+          - typo3-version: "^12.0"
+            php-version: "8.1"
+            composer-dependencies: highest
   functional-tests:
     name: "Functional tests"
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml
index e8195e9..92362f9 100644
--- a/.github/workflows/predefined.yml
+++ b/.github/workflows/predefined.yml
@@ -211,6 +211,12 @@ jobs:
           - typo3-version: "^11.5"
             php-version: "8.1"
             composer-dependencies: highest
+          - typo3-version: "^12.0"
+            php-version: "8.1"
+            composer-dependencies: lowest
+          - typo3-version: "^12.0"
+            php-version: "8.1"
+            composer-dependencies: highest
   functional-tests:
     name: "Functional tests"
     runs-on: ubuntu-22.04
diff --git a/.gitlab/pipeline/.gitlab-ci.yml b/.gitlab/pipeline/.gitlab-ci.yml
index db73fc9..31feef7 100644
--- a/.gitlab/pipeline/.gitlab-ci.yml
+++ b/.gitlab/pipeline/.gitlab-ci.yml
@@ -32,6 +32,8 @@ include:
   - '/.gitlab/pipeline/jobs/unit-php8.0-v11-lowest.yml'
   - '/.gitlab/pipeline/jobs/unit-php8.1-v11-highest.yml'
   - '/.gitlab/pipeline/jobs/unit-php8.1-v11-lowest.yml'
+  - '/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml'
+  - '/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml'
   - '/.gitlab/pipeline/jobs/xliff-lint.yml'
   - '/.gitlab/pipeline/jobs/yaml-lint.yml'
   - template: Security/License-Scanning.gitlab-ci.yml
diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml b/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml
new file mode 100644
index 0000000..92bdd46
--- /dev/null
+++ b/.gitlab/pipeline/jobs/unit-php8.1-v12-highest.yml
@@ -0,0 +1,10 @@
+unit-php8.1-v12-highest:
+  extends: .default
+  image: php:8.1
+  stage: test
+  needs:
+    - build-composer-dependencies
+    - php-lint-php8.1
+  script:
+    - composer require --no-progress typo3/cms-core:"^12.0"
+    - composer ci:tests:unit
diff --git a/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml b/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml
new file mode 100644
index 0000000..5ee7017
--- /dev/null
+++ b/.gitlab/pipeline/jobs/unit-php8.1-v12-lowest.yml
@@ -0,0 +1,11 @@
+unit-php8.1-v12-lowest:
+  extends: .default
+  image: php:8.1
+  stage: test
+  needs:
+    - build-composer-dependencies
+    - php-lint-php8.1
+  script:
+    - composer require --no-ansi --no-interaction --no-progress --no-install typo3/cms-core:"^12.0"
+    - composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest
+    - composer ci:tests:unit
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 173afb5..d90c78f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Added
 - Harden the GitHub Actions workflows (#649)
-- Add support for TYPO3 12 (#652)
+- Add support for TYPO3 12 (#652, #653)
 - Add `.gitignore` entry for JetBrains Fleet editor (#642)
 
 ### Changed