diff --git a/.circleci/config.yml b/.circleci/config.yml
index edb9264e..032825a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,7 +49,7 @@ jobs:
         default: &default-python "circleci/python:3.6-buster"
       influxdb-image:
         type: string
-        default: "influxdb:v2.0.4"
+        default: "influxdb:latest"
       enabled-ciso-8601:
         type: boolean
         default: true
@@ -58,7 +58,7 @@ jobs:
         environment: # environment variables for primary container
           PIPENV_VENV_IN_PROJECT: true
           ENABLED_CISO_8601: << parameters.enabled-ciso-8601 >>
-      - image: quay.io/influxdb/<< parameters.influxdb-image >>
+      - image: << parameters.influxdb-image >>
         environment:
           INFLUXD_HTTP_BIND_ADDRESS: :8086
     steps:
@@ -136,7 +136,7 @@ workflows:
           enabled-ciso-8601: false
       - tests-python:
           name: test-3.6-influxdb-nightly
-          influxdb-image: "influxdb2:nightly"
+          influxdb-image: "quay.io/influxdb/influxdb:nightly"
       - tests-python:
           name: test-3.7
           python-image: "circleci/python:3.7-buster"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd56518e..b9ea20bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
 ### Documentation
 1. [#200](https://github.com/influxdata/influxdb-client-python/pull/200): Updated docs, examples, tests: use `close` instead of `__del__`.
 
+### CI
+1. [#199](https://github.com/influxdata/influxdb-client-python/pull/199): Updated stable image to `influxdb:latest` and nightly to `quay.io/influxdb/influxdb:nightly`
+
 ## 1.14.0 [2021-01-29]
 
 ### Features
diff --git a/scripts/influxdb-restart.sh b/scripts/influxdb-restart.sh
index f26a6b2f..51c4f9c3 100755
--- a/scripts/influxdb-restart.sh
+++ b/scripts/influxdb-restart.sh
@@ -23,14 +23,9 @@
 
 set -e
 
-DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
-DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"
-
-DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb"
-DEFAULT_INFLUXDB_V2_VERSION="v2.0.4"
-INFLUXDB_V2_REPOSITORY="${INFLUXDB_V2_REPOSITORY:-$DEFAULT_INFLUXDB_V2_REPOSITORY}"
+DEFAULT_INFLUXDB_V2_VERSION="latest"
 INFLUXDB_V2_VERSION="${INFLUXDB_V2_VERSION:-$DEFAULT_INFLUXDB_V2_VERSION}"
-INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION}
+INFLUXDB_V2_IMAGE=influxdb:${INFLUXDB_V2_VERSION}
 
 SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"