diff --git a/chart/kubedb-catalog/templates/elasticsearch.yaml b/chart/kubedb-catalog/templates/elasticsearch.yaml
index e1a52fa6c..0cd02e36c 100644
--- a/chart/kubedb-catalog/templates/elasticsearch.yaml
+++ b/chart/kubedb-catalog/templates/elasticsearch.yaml
@@ -36,7 +36,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6-v1"
+    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -75,7 +75,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6.4-v1"
+    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:5.6.4-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -114,7 +114,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2.4-v1"
+    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2.4-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -153,7 +153,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2-v1"
+    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.2-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -192,7 +192,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3.0-v1"
+    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3.0-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -231,7 +231,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3-v1"
+    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.3-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -250,7 +250,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4.0"
+    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4.0-v1"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -269,6 +269,6 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4"
+    image: "{{ .Values.dockerRegistry }}/elasticsearch-tools:6.4-v1"
 
 {{ end }}
diff --git a/chart/kubedb-catalog/templates/mongodb.yaml b/chart/kubedb-catalog/templates/mongodb.yaml
index 84711409d..daf8345b9 100644
--- a/chart/kubedb-catalog/templates/mongodb.yaml
+++ b/chart/kubedb-catalog/templates/mongodb.yaml
@@ -36,7 +36,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0"
   tools:
-    image: "{{ .Values.dockerRegistry }}/mongo-tools:3.4-v1"
+    image: "{{ .Values.dockerRegistry }}/mongo-tools:3.4-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -75,5 +75,5 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/mongodb_exporter:v1.0.0"
   tools:
-    image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6-v1"
+    image: "{{ .Values.dockerRegistry }}/mongo-tools:3.6-v2"
 {{ end }}
diff --git a/chart/kubedb-catalog/templates/mysql.yaml b/chart/kubedb-catalog/templates/mysql.yaml
index 24ec4d4bd..798d949dc 100644
--- a/chart/kubedb-catalog/templates/mysql.yaml
+++ b/chart/kubedb-catalog/templates/mysql.yaml
@@ -36,7 +36,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0"
   tools:
-    image: "{{ .Values.dockerRegistry }}/mysql-tools:5-v1"
+    image: "{{ .Values.dockerRegistry }}/mysql-tools:5-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -75,7 +75,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0"
   tools:
-    image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7-v1"
+    image: "{{ .Values.dockerRegistry }}/mysql-tools:5.7-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -114,7 +114,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0"
   tools:
-    image: "{{ .Values.dockerRegistry }}/mysql-tools:8-v1"
+    image: "{{ .Values.dockerRegistry }}/mysql-tools:8-v2"
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: MySQLVersion
@@ -152,5 +152,5 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/mysqld-exporter:v0.11.0"
   tools:
-    image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0-v1"
+    image: "{{ .Values.dockerRegistry }}/mysql-tools:8.0-v2"
 {{ end }}
diff --git a/chart/kubedb-catalog/templates/postgres.yaml b/chart/kubedb-catalog/templates/postgres.yaml
index 517d75852..baaab9e5e 100644
--- a/chart/kubedb-catalog/templates/postgres.yaml
+++ b/chart/kubedb-catalog/templates/postgres.yaml
@@ -36,7 +36,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6"
   tools:
-    image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6-v1"
+    image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -75,7 +75,7 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6"
   tools:
-    image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6.7-v1"
+    image: "{{ .Values.dockerRegistry }}/postgres-tools:9.6.7-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -114,5 +114,5 @@ spec:
   exporter:
     image: "{{ .Values.dockerRegistry }}/postgres_exporter:v0.4.6"
   tools:
-    image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2-v1"
+    image: "{{ .Values.dockerRegistry }}/postgres-tools:10.2-v2"
 {{ end }}
diff --git a/hack/deploy/kubedb-catalog/elasticsearch.yaml b/hack/deploy/kubedb-catalog/elasticsearch.yaml
index ed4f2630c..63bb72ef1 100644
--- a/hack/deploy/kubedb-catalog/elasticsearch.yaml
+++ b/hack/deploy/kubedb-catalog/elasticsearch.yaml
@@ -29,7 +29,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -62,7 +62,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:5.6.4-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -95,7 +95,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -128,7 +128,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2.4-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.2.4-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -161,7 +161,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -194,7 +194,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.3.0-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -210,7 +210,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4"
+    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4-v1"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -226,4 +226,4 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch_exporter:1.0.2"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4.0"
+    image: "${KUBEDB_DOCKER_REGISTRY}/elasticsearch-tools:6.4.0-v1"
diff --git a/hack/deploy/kubedb-catalog/mongodb.yaml b/hack/deploy/kubedb-catalog/mongodb.yaml
index 59382bad6..a1a03fb18 100644
--- a/hack/deploy/kubedb-catalog/mongodb.yaml
+++ b/hack/deploy/kubedb-catalog/mongodb.yaml
@@ -29,7 +29,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.4-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -62,5 +62,5 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/mongodb_exporter:v1.0.0"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/mongo-tools:3.6-v2"
 
diff --git a/hack/deploy/kubedb-catalog/mysql.yaml b/hack/deploy/kubedb-catalog/mysql.yaml
index 4a316a7ca..2c9fdec87 100644
--- a/hack/deploy/kubedb-catalog/mysql.yaml
+++ b/hack/deploy/kubedb-catalog/mysql.yaml
@@ -29,7 +29,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -62,7 +62,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5.7-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:5.7-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -95,7 +95,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -128,4 +128,4 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/mysqld-exporter:v0.11.0"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/mysql-tools:8.0-v2"
diff --git a/hack/deploy/kubedb-catalog/postgres.yaml b/hack/deploy/kubedb-catalog/postgres.yaml
index 6ef369caf..cb760a516 100644
--- a/hack/deploy/kubedb-catalog/postgres.yaml
+++ b/hack/deploy/kubedb-catalog/postgres.yaml
@@ -29,7 +29,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -62,7 +62,7 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6.7-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:9.6.7-v2"
 
 ---
 apiVersion: catalog.kubedb.com/v1alpha1
@@ -95,4 +95,4 @@ spec:
   exporter:
     image: "${KUBEDB_DOCKER_REGISTRY}/postgres_exporter:v0.4.6"
   tools:
-    image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2-v1"
+    image: "${KUBEDB_DOCKER_REGISTRY}/postgres-tools:10.2-v2"