diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
new file mode 100644
index 0000000..7df6b01
--- /dev/null
+++ b/.github/workflows/general.yml
@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: Copyright 2023 Move Agency Group B.V., Zwolle, The Netherlands
+# SPDX-License-Identifier: CC0-1.0
+
+name: General Tests
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  reuse:
+    uses: lunr-php/actions-templates/.github/workflows/reuse.yml@master
diff --git a/.github/workflows/php-tests.yml b/.github/workflows/php-tests.yml
index cc80c80..bada61b 100644
--- a/.github/workflows/php-tests.yml
+++ b/.github/workflows/php-tests.yml
@@ -3,89 +3,16 @@
 # SPDX-License-Identifier: CC0-1.0
 
 name: PHP Tests
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
-  phpunit:
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    name: "PHP-${{ matrix.php-versions }}: PHPUnit"
-    strategy:
-      matrix:
-        php-versions: ['8.1']
-        experimental: [false]
-        include:
-          - php-versions: 8.2
-            experimental: true
-          - php-versions: 8.3
-            experimental: true
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          tools: phpunit:9.5.x
-          extensions: uopz
-
-      - name: Setup problem matchers for PHP
-        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-
-      - name: Install dependencies
-        run: composer update
-
-      - name: Run PHPunit
-        run: phpunit --configuration tests/phpunit.xml --coverage-clover=coverage.xml
-
-      - name: Collect code coverage
-        uses: codecov/codecov-action@v3
-        with:
-          files: ./coverage.xml
-
-  phpcs:
-    runs-on: ubuntu-latest
-    continue-on-error: false
-    name: "PHPCS"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Codestyle checkout
-        uses: actions/checkout@v3
-        with:
-            repository: 'lunr-php/lunr-coding-standard'
-
-            # Relative path under $GITHUB_WORKSPACE to place the repository
-            path: 'codestyle'
-
-      - name: Setup PHPCS
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-          tools: cs2pr, phpcs
-
-      - name: Run PHPCS
-        run: phpcs -q --report=checkstyle src --standard=$GITHUB_WORKSPACE/codestyle/Lunr | cs2pr
-
-  phpstan:
-    runs-on: ubuntu-latest
-    continue-on-error: false
-    name: "PHPStan"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHPStan
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-          tools: phpstan
-          extensions: uopz
-
-      - name: Install dependencies
-        run: composer update
-
-      - name: Run PHPStan
-        run: phpstan analyze src -l2 --configuration tests/phpstan.neon.dist
+  php-tests:
+    uses: lunr-php/actions-templates/.github/workflows/php-composer.yml@master
+    with:
+      phpstan-level: 2
+      allow-style-failures: false
+      allow-phpstan-failures: false
+      phpcs-whitelist: tests/phan.config.php tests/phpstan.autoload.inc.php tests/test.bootstrap.inc.php
+      php-extensions: uopz
+      stable-php-versions: '["8.1"]'
+      experimental-php-versions: '["8.2","8.3"]'
diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml
deleted file mode 100644
index 7ac7d5e..0000000
--- a/.github/workflows/reuse.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-FileCopyrightText: Copyright 2023 Move Agency Group B.V., Zwolle, The Netherlands
-# SPDX-License-Identifier: CC0-1.0
-
-name: REUSE Compliance Check
-on: [push, pull_request]
-
-jobs:
-  reuse:
-    runs-on: ubuntu-latest
-    name: "REUSE Lint"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: REUSE lint
-        uses: fsfe/reuse-action@v1
-        with:
-          args: --include-submodules lint