diff --git a/.circleci/config.yml b/.circleci/config.yml
index 060bd48a..3d266974 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,7 +20,7 @@ jobs:
   lint:
     working_directory: ~/pantheon-systems/wp-native-php-sessions
     docker:
-      - image: quay.io/pantheon-public/build-tools-ci:6.x
+      - image: quay.io/pantheon-public/build-tools-ci:8.x-php7.4
     steps:
       - checkout
       - restore_cache:
@@ -39,47 +39,47 @@ jobs:
     working_directory: ~/pantheon-systems/wp-native-php-sessions
     parallelism: 1
     docker:
-    - image: quay.io/pantheon-public/build-tools-ci:6.x
+      - image: quay.io/pantheon-public/build-tools-ci:8.x-php7.4
     steps:
-    - checkout
-    - restore_cache:
-        keys:
-          - test-behat-dependencies-{{ checksum "composer.json" }}
-    - run: composer install -n --prefer-dist
-    - save_cache:
-        key: test-behat-dependencies-{{ checksum "composer.json" }}
-        paths:
-          - vendor
-    - run: echo $(openssl rand -hex 8) > /tmp/WORDPRESS_ADMIN_PASSWORD
-    - run: |
-        echo 'export TERMINUS_ENV=ci-$CIRCLE_BUILD_NUM' >> $BASH_ENV
-        echo 'export TERMINUS_SITE=wp-native-php-sessions' >> $BASH_ENV
-        echo 'export SITE_ENV=wp-native-php-sessions.ci-$CIRCLE_BUILD_NUM' >> $BASH_ENV
-        echo 'export WORDPRESS_ADMIN_USERNAME=pantheon' >> $BASH_ENV
-        echo 'export WORDPRESS_ADMIN_EMAIL=no-reply@getpantheon.com' >> $BASH_ENV
-        echo 'export WORDPRESS_ADMIN_PASSWORD=$(cat /tmp/WORDPRESS_ADMIN_PASSWORD)' >> $BASH_ENV
-        source $BASH_ENV
-    - run: echo "StrictHostKeyChecking no" >> "$HOME/.ssh/config"
-    - run: |
-        if [ -z "$GITHUB_TOKEN" ]; then
-          echo "GITHUB_TOKEN environment variables missing; assuming unauthenticated build"
-          exit 0
-        fi
-        echo "Setting GitHub OAuth token with suppressed ouput"
-        {
-          composer config -g github-oauth.github.com $GITHUB_TOKEN
-        } &> /dev/null
-    - run: |
-        if [ -z "$TERMINUS_TOKEN" ]; then
-          echo "TERMINUS_TOKEN environment variables missing; assuming unauthenticated build"
-          exit 0
-        fi
-        terminus auth:login --machine-token=$TERMINUS_TOKEN
-    - run: ./bin/behat-prepare.sh
-    - run: ./bin/behat-test.sh --strict
-    - run:
-        command: ./bin/behat-cleanup.sh
-        when: always
+      - checkout
+      - restore_cache:
+          keys:
+            - test-behat-dependencies-{{ checksum "composer.json" }}
+      - run: composer install -n --prefer-dist
+      - save_cache:
+          key: test-behat-dependencies-{{ checksum "composer.json" }}
+          paths:
+            - vendor
+      - run: echo $(openssl rand -hex 8) > /tmp/WORDPRESS_ADMIN_PASSWORD
+      - run: |
+          echo 'export TERMINUS_ENV=ci-$CIRCLE_BUILD_NUM' >> $BASH_ENV
+          echo 'export TERMINUS_SITE=wp-native-php-sessions' >> $BASH_ENV
+          echo 'export SITE_ENV=wp-native-php-sessions.ci-$CIRCLE_BUILD_NUM' >> $BASH_ENV
+          echo 'export WORDPRESS_ADMIN_USERNAME=pantheon' >> $BASH_ENV
+          echo 'export WORDPRESS_ADMIN_EMAIL=no-reply@getpantheon.com' >> $BASH_ENV
+          echo 'export WORDPRESS_ADMIN_PASSWORD=$(cat /tmp/WORDPRESS_ADMIN_PASSWORD)' >> $BASH_ENV
+          source $BASH_ENV
+      - run: echo "StrictHostKeyChecking no" >> "$HOME/.ssh/config"
+      - run: |
+          if [ -z "$GITHUB_TOKEN" ]; then
+            echo "GITHUB_TOKEN environment variables missing; assuming unauthenticated build"
+            exit 0
+          fi
+          echo "Setting GitHub OAuth token with suppressed ouput"
+          {
+            composer config -g github-oauth.github.com $GITHUB_TOKEN
+          } &> /dev/null
+      - run: |
+          if [ -z "$TERMINUS_TOKEN" ]; then
+            echo "TERMINUS_TOKEN environment variables missing; assuming unauthenticated build"
+            exit 0
+          fi
+          terminus auth:login --machine-token=$TERMINUS_TOKEN
+      - run: ./bin/behat-prepare.sh
+      - run: ./bin/behat-test.sh --strict
+      - run:
+          command: ./bin/behat-cleanup.sh
+          when: always
   test-phpunit:
     working_directory: ~/pantheon-systems/wp-native-php-sessions
     docker:
diff --git a/composer.lock b/composer.lock
index 1379a760..0e925284 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4824,16 +4824,16 @@
         },
         {
             "name": "yoast/phpunit-polyfills",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
-                "reference": "5ea3536428944955f969bc764bbe09738e151ada"
+                "reference": "3c621ff5429d2b1ff96dc5808ad6cde99d31ea4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/5ea3536428944955f969bc764bbe09738e151ada",
-                "reference": "5ea3536428944955f969bc764bbe09738e151ada",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/3c621ff5429d2b1ff96dc5808ad6cde99d31ea4c",
+                "reference": "3c621ff5429d2b1ff96dc5808ad6cde99d31ea4c",
                 "shasum": ""
             },
             "require": {
@@ -4841,7 +4841,7 @@
                 "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
             },
             "require-dev": {
-                "yoast/yoastcs": "^2.2.0"
+                "yoast/yoastcs": "^2.2.1"
             },
             "type": "library",
             "extra": {
@@ -4881,7 +4881,7 @@
                 "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
                 "source": "https://github.com/Yoast/PHPUnit-Polyfills"
             },
-            "time": "2021-11-23T01:37:03+00:00"
+            "time": "2022-11-16T09:07:52+00:00"
         }
     ],
     "aliases": [],