diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cfd2afd..8af1410 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,9 @@ jobs:
         php-versions:
           - '7.3'
           - '7.4'
+          - '8.0'
+          - '8.1'
+          - '8.2'
         composer-versions:
           - 'v1'
           - 'v2'
@@ -42,7 +45,7 @@ jobs:
     - name: Require Composer@v2
       if: ${{ matrix.composer-versions == 'v2' }}
       run: |
-        composer require "composer/composer:2.0.x-dev" --dev --no-update
+        composer require "composer/composer:^2.0" --dev --no-update
 
     - name: Install
       run: |
diff --git a/.php_cs.dist b/.php-cs-fixer.dist.php
similarity index 98%
rename from .php_cs.dist
rename to .php-cs-fixer.dist.php
index 0f4f89d..c9d1a21 100644
--- a/.php_cs.dist
+++ b/.php-cs-fixer.dist.php
@@ -25,7 +25,7 @@
 LICENSE file that was distributed with this source code.
 EOF;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@PSR2' => true,
diff --git a/composer.json b/composer.json
index c32f68f..23d80d2 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
     "prefer-stable": true,
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.3 || ^8.0",
         "composer-plugin-api": "^1.1 || ^2.0"
     },
     "require-dev": {