diff --git a/.circleci/config.yml b/.circleci/config.yml
index 863fb1dbd555e4a5f9de7e21900d6f20c3c90df8..d9ef2f365419044c168b644fd5d6294addcbc998 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,12 +27,6 @@ workflows:
       - build:
           name: build-influxdb
           product: influxdb
-      - build:
-          name: build-influxdb3-core
-          product: influxdb3-core
-      - build:
-          name: build-influxdb3-enterprise
-          product: influxdb3-enterprise
       - build:
           name: build-kapacitor
           product: kapacitor
diff --git a/influxdb3-core/3.0/Dockerfile b/influxdb/3.0-core/Dockerfile
similarity index 100%
rename from influxdb3-core/3.0/Dockerfile
rename to influxdb/3.0-core/Dockerfile
diff --git a/influxdb3-core/3.0/entrypoint.sh b/influxdb/3.0-core/entrypoint.sh
similarity index 100%
rename from influxdb3-core/3.0/entrypoint.sh
rename to influxdb/3.0-core/entrypoint.sh
diff --git a/influxdb3-enterprise/3.0/Dockerfile b/influxdb/3.0-enterprise/Dockerfile
similarity index 100%
rename from influxdb3-enterprise/3.0/Dockerfile
rename to influxdb/3.0-enterprise/Dockerfile
diff --git a/influxdb3-enterprise/3.0/entrypoint.sh b/influxdb/3.0-enterprise/entrypoint.sh
similarity index 100%
rename from influxdb3-enterprise/3.0/entrypoint.sh
rename to influxdb/3.0-enterprise/entrypoint.sh