diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index be6f899..0a8cd9f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -244,3 +244,9 @@ 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
diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml
index 92362f9..6e2c26b 100644
--- a/.github/workflows/predefined.yml
+++ b/.github/workflows/predefined.yml
@@ -291,3 +291,9 @@ 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
diff --git a/.gitlab/pipeline/.gitlab-ci.yml b/.gitlab/pipeline/.gitlab-ci.yml
index 31feef7..d6b271b 100644
--- a/.gitlab/pipeline/.gitlab-ci.yml
+++ b/.gitlab/pipeline/.gitlab-ci.yml
@@ -18,6 +18,8 @@ include:
   - '/.gitlab/pipeline/jobs/func-php8.0-v11-lowest.yml'
   - '/.gitlab/pipeline/jobs/func-php8.1-v11-highest.yml'
   - '/.gitlab/pipeline/jobs/func-php8.1-v11-lowest.yml'
+  - '/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml'
+  - '/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml'
   - '/.gitlab/pipeline/jobs/javascript-lint.yml'
   - '/.gitlab/pipeline/jobs/json-lint.yml'
   - '/.gitlab/pipeline/jobs/php-copypaste-check.yml'
diff --git a/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml b/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml
new file mode 100644
index 0000000..086d685
--- /dev/null
+++ b/.gitlab/pipeline/jobs/func-php8.1-v12-highest.yml
@@ -0,0 +1,13 @@
+func-php8.1-v11-highest:
+  extends: .default
+  image: php:8.1
+  services:
+    - mariadb:10
+  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
+    - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional
diff --git a/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml b/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml
new file mode 100644
index 0000000..95ad090
--- /dev/null
+++ b/.gitlab/pipeline/jobs/func-php8.1-v12-lowest.yml
@@ -0,0 +1,13 @@
+func-php8.1-v11-lowest:
+  extends: .default
+  image: php:8.1
+  services:
+    - mariadb:10
+  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
+    - wait-for-it mariadb:3306 -t 60 --strict -- composer ci:tests:functional
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d90c78f..99da964 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, #653)
+- Add support for TYPO3 12 (#615, #652, #653)
 - Add `.gitignore` entry for JetBrains Fleet editor (#642)
 
 ### Changed