diff --git a/build/charts/theia/crds/clickhouse-operator-install-bundle.yaml b/build/charts/theia/crds/clickhouse-operator-install-bundle.yaml
index bb9f850d0..86f30a952 100644
--- a/build/charts/theia/crds/clickhouse-operator-install-bundle.yaml
+++ b/build/charts/theia/crds/clickhouse-operator-install-bundle.yaml
@@ -3466,9 +3466,9 @@ stringData:
 #
 # NAMESPACE=kube-system
 # COMMENT=
-# OPERATOR_IMAGE=projects.registry.vmware.com/antrea/theia-clickhouse-operator:0.21.0
+# OPERATOR_IMAGE=projects.registry.vmware.com/antrea/clickhouse-operator:0.21.0
 # OPERATOR_IMAGE_PULL_POLICY=Always
-# METRICS_EXPORTER_IMAGE=projects.registry.vmware.com/antrea/theia-clickhouse-operator:0.21.0
+# METRICS_EXPORTER_IMAGE=projects.registry.vmware.com/antrea/clickhouse-operator:0.21.0
 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
 #
 # Setup Deployment for clickhouse-operator
@@ -3513,7 +3513,7 @@ spec:
             name: etc-clickhouse-operator-usersd-files
       containers:
         - name: clickhouse-operator
-          image: projects.registry.vmware.com/antrea/theia-clickhouse-operator:0.21.0
+          image: projects.registry.vmware.com/antrea/clickhouse-operator:0.21.0
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: etc-clickhouse-operator-folder
@@ -3578,7 +3578,7 @@ spec:
                   resource: limits.memory
 
         - name: metrics-exporter
-          image: projects.registry.vmware.com/antrea/theia-metrics-exporter:0.21.0
+          image: projects.registry.vmware.com/antrea/metrics-exporter:0.21.0
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: etc-clickhouse-operator-folder
diff --git a/ci/jenkins/test-vmc.sh b/ci/jenkins/test-vmc.sh
index 1a4cc1b74..518710731 100644
--- a/ci/jenkins/test-vmc.sh
+++ b/ci/jenkins/test-vmc.sh
@@ -394,8 +394,8 @@ function deliver_antrea {
         ssh-keygen -f "/var/lib/jenkins/.ssh/known_hosts" -R ${IPs[$i]}
         copy_image antrea-ubuntu.tar docker.io/antrea/antrea-ubuntu ${IPs[$i]} latest true
         copy_image flow-aggregator.tar docker.io/antrea/flow-aggregator ${IPs[$i]} latest  true
-        copy_image theia-clickhouse-operator.tar projects.registry.vmware.com/antrea/theia-clickhouse-operator  ${IPs[$i]} $image_tag true
-        copy_image theia-metrics-exporter.tar projects.registry.vmware.com/antrea/theia-metrics-exporter  ${IPs[$i]} $image_tag true
+        copy_image clickhouse-operator.tar projects.registry.vmware.com/antrea/clickhouse-operator  ${IPs[$i]} $image_tag true
+        copy_image metrics-exporter.tar projects.registry.vmware.com/antrea/metrics-exporter  ${IPs[$i]} $image_tag true
         copy_image theia-zookeeper.tar projects.registry.vmware.com/antrea/theia-zookeeper  ${IPs[$i]} 3.8.0 true
         copy_image theia-spark-operator.tar projects.registry.vmware.com/antrea/theia-spark-operator ${IPs[$i]} v1beta2-1.3.3-3.1.1 true
         copy_image theia-spark-jobs.tar projects.registry.vmware.com/antrea/theia-spark-jobs ${IPs[$i]} latest true
diff --git a/ci/kind/test-e2e-kind.sh b/ci/kind/test-e2e-kind.sh
index 943918858..b7237550a 100755
--- a/ci/kind/test-e2e-kind.sh
+++ b/ci/kind/test-e2e-kind.sh
@@ -109,8 +109,8 @@ COMMON_IMAGES_LIST=("registry.k8s.io/e2e-test-images/agnhost:2.29" \
                     "projects.registry.vmware.com/antrea/perftool" \
                     "antrea/antrea-ubuntu:latest" \
                     "antrea/flow-aggregator:latest" \
-                    "projects.registry.vmware.com/antrea/theia-clickhouse-operator:0.21.0" \
-                    "projects.registry.vmware.com/antrea/theia-metrics-exporter:0.21.0" \
+                    "projects.registry.vmware.com/antrea/clickhouse-operator:0.21.0" \
+                    "projects.registry.vmware.com/antrea/metrics-exporter:0.21.0" \
                     "projects.registry.vmware.com/antrea/theia-zookeeper:3.8.0" \
                     "projects.registry.vmware.com/antrea/theia-grafana:8.3.3" \
                     "projects.registry.vmware.com/antrea/theia-spark-operator:v1beta2-1.3.3-3.1.1")
diff --git a/ci/kind/test-upgrade-theia.sh b/ci/kind/test-upgrade-theia.sh
index 97acef4c0..8b0b83923 100755
--- a/ci/kind/test-upgrade-theia.sh
+++ b/ci/kind/test-upgrade-theia.sh
@@ -181,10 +181,10 @@ DOCKER_IMAGES=("registry.k8s.io/e2e-test-images/agnhost:2.29" \
                 "projects.registry.vmware.com/antrea/busybox"  \
                 "projects.registry.vmware.com/antrea/nginx:1.21.6-alpine" \
                 "projects.registry.vmware.com/antrea/perftool" \
-                "projects.registry.vmware.com/antrea/theia-clickhouse-operator:$CH_OPERATOR_TAG" \
-                "projects.registry.vmware.com/antrea/theia-metrics-exporter:$CH_OPERATOR_TAG" \
-                "projects.registry.vmware.com/antrea/theia-clickhouse-operator:0.21.0" \
-                "projects.registry.vmware.com/antrea/theia-metrics-exporter:0.21.0" \
+                "projects.registry.vmware.com/antrea/clickhouse-operator:$CH_OPERATOR_TAG" \
+                "projects.registry.vmware.com/antrea/metrics-exporter:$CH_OPERATOR_TAG" \
+                "projects.registry.vmware.com/antrea/clickhouse-operator:0.21.0" \
+                "projects.registry.vmware.com/antrea/metrics-exporter:0.21.0" \
                 "projects.registry.vmware.com/antrea/theia-zookeeper:3.8.0" \
                 "projects.registry.vmware.com/antrea/theia-grafana:8.3.3" \
                 "projects.registry.vmware.com/antrea/antrea-ubuntu:$ANTREA_FROM_TAG" \