diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27cc5d8..fa172f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,10 @@ jobs:
           path: /tmp/composer-cache
           key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
 
-      - uses: php-actions/composer@v5
+      - name: Install dependencies
+        uses: php-actions/composer@v6
+        with:
+          php_version: '8.1'
 
       - name: Archive build
         run: mkdir /tmp/github-actions/ && tar -cvf /tmp/github-actions/build.tar ./
@@ -40,9 +43,9 @@ jobs:
         run: tar -xvf /tmp/github-actions/build.tar ./
 
       - name: PHP Unit tests
-        uses: php-actions/phpunit@v2
+        uses: php-actions/phpunit@v3
         with:
-          php_version: 8.0
+          php_version: '8.1'
           php_extensions: xdebug
           configuration: test/phpunit/phpunit.xml
           bootstrap: vendor/autoload.php
@@ -61,6 +64,7 @@ jobs:
         run: tar -xvf /tmp/github-actions/build.tar ./
 
       - name: PHP Static Analysis
-        uses: php-actions/phpstan@v2
+        uses: php-actions/phpstan@v3
         with:
-          path: src/
\ No newline at end of file
+          php_version: '8.1'
+          path: src/
diff --git a/composer.json b/composer.json
index cd3a9be..ff0ea9d 100644
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,8 @@
 	"license": "MIT",
 
 	"require": {
-		"php": ">=7.4",
-		"phpgt/dom": "^3.0.0",
+		"php": ">=8.1",
+		"phpgt/dom": "^4.0.0",
 		"phpgt/session": "1.*"
 	},
 	"require-dev": {
diff --git a/composer.lock b/composer.lock
index 9cd60ae..af0d78c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e00f4a37320fe6821e02fae298b0c67f",
+    "content-hash": "664e3f8865f19ea24ce519628cc6d6d5",
     "packages": [
         {
             "name": "phpgt/cssxpath",
@@ -62,30 +62,30 @@
         },
         {
             "name": "phpgt/dom",
-            "version": "v3.0.3",
+            "version": "v4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PhpGt/Dom.git",
-                "reference": "234c3f2b2b482c046d0317467d53d1d90960193d"
+                "reference": "e27378f0fefe1952353fcd082e4189243ebfcfee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PhpGt/Dom/zipball/234c3f2b2b482c046d0317467d53d1d90960193d",
-                "reference": "234c3f2b2b482c046d0317467d53d1d90960193d",
+                "url": "https://api.github.com/repos/PhpGt/Dom/zipball/e27378f0fefe1952353fcd082e4189243ebfcfee",
+                "reference": "e27378f0fefe1952353fcd082e4189243ebfcfee",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
-                "php": ">=8.0",
+                "php": ">=8.1",
                 "phpgt/cssxpath": "^1.1",
                 "phpgt/propfunc": "^1.0",
                 "psr/http-message": "^1.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.4",
-                "phpunit/phpunit": "^9.5"
+                "phpstan/phpstan": "v1.8.0",
+                "phpunit/phpunit": "v9.5.21"
             },
             "type": "library",
             "autoload": {
@@ -148,7 +148,7 @@
             "description": "The modern DOM API for PHP projects.",
             "support": {
                 "issues": "https://github.com/PhpGt/Dom/issues",
-                "source": "https://github.com/PhpGt/Dom/tree/v3.0.3"
+                "source": "https://github.com/PhpGt/Dom/tree/v4.0.0"
             },
             "funding": [
                 {
@@ -156,7 +156,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-26T14:23:56+00:00"
+            "time": "2022-07-01T11:24:27+00:00"
         },
         {
             "name": "phpgt/propfunc",
@@ -2440,7 +2440,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.4"
+        "php": ">=8.1"
     },
     "platform-dev": [],
     "plugin-api-version": "2.2.0"
diff --git a/test/phpunit/ArrayTokenStoreTest.php b/test/phpunit/ArrayTokenStoreTest.php
index a46d0de..7c671a1 100644
--- a/test/phpunit/ArrayTokenStoreTest.php
+++ b/test/phpunit/ArrayTokenStoreTest.php
@@ -1,7 +1,8 @@
 <?php
-namespace Gt\Csrf;
+namespace Gt\Csrf\Test;
 
 use Exception;
+use Gt\Csrf\ArrayTokenStore;
 use Gt\Csrf\Exception\CsrfTokenInvalidException;
 use Gt\Csrf\Exception\CsrfTokenSpentException;
 use PHPUnit\Framework\TestCase;
@@ -90,4 +91,4 @@ public function testChangeTokenLimit() {
 		$this->expectException(CSRFTokenInvalidException::class);
 		$sut->verifyToken($firstToken);
 	}
-}
\ No newline at end of file
+}
diff --git a/test/phpunit/HTMLDocumentProtectorTest.php b/test/phpunit/HTMLDocumentProtectorTest.php
index 6b03b5e..300fffd 100644
--- a/test/phpunit/HTMLDocumentProtectorTest.php
+++ b/test/phpunit/HTMLDocumentProtectorTest.php
@@ -1,6 +1,8 @@
 <?php
-namespace Gt\Csrf;
+namespace Gt\Csrf\Test;
 
+use Gt\Csrf\ArrayTokenStore;
+use Gt\Csrf\HTMLDocumentProtector;
 use Gt\Dom\HTMLDocument;
 use PHPUnit\Framework\TestCase;
 
diff --git a/test/phpunit/TokenStoreTest.php b/test/phpunit/TokenStoreTest.php
index 0da6a24..8405602 100644
--- a/test/phpunit/TokenStoreTest.php
+++ b/test/phpunit/TokenStoreTest.php
@@ -1,10 +1,12 @@
 <?php
-namespace Gt\Csrf;
+namespace Gt\Csrf\Test;
 
+use Gt\Csrf\ArrayTokenStore;
 use Gt\Csrf\Exception\CsrfException;
 use Gt\Csrf\Exception\CsrfTokenInvalidException;
 use Gt\Csrf\Exception\CsrfTokenMissingException;
 use Gt\Csrf\Exception\CsrfTokenSpentException;
+use Gt\Csrf\HTMLDocumentProtector;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
@@ -157,4 +159,4 @@ public function testTokenLengthChange() {
 
 		self::assertNull($exception);
 	}
-}
\ No newline at end of file
+}