diff --git a/.circleci/config.yml b/.circleci/config.yml
index ce56703812d..ced90d3ea60 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,13 +104,13 @@ jobs:
         default: &default-maven-image "circleci/openjdk:8"
       influxdb-image:
         type: string
-        default: &default-influxdb-image "influxdb:v2.0.4"
+        default: &default-influxdb-image "influxdb:latest"
     docker:
       - image: << parameters.maven-image >>
-      - image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >>
+      - image: &influx-image << parameters.influxdb-image >>
         environment:
           INFLUXD_HTTP_BIND_ADDRESS: :9999
-      - image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >>
+      - image: &influx-image << parameters.influxdb-image >>
         name: influxdb_v2_onboarding
         environment:
           INFLUXD_HTTP_BIND_ADDRESS: :9999
@@ -179,7 +179,7 @@ workflows:
           maven-image: "circleci/openjdk:11"
       - tests-java:
           name: jdk-8-nightly
-          influxdb-image: "influxdb2:nightly"
+          influxdb-image: "quay.io/influxdb/influxdb:nightly"
       - deploy-snapshot:
           requires:
             - jdk-8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd3caeac407..e16a22bb180 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,10 @@
 1. [#197](https://github.com/influxdata/influxdb-client-java/pull/197): InfluxException bodyError type changed from JSONObject to Map<String, Object>
 
 ### Bug Fixes
-1. [#197](https://github.com/influxdata/influxdb-client-java/issues/196): Removed badly licenced JSON-Java library
+1. [#196](https://github.com/influxdata/influxdb-client-java/issues/196): Removed badly licenced JSON-Java library
+
+### CI
+1. [#203](https://github.com/influxdata/influxdb-client-java/pull/203): Updated stable image to `influxdb:latest` and nightly to `quay.io/influxdb/influxdb:nightly`
 
 ## 1.15.0 [2021-01-29]
 
diff --git a/scripts/influxdb-restart.sh b/scripts/influxdb-restart.sh
index e3f8fdffa3f..8db1f441207 100755
--- a/scripts/influxdb-restart.sh
+++ b/scripts/influxdb-restart.sh
@@ -23,18 +23,13 @@
 
 set -e
 
-DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
-DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"
-
 DEFAULT_INFLUXDB_VERSION="1.8"
 INFLUXDB_VERSION="${INFLUXDB_VERSION:-$DEFAULT_INFLUXDB_VERSION}"
 INFLUXDB_IMAGE=influxdb:${INFLUXDB_VERSION}-alpine
 
-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 )"