diff --git a/.github/workflows/functionaltests.yml b/.github/workflows/functionaltests.yml
index 7632242..2530be7 100644
--- a/.github/workflows/functionaltests.yml
+++ b/.github/workflows/functionaltests.yml
@@ -10,18 +10,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 7.2, 7.3, 7.4, 8.0 ]
-        flow-version: [ 5.3, 6.3, 7.0 ]
+        php-version: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
+        flow-version: [ 5.3, 6.3, 7.3, 8.0 ]
         exclude:
           # Disable Flow 5.3 and 6.3 on PHP 8.0, as only ^7.2 is supported
           - php-version: 8.0
             flow-version: 5.3
           - php-version: 8.0
             flow-version: 6.3
+          - php-version: 8.1
+            flow-version: 5.3
+          - php-version: 8.1
+            flow-version: 6.3
 
           # Disable Flow 7.0 on PHP 7.2, as 7.3 is required
           - php-version: 7.2
-            flow-version: 7.0
+            flow-version: 7.3
+
+          # Disable Flow 8.0 on PHP 7, as 8.0 is required
+          - php-version: 7.2
+            flow-version: 8.0
+          - php-version: 7.3
+            flow-version: 8.0
+          - php-version: 7.4
+            flow-version: 8.0
 
     env:
       APP_ENV: true
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index 47525a7..bd2ed67 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -10,18 +10,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ 7.2, 7.3, 7.4, 8.0 ]
-        flow-version: [ 5.3, 6.3, 7.0 ]
+        php-version: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
+        flow-version: [ 5.3, 6.3, 7.3, 8.0 ]
         exclude:
           # Disable Flow 5.3 and 6.3 on PHP 8.0, as only ^7.2 is supported
           - php-version: 8.0
             flow-version: 5.3
           - php-version: 8.0
             flow-version: 6.3
+          - php-version: 8.1
+            flow-version: 5.3
+          - php-version: 8.1
+            flow-version: 6.3
+
+          # Disable Flow 7.0 on PHP 7.2, as 7.3 is required
+          - php-version: 7.2
+            flow-version: 7.3
 
-            # Disable Flow 7.0 on PHP 7.2, as 7.3 is required
+          # Disable Flow 8.0 on PHP 7, as 8.0 is required
           - php-version: 7.2
-            flow-version: 7.0
+            flow-version: 8.0
+          - php-version: 7.3
+            flow-version: 8.0
+          - php-version: 7.4
+            flow-version: 8.0
 
     env:
       APP_ENV: true
diff --git a/README.md b/README.md
index 7e1af1e..019c24c 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Currently the following Flow versions are supported:
 * `^5.3`
 * `^6.3`
 * `^7.0`
+* `^8.0`
 
 ## Setup
 
diff --git a/composer.json b/composer.json
index dc9d6db..595bcf5 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.2 || ^8.0",
-        "neos/flow": "^5.3 || ^6.3 || ^7.0",
+        "neos/flow": "^5.3 || ^6.3 || ^7.0 || ^8.0",
         "sentry/sdk": "^3.1"
     },
     "autoload": {