diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index c297da15..9e3f6069 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -12,4 +12,8 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Roave BC Check
-        uses: docker://nyholm/roave-bc-check-ga
+        uses: "addnab/docker-run-action@v3"
+        with:
+          image: "nyholm/roave-bc-check-ga"
+          options: "--env GITHUB_REPOSITORY=${{ github.repository }} --user 1001 --volume ${{ github.workspace }}:/app"
+          run: "/entrypoint.sh"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c920d3c8..f2ea3826 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,8 +10,8 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
-        sf_version: ['3.4.*', '4.4.*', '5.0.*', '6.4.*', '7.0.*']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
+        sf_version: ['3.4.*', '4.4.*', '5.0.*', '6.4.*', '7.4.*', '8.0.*']
 
     steps:
       - name: Set up PHP
@@ -91,11 +91,6 @@ jobs:
       - name: Run tests
         run: ./vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml
 
-      - name: Upload coverage
-        run: |
-          wget https://scrutinizer-ci.com/ocular.phar
-          php ocular.phar code-coverage:upload --format=php-clover coverage.xml || true
-
   h2push:
     name: HTTP/2 Server Push
     runs-on: ubuntu-latest
diff --git a/Dockerfile b/Dockerfile
index d99f8cbf..39a3d385 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-buster
+FROM php:7.4-fpm-bullseye
 
 # Install Nginx
 RUN apt-get update -qq && apt-get install -y --no-install-recommends -qq nginx
diff --git a/composer.json b/composer.json
index 5a4f357c..de134a5c 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "psr/http-message": "^1.1 || ^2.0",
         "psr/http-client": "^1.0",
         "php-http/httplug": "^1.1 || ^2.0",
-        "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/options-resolver": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0",
         "psr/http-factory": "^1.0"
     },
     "require-dev": {
diff --git a/lib/Client/AbstractCurl.php b/lib/Client/AbstractCurl.php
index be6293d2..11f452f4 100644
--- a/lib/Client/AbstractCurl.php
+++ b/lib/Client/AbstractCurl.php
@@ -193,7 +193,7 @@ private function setOptionsFromParameterBag($curl, ParameterBag $options): void
             curl_setopt($curl, \CURLOPT_PROXY, $proxy);
         }
 
-        $canFollow = !\ini_get('safe_mode') && !\ini_get('open_basedir') && $options->get('allow_redirects');
+        $canFollow = !\ini_get('open_basedir') && $options->get('allow_redirects');
         curl_setopt($curl, \CURLOPT_FOLLOWLOCATION, $canFollow);
         curl_setopt($curl, \CURLOPT_MAXREDIRS, $canFollow ? $options->get('max_redirects') : 0);
         curl_setopt($curl, \CURLOPT_SSL_VERIFYPEER, $options->get('verify') ? 1 : 0);