diff --git a/docker-compose.yml b/docker-compose.yml
index f7a67e7..9fc4ede 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   phpserver:
-    image: uselagoon/php-8.2-cli:24.8.0
+    image: uselagoon/php-8.2-cli:24.9.0
     volumes:
       - .:/app:delegated
     environment:
diff --git a/rector.php b/rector.php
index c088341..d4aa6f7 100644
--- a/rector.php
+++ b/rector.php
@@ -15,9 +15,7 @@
 use Rector\CodeQuality\Rector\ClassMethod\InlineArrayReturnAssignRector;
 use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
 use Rector\CodingStyle\Rector\ClassMethod\NewlineBeforeNewAssignSetRector;
-use Rector\CodingStyle\Rector\FuncCall\ArraySpreadInsteadOfArrayMergeRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
-use Rector\CodingStyle\Rector\PostInc\PostIncDecToPreIncDecRector;
 use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\If_\RemoveAlwaysTrueIfConditionRector;
@@ -41,13 +39,11 @@
 
   $rectorConfig->skip([
     // Rules added by Rector's rule sets.
-    ArraySpreadInsteadOfArrayMergeRector::class,
     CountArrayToEmptyArrayComparisonRector::class,
     DisallowedEmptyRuleFixerRector::class,
     InlineArrayReturnAssignRector::class,
     NewlineAfterStatementRector::class,
     NewlineBeforeNewAssignSetRector::class,
-    PostIncDecToPreIncDecRector::class,
     RemoveAlwaysTrueIfConditionRector::class,
     SimplifyEmptyCheckOnEmptyArrayRector::class,
     // Dependencies.
diff --git a/src/DrevOps/BehatScreenshotExtension/Context/ScreenshotContext.php b/src/DrevOps/BehatScreenshotExtension/Context/ScreenshotContext.php
index 77645e1..b7ae778 100644
--- a/src/DrevOps/BehatScreenshotExtension/Context/ScreenshotContext.php
+++ b/src/DrevOps/BehatScreenshotExtension/Context/ScreenshotContext.php
@@ -146,7 +146,7 @@ public function printLastResponseOnError(AfterStepScope $event): void {
    * @When save screenshot
    * @When I save screenshot
    */
-  public function iSaveScreenshot(bool $fail = FALSE, string $filename = NULL): void {
+  public function iSaveScreenshot(bool $fail = FALSE, ?string $filename = NULL): void {
     $driver = $this->getSession()->getDriver();
     $fileName = $this->makeFileName('html', $filename, $fail);
     try {
@@ -276,7 +276,7 @@ protected function prepareDir(string $dir): void {
    *
    * @throws \Exception
    */
-  protected function makeFileName(string $ext, string $filename = NULL, bool $fail = FALSE): string {
+  protected function makeFileName(string $ext, ?string $filename = NULL, bool $fail = FALSE): string {
     if ($fail) {
       $filename = $this->filenamePatternFailed;
     }
diff --git a/src/DrevOps/BehatScreenshotExtension/Tokenizer.php b/src/DrevOps/BehatScreenshotExtension/Tokenizer.php
index ba83cbd..0eb6d44 100644
--- a/src/DrevOps/BehatScreenshotExtension/Tokenizer.php
+++ b/src/DrevOps/BehatScreenshotExtension/Tokenizer.php
@@ -89,7 +89,7 @@ public static function scanTokens(string $text): array {
    *
    * @SuppressWarnings(PHPMD.UnusedFormalParameter)
    */
-  public static function replaceFeatureToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
+  public static function replaceFeatureToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
     $replacement = $token;
     if (isset($data['feature_file']) && is_string($data['feature_file'])) {
       $featureFile = $data['feature_file'];
@@ -120,7 +120,7 @@ public static function replaceFeatureToken(string $token, string $name, string $
    *
    * @SuppressWarnings(PHPMD.UnusedFormalParameter)
    */
-  public static function replaceExtToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
+  public static function replaceExtToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
     $ext = 'html';
     if (isset($data['ext']) && is_string($data['ext']) && $data['ext'] !== '') {
       $ext = $data['ext'];
@@ -148,7 +148,7 @@ public static function replaceExtToken(string $token, string $name, string $qual
    *
    * @SuppressWarnings(PHPMD.UnusedFormalParameter)
    */
-  public static function replaceStepToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
+  public static function replaceStepToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
     $replacement = $token;
     switch ($qualifier) {
       case 'line':
@@ -193,7 +193,7 @@ public static function replaceStepToken(string $token, string $name, string $qua
    *
    * @throws \Exception
    */
-  public static function replaceDatetimeToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
+  public static function replaceDatetimeToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
     $timestamp = NULL;
     if ($data['time']) {
       if (!is_int($data['time'])) {
@@ -231,7 +231,7 @@ public static function replaceDatetimeToken(string $token, string $name, string
    * @SuppressWarnings(PHPMD.UnusedFormalParameter)
    * @SuppressWarnings(PHPMD.CyclomaticComplexity)
    */
-  public static function replaceUrlToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
+  public static function replaceUrlToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
     $replacement = $token;
     if (isset($data['url']) && is_string($data['url'])) {
       $url = $data['url'];
@@ -295,7 +295,7 @@ public static function replaceUrlToken(string $token, string $name, string $qual
    *
    * @SuppressWarnings(PHPMD.UnusedFormalParameter)
    */
-  public static function replaceFailToken(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
+  public static function replaceFailToken(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
     $replacement = $token;
     if (!empty($data['fail_prefix']) && is_string($data['fail_prefix'])) {
       $replacement = $data['fail_prefix'];
@@ -357,7 +357,7 @@ public static function extractTokens(array $tokens, array $data): array {
    *
    * @throws \Exception
    */
-  public static function buildTokenReplacement(string $token, string $name, string $qualifier = NULL, string $format = NULL, array $data = []): string {
+  public static function buildTokenReplacement(string $token, string $name, ?string $qualifier = NULL, ?string $format = NULL, array $data = []): string {
     $replacement = $token;
     switch ($name) {
       case 'feature':