diff --git a/.github/workflows/phpstan.yaml b/.github/workflows/phpstan.yaml
deleted file mode 100644
index e4c15ae..0000000
--- a/.github/workflows/phpstan.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: PHPStan checks
-on:
-    push: ~
-    pull_request: ~
-
-jobs:
-    phpstan:
-        name: PHPUnit tests on ${{ matrix.php }} ${{ matrix.composer-flags }}
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                php: [ '8.1', '8.2' ]
-                composer-flags: [ '' ]
-        steps:
-            - uses: actions/checkout@v2
-            - uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  coverage: pcov
-                  tools: composer:v2
-            - run: composer update --no-progress ${{ matrix.composer-flags }}
-            - run: vendor/bin/phpstan
diff --git a/.github/workflows/quality-assurance.yaml b/.github/workflows/quality-assurance.yaml
new file mode 100644
index 0000000..7624834
--- /dev/null
+++ b/.github/workflows/quality-assurance.yaml
@@ -0,0 +1,39 @@
+---
+name: Quality assurance
+on:
+    push:
+        branches: ['master']
+    pull_request: ~
+
+jobs:
+    phpunit:
+        name: PHPUnit tests on ${{ matrix.php }} ${{ matrix.composer-flags }}
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
+                phpunit-flags: [ '--coverage-text' ]
+        steps:
+            - uses: actions/checkout@v2
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  coverage: xdebug
+                  tools: composer:v2
+            - run: composer install --no-progress
+            - run: vendor/bin/phpunit ${{ matrix.phpunit-flags }}
+    phpstan:
+        name: PHPStan checks on ${{ matrix.php }}
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
+        steps:
+            - uses: actions/checkout@v2
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: ${{ matrix.php }}
+                  coverage: xdebug
+                  tools: composer:v2
+            - run: composer install --no-progress
+            - run: vendor/bin/phpstan
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
deleted file mode 100644
index 44fe829..0000000
--- a/.github/workflows/testing.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: PHPUnit tests
-on:
-    push: ~
-    pull_request: ~
-
-jobs:
-    phpunit:
-        name: PHPUnit tests on ${{ matrix.php }} ${{ matrix.composer-flags }}
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                php: [ '8.1', '8.2' ]
-                composer-flags: [ '' ]
-                phpunit-flags: [ '--coverage-text' ]
-        steps:
-            - uses: actions/checkout@v2
-            - uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  coverage: pcov
-                  tools: composer:v2
-            - run: composer update --no-progress ${{ matrix.composer-flags }}
-            - run: vendor/bin/phpunit ${{ matrix.phpunit-flags }}
diff --git a/MAINTENANCE-TERMS.md b/MAINTENANCE-TERMS.md
new file mode 100644
index 0000000..b498893
--- /dev/null
+++ b/MAINTENANCE-TERMS.md
@@ -0,0 +1,22 @@
+# Maintenance Terms
+
+Current as of 2025
+
+The code, text and data in this repository are provided as-is under
+the terms of the repository's LICENSE.md file, as a gift to the commons
+and the common good. In providing this software as-is, its author(s)
+admit no further obligations from anyone using the software for any reason,
+particularly with respect to:
+
+- Response time,
+- Change review and integration,
+- Disclosure schedules,
+- Discretionary, proprietary or otherwise secretive communications, and
+- Any other non-contractual obligations or conventions, regardless of
+  their presumed urgency or severity.
+
+The author(s) hope you find it valuable on those terms.
+
+Terms created by Mike Hoye - mhoye, 2025
+
+Original: https://github.com/mhoye/maintenance-terms
diff --git a/Makefile b/Makefile
index 08ac496..e62a160 100644
--- a/Makefile
+++ b/Makefile
@@ -12,13 +12,13 @@ ifeq ($(origin .RECIPEPREFIX), undefined)
 endif
 .RECIPEPREFIX = >
 
-compose_command = docker-compose run -u $(id -u ${USER}):$(id -g ${USER}) --rm php81
+compose_command = docker compose run -u $(id -u ${USER}):$(id -g ${USER}) --rm php81
 
 build: tmp/.docker-built
 
 tmp/.docker-built: docker-compose.yml docker/php/81/Dockerfile
 > mkdir -p $(@D)	# Makes the tmp directory
-> docker-compose build
+> docker compose build
 > touch $@			# Touches the file that is this target.
 
 shell: build
@@ -26,7 +26,7 @@ shell: build
 .PHONY: shell
 
 destroy:
-> docker-compose down -v
+> docker compose down -v
 > rm -rf tmp
 .PHONY: destroy
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 4ebf505..f986dcc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,6 @@
 # Run "docker-compose down -v" to fully wipe everything and start over.
 # Run "docker-compose run -u $(id -u ${USER}):$(id -g ${USER}) --rm php80 bash" to log into the container to run tests selectively.
 
-version: "3"
 services:
     php81:
         build: ./docker/php/81