diff --git a/.github/workflows/unit-test-plugin-nightly.yml b/.github/workflows/unit-test-plugin-nightly.yml
index 692a6c914..8341d4ef9 100644
--- a/.github/workflows/unit-test-plugin-nightly.yml
+++ b/.github/workflows/unit-test-plugin-nightly.yml
@@ -9,6 +9,7 @@ on:
 
 jobs:
   unit_test_plugin:
+    name: WP Nightly / PHP 8.3
     runs-on: ubuntu-22.04
 
     steps:
@@ -19,7 +20,8 @@ jobs:
         working-directory: ./plugins/faustwp
         run: |
           docker compose build \
-            --build-arg WP_VERSION=6.5
+            --build-arg WP_VERSION=6.8 \
+            --build-arg PHP_VERSION=8.3
           docker compose up -d
 
       - name: Wait for db
diff --git a/.github/workflows/unit-test-plugin.yml b/.github/workflows/unit-test-plugin.yml
index a36ec8f75..dea6a3b03 100644
--- a/.github/workflows/unit-test-plugin.yml
+++ b/.github/workflows/unit-test-plugin.yml
@@ -9,22 +9,22 @@ on:
 
 jobs:
   unit_test_plugin:
-    name: WordPress ${{ matrix.wordpress }}
+    name: WP ${{ matrix.wordpress }} / PHP ${{ matrix.php }}
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        wordpress: [ '6.8', '6.7', '6.6', '6.5', '6.4', '6.3', '6.2']
+        wordpress: ['6.8', '6.7']
+        php: ['8.1', '8.3']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Create Docker Containers
-        env:
-          WP_VERSION: ${{ matrix.wordpress }}
         working-directory: ./plugins/faustwp
         run: |
           docker compose build \
-            --build-arg WP_VERSION=${{ matrix.wordpress }}
+            --build-arg WP_VERSION=${{ matrix.wordpress }} \
+            --build-arg PHP_VERSION=${{ matrix.php }}
           docker compose up -d
 
       - name: Wait for db
diff --git a/plugins/faustwp/.docker/Dockerfile b/plugins/faustwp/.docker/Dockerfile
index 30e7a988d..0af455537 100644
--- a/plugins/faustwp/.docker/Dockerfile
+++ b/plugins/faustwp/.docker/Dockerfile
@@ -1,6 +1,7 @@
 ARG WP_VERSION
+ARG PHP_VERSION=8.2
 
-FROM wordpress:${WP_VERSION}-php8.2
+FROM wordpress:${WP_VERSION}-php${PHP_VERSION}
 
 # Save the build args for use by the runtime environment
 ENV WP_VERSION=${WP_VERSION}
diff --git a/plugins/faustwp/docker-compose.yml b/plugins/faustwp/docker-compose.yml
index fb097c4c7..eeda3a32e 100644
--- a/plugins/faustwp/docker-compose.yml
+++ b/plugins/faustwp/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.6'
-
 services:
   wordpress:
     build:
@@ -27,6 +25,7 @@ services:
   db:
     image: mysql:8
     restart: always
+    command: --default-authentication-plugin=mysql_native_password
     ports:
       - 33066:3306
     environment: