diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06b6664f..89c685e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,11 +22,8 @@ commands:
       - restore_cache:
           name: Restoring Pip Cache
           keys:
-            - &cache-key pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "setup.py" }}
-            - pip-cache-v9-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-
-      - run:
-          command: |  # use pipenv to install dependencies
-            sudo pip install pipenv
+            - &cache-key pip-cache-v11-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-{{ checksum "setup.py" }}
+            - pip-cache-v11-<< parameters.python-image >>-<< parameters.enabled-ciso-8601 >>-
       - run:
           name: "Running tests"
           command: ./scripts/ci-test.sh
@@ -46,7 +43,7 @@ jobs:
     parameters:
       python-image:
         type: string
-        default: &default-python "circleci/python:3.6-buster"
+        default: &default-python "cimg/python:3.6"
       influxdb-image:
         type: string
         default: &default-influxdb "influxdb:latest"
@@ -93,6 +90,7 @@ jobs:
       - run:
           name: Checks that the description will render correctly on PyPI.
           command: |
+            pip install --upgrade pip
             pip install twine --user
             python setup.py sdist bdist_wheel
             twine check dist/*
@@ -173,13 +171,13 @@ workflows:
           influxdb-image: "quay.io/influxdb/influxdb:nightly"
       - tests-python:
           name: test-3.7
-          python-image: "circleci/python:3.7-buster"
+          python-image: "cimg/python:3.7"
       - tests-python:
           name: test-3.8
-          python-image: "circleci/python:3.8-buster"
+          python-image: "cimg/python:3.8"
       - tests-python:
           name: test-3.9
-          python-image: "circleci/python:3.9-buster"
+          python-image: "cimg/python:3.9"
 
   nightly:
     triggers:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index af167b66..e4072631 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@
 
 ### Bug Fixes
 1. [#321](https://github.com/influxdata/influxdb-client-python/pull/321): Fixes return type for dashboard when `include=properties` is used
+
+### CI
+1. [#327](https://github.com/influxdata/influxdb-client-python/pull/327): Switch to next-gen CircleCI's convenience images
  
 ## 1.20.0 [2021-08-20]