diff --git a/.circleci/config.yml b/.circleci/config.yml
index 493143c4bb..5c80331c40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,6 +104,11 @@ commands:
           name: Restoring SDKMAN install cache
           keys:
             - sdkman-install-cache-v3-{{ arch }}-{{ checksum ".circleci/vendor/sdkman-install.sh" }}
+      - run:
+          name: Installing Python
+          command: |
+            sudo apt update
+            sudo apt install python3 python3-pip python-is-python3
       - run:
           name: Installing SDKMAN
           # The install script comes from https://get.sdkman.io/?rcupdate=false
@@ -144,9 +149,6 @@ commands:
           command: choco install nodejs --version=<< parameters.node_version >> --no-progress
   install_shellspec_dependencies:
     steps:
-      - run:
-          name: Installing test dependencies
-          command: sudo apt-get install jq python-pip
       - run:
           name: Installing ShellSpec
           command: |
@@ -164,13 +166,14 @@ commands:
     steps:
       - run:
           name: Installing release dependencies
-          command: sudo apt-get install -y osslsigncode
-
+          command: |
+            sudo apt update
+            sudo apt install osslsigncode
 jobs:
   build:
     <<: *defaults
     docker:
-      - image: circleci/node:<< parameters.node_version >>
+      - image: cimg/node:<< parameters.node_version >>
     steps:
       - checkout
       - install_project_dependencies:
@@ -182,7 +185,7 @@ jobs:
   regression-test:
     <<: *defaults
     docker:
-      - image: circleci/node:<< parameters.node_version >>
+      - image: cimg/node:<< parameters.node_version >>
     steps:
       - checkout
       - install_sdks_linux
@@ -287,7 +290,7 @@ jobs:
   test-linux:
     <<: *defaults
     docker:
-      - image: circleci/node:<< parameters.node_version >>
+      - image: cimg/node:<< parameters.node_version >>
     environment:
       TEMP: /mnt/ramdisk/tmp
     steps:
@@ -353,7 +356,7 @@ jobs:
   dev-release:
     <<: *defaults
     docker:
-      - image: circleci/node:<< parameters.node_version >>
+      - image: cimg/node:<< parameters.node_version >>
     steps:
       - checkout
       - install_release_dependencies
@@ -385,7 +388,7 @@ jobs:
   prod-release:
     <<: *defaults
     docker:
-      - image: circleci/node:<< parameters.node_version >>
+      - image: cimg/node:<< parameters.node_version >>
     steps:
       - checkout
       - run: