diff --git a/.circleci/config.yml b/.circleci/config.yml
index 716468c4a7d..5fd7ddf2602 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,11 +51,9 @@ jobs:
 
   python-tests-mysql:
     machine:
-      image: ubuntu-2004:202010-01
+      image: default
     steps:
       - checkout
-      - docker/install-docker:
-          version: 19.03.13
       - docker/install-docker-compose:
           version: 1.29.2
       - run:
@@ -71,11 +69,9 @@ jobs:
 
   python-tests-postgres:
     machine:
-      image: ubuntu-2004:202010-01
+      image: default
     steps:
       - checkout
-      - docker/install-docker:
-          version: 19.03.13
       - docker/install-docker-compose:
           version: 1.29.2
       - run:
@@ -94,7 +90,7 @@ jobs:
       - image: docker:19.03.15
     steps:
       - setup_remote_docker:
-          version: 20.10.23
+          version: docker24
       - checkout
       - run:
           name: Create a version.json
@@ -115,7 +111,7 @@ jobs:
       - image: docker:19.03.15
     steps:
       - setup_remote_docker:
-          version: 20.10.23
+          version: docker24
       - checkout
       - run:
           name: Create a version.json
diff --git a/tox.ini b/tox.ini
index 94fda567703..b285c98fc10 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist=True
 toxworkdir={toxinidir}/.tox
 
 [testenv]
-whitelist_externals =
+allowlist_externals =
     sh
     docker-compose
 commands_pre =
@@ -43,14 +43,14 @@ commands_post =
 
 [testenv:docker]
 commands_pre =
-whitelist_externals=
+allowlist_externals=
     docker-compose
 commands =
     docker-compose run -e TREEHERDER_DEBUG=False backend bash -c "pytest --cov --cov-report=xml tests/ --runslow -p no:unraisableexception"
 
 [testenv:docker-postgres]
 commands_pre =
-whitelist_externals=
+allowlist_externals=
     docker-compose
 commands =
     docker-compose run -e TREEHERDER_DEBUG=False -e DATABASE_URL=psql://postgres:mozilla1234@postgres:5432/treeherder backend bash -c "pytest --cov --cov-report=xml tests/ --runslow -p no:unraisableexception"