diff --git a/.circleci/config.yml b/.circleci/config.yml
index b8915e1d7..1286b1d52 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,44 +5,44 @@ workflows:
   test-all:
     jobs:
       - lint
-      - unit-test-27:
+      - unit-test-37:
           requires:
             - lint
-      - functional-test-27:
+      - functional-test-37:
           requires:
-            - unit-test-27
-      - unit-test-35:
+            - unit-test-37
+      - unit-test-38:
           requires:
             - lint
-      - functional-test-35:
+      - functional-test-38:
           requires:
-            - unit-test-35
-            - functional-test-27
-      - unit-test-36:
+            - unit-test-38
+            - functional-test-37
+      - unit-test-39:
           requires:
             - lint
-      - functional-test-36:
+      - functional-test-39:
           requires:
-            - unit-test-36
-            - functional-test-35
-      - unit-test-37:
+            - unit-test-39
+            - functional-test-38
+      - unit-test-310:
           requires:
             - lint
-      - functional-test-37:
+      - functional-test-310:
           requires:
-            - unit-test-37
-            - functional-test-36
+            - unit-test-310
+            - functional-test-39
       - cleanup-functional-buckets:
           requires:
-            - functional-test-27
-            - functional-test-35
-            - functional-test-36
             - functional-test-37
+            - functional-test-38
+            - functional-test-39
+            - functional-test-310
 
 jobs:
   lint:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.7
     steps:
       - checkout
       - run: sudo pip install flake8 codecov pep8-naming flake8-future-import
@@ -50,32 +50,32 @@ jobs:
       - run: flake8 --version
       - run: sudo make lint
 
-  unit-test-27:
+  unit-test-37:
     docker:
-      - image: circleci/python:2.7
+      - image: circleci/python:3.7
     steps: &unit_test_steps
       - checkout
       - run: sudo python setup.py install
       - run: sudo make test-unit
 
-  unit-test-35:
+  unit-test-38:
     docker:
-      - image: circleci/python:3.5
+      - image: circleci/python:3.8
     steps: *unit_test_steps
 
-  unit-test-36:
+  unit-test-39:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.9
     steps: *unit_test_steps
 
-  unit-test-37:
+  unit-test-310:
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:3.10
     steps: *unit_test_steps
 
-  functional-test-27:
+  functional-test-37:
     docker:
-      - image: circleci/python:2.7
+      - image: circleci/python:3.7
     steps: &functional_test_steps
       - checkout
       - run:
@@ -94,24 +94,24 @@ jobs:
             export STACKER_ROLE=arn:aws:iam::459170252436:role/cloudtools-functional-tests-sta-FunctionalTestRole-1M9HFJ9VQVMFX
             sudo -E make test-functional
 
-  functional-test-35:
+  functional-test-38:
     docker:
-      - image: circleci/python:3.5
+      - image: circleci/python:3.8
     steps: *functional_test_steps
 
-  functional-test-36:
+  functional-test-39:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.9
     steps: *functional_test_steps
 
-  functional-test-37:
+  functional-test-310:
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:3.10
     steps: *functional_test_steps
 
   cleanup-functional-buckets:
     docker:
-      - image: circleci/python:2.7
+      - image: circleci/python:3.7
     steps:
       - checkout
       - run: