diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
index fbcbc0576c..ff1dd5cf80 100644
--- a/.woodpecker/.continuous-deployment.yml
+++ b/.woodpecker/.continuous-deployment.yml
@@ -41,7 +41,7 @@ steps:
     volumes:
       - /tmp/drone-cache:/tmp/cache
   composer_install:
-    image: friendicaci/php8.2:php8.2.16
+    image: friendicaci/php8.2:php8.2.28
     commands:
       - mkdir addon # create empty addon folder to appease composer
       - export COMPOSER_HOME=.composer
diff --git a/.woodpecker/.database_checks.yml b/.woodpecker/.database_checks.yml
index ea768bf132..bf947dedaa 100644
--- a/.woodpecker/.database_checks.yml
+++ b/.woodpecker/.database_checks.yml
@@ -5,7 +5,7 @@
 matrix:
   include:
     - PHP_MAJOR_VERSION: 8.2
-      PHP_VERSION: 8.2.16
+      PHP_VERSION: 8.2.28
 
 when:
   branch:
diff --git a/.woodpecker/.phpmd_check.yml b/.woodpecker/.phpmd_check.yml
index f03e44eec9..7f9352ded3 100644
--- a/.woodpecker/.phpmd_check.yml
+++ b/.woodpecker/.phpmd_check.yml
@@ -8,6 +8,10 @@ when:
     exclude: [ stable ]
   event: [ pull_request, push ]
 
+# This forces PHP Unit executions at the "opensocial" labeled location (because of access issues with git.friendi.ca)
+labels:
+  location: opensocial
+
 steps:
   restore_cache:
     image: meltwater/drone-cache:dev
@@ -22,7 +26,7 @@ steps:
       - /tmp/drone-cache:/tmp/cache
 
   composer_install:
-    image: friendicaci/php8.3:php8.3.3
+    image: friendicaci/php8.3:php8.3.17
     commands:
       - mkdir addon # create empty addon folder to appease composer
       - export COMPOSER_HOME=.composer
@@ -41,6 +45,6 @@ steps:
       - /tmp/drone-cache:/tmp/cache
 
   phpmd:
-    image: friendicaci/php8.3:php8.3.3
+    image: friendicaci/php8.3:php8.3.17
     commands:
       - ./bin/composer.phar run phpmd
diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
index 04c66bcb97..c1a81a2fd1 100644
--- a/.woodpecker/.phpunit.yml
+++ b/.woodpecker/.phpunit.yml
@@ -9,11 +9,13 @@ matrix:
     - PHP_MAJOR_VERSION: 8.0
       PHP_VERSION: 8.0.30
     - PHP_MAJOR_VERSION: 8.1
-      PHP_VERSION: 8.1.27
+      PHP_VERSION: 8.1.31
     - PHP_MAJOR_VERSION: 8.2
-      PHP_VERSION: 8.2.16
+      PHP_VERSION: 8.2.28
     - PHP_MAJOR_VERSION: 8.3
-      PHP_VERSION: 8.3.3
+      PHP_VERSION: 8.3.17
+    - PHP_MAJOR_VERSION: 8.4
+      PHP_VERSION: 8.4.5
 
 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
 labels:
@@ -24,7 +26,19 @@ when:
     exclude: [ stable ]
   event: [ pull_request, push ]
 
+skip_clone: true
+
 steps:
+  clone:
+    image: alpine/git
+    commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
+      - git clone $CI_REPO_CLONE_URL .
+      - git checkout $CI_COMMIT_BRANCH
+      - git fetch origin $CI_COMMIT_REF
+      - git merge $CI_COMMIT_SHA
   php-lint:
     image: php:${PHP_MAJOR_VERSION}
     commands:
@@ -94,7 +108,7 @@ steps:
     when:
       matrix:
         PHP_MAJOR_VERSION: 8.2
-        PHP_VERSION: 8.2.16
+        PHP_VERSION: 8.2.28
       repo:
         - friendica/friendica
     commands:
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
index c49847ed39..d7dfd1cfb9 100644
--- a/.woodpecker/.releaser.yml
+++ b/.woodpecker/.releaser.yml
@@ -35,7 +35,7 @@ steps:
     volumes:
       - /tmp/drone-cache:/tmp/cache
   composer_install:
-    image: friendicaci/php8.2:php8.2.16
+    image: friendicaci/php8.2:php8.2.28
     commands:
       - mkdir addon # create empty addon folder to appease composer
       - export COMPOSER_HOME=.composer
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index ee628029f4..05771f6503 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -11,6 +11,7 @@ if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
 	die('Vendor path not found. Please execute "bin/composer.phar install" on the command line in the web root.');
 }
 
+error_reporting(E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED);
 require __DIR__ . '/../vendor/autoload.php';
 
 // Backward compatibility