diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4990dc9..f908d541 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ references:
 executors:
   php:
     docker:
-      - image: circleci/php:7.4.5-cli-node
+      - image: cimg/php:7.4.5-node
 
 commands:
   set-up-packages:
@@ -49,7 +49,7 @@ jobs:
       php-version:
         type: string
     docker:
-      - image: circleci/php:<< parameters.php-version >>-cli-node
+      - image: cimg/php:<< parameters.php-version >>-node
         environment:
           WP_TESTS_DIR: ~/project/wordpress-develop/tests/phpunit
       - image: mysql:5.7
@@ -61,11 +61,6 @@ jobs:
           MYSQL_ROOT_PASSWORD: wordpress
     steps:
       - checkout
-      - run:
-          name: Installing PHP extensions
-          command: |
-            sudo apt-get update && sudo apt-get install libpng-dev
-            sudo docker-php-ext-install mysqli gd
       - node/install:
           node-version: '14.18.1'
       - nodegit-workaround
diff --git a/composer.json b/composer.json
index 6db8548c..0c033380 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,11 @@
         "wp-coding-standards/wpcs": "2.2.0",
         "phpunit/phpunit": "7.5.2"
     },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
     "autoload": {
         "psr-4": {
           "Genesis\\CustomBlocks\\": "php/"
diff --git a/package-lock.json b/package-lock.json
index 5a5bcc73..931e87fe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6848,12 +6848,6 @@
             "icss-utils": "^5.0.0"
           }
         },
-        "prettier": {
-          "version": "npm:wp-prettier@2.2.1-beta-1",
-          "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz",
-          "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==",
-          "dev": true
-        },
         "sass-loader": {
           "version": "10.2.0",
           "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz",
@@ -21910,6 +21904,12 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
+    "prettier": {
+      "version": "npm:wp-prettier@2.2.1-beta-1",
+      "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz",
+      "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==",
+      "dev": true
+    },
     "prettier-linter-helpers": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",