diff --git a/connectcluster/connectcluster-connect.json b/connectcluster/connectcluster-connect.json
index 45d66e5..ac7fdb9 100644
--- a/connectcluster/connectcluster-connect.json
+++ b/connectcluster/connectcluster-connect.json
@@ -749,7 +749,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "kafka_connect_app_info{instance=~\"$instance\",start_time_ms!=\"\"}",
+          "expr": "kafka_connect_app_info{instance=~\"$instance\"}",
           "hide": false,
           "interval": "",
           "legendFormat": "",
@@ -781,7 +781,7 @@
           "refId": "D"
         },
         {
-          "expr": "sum by (pod) (kafka_connect_worker__connector_startup_failure_total{namespace=~\"$namespace\",pod=~\"$app-.+$\"})",
+          "expr": "sum by (pod) (kafka_connect_worker_connector_startup_failure_total{namespace=~\"$namespace\",pod=~\"$app-.+$\"})",
           "format": "table",
           "instant": true,
           "interval": "",
diff --git a/hack/scripts/check-dashboard.sh b/hack/scripts/check-dashboard.sh
index 932fd98..14c4aa2 100644
--- a/hack/scripts/check-dashboard.sh
+++ b/hack/scripts/check-dashboard.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+#set -e
 
 declare -A kind=(["connectcluster"]="ConnectCluster" ["druid"]="Druid" ["elasticsearch"]="Elasticsearch" ["kafka"]="Kafka" ["mariadb"]="MariaDB"
             ["mongodb"]="MongoDB" ["mysql"]="MySQL" ["perconaxtradb"]="PerconaXtraDB" ["pgpool"]="Pgpool" ["postgres"]="Postgres" ["proxysql"]="ProxySQL"
@@ -23,7 +23,7 @@ create_db_dependencies() {
     echo "folder=$folder"
     if [ "$folder" == "druid" ]; then
         kubectl create configmap -n demo my-init-script \
-          --from-literal=init.sql="$(curl -fsSL https://raw.githubusercontent.com/kubedb/samples/old-dbs/druid/monitoring/mysql-init-script.sql)"
+          --from-literal=init.sql="$(curl -fsSL https://raw.githubusercontent.com/kubedb/samples/master/druid/monitoring/mysql-init-script.sql)"
 
         helm repo add minio https://operator.min.io/
         helm upgrade --install --namespace "minio-operator" --create-namespace "minio-operator" minio/operator --set operator.replicaCount=1 --wait
@@ -59,14 +59,24 @@ create_db_dependencies() {
         kubectl apply -f ../samples/solr/monitoring/zookeeper.yaml
         kubectl wait --for=jsonpath='{.status.phase}'=Ready ZooKeeper zookeeper -n demo --timeout=10m
     fi
-}
 
-delete_db_dependencies() {
+    if [ "$folder" == "connectcluster" ]; then
+        kubectl apply -f ../samples/kafka/connectcluster/monitoring/kafka.yaml
+        kubectl wait --for=jsonpath='{.status.phase}'=Ready Kafka kafka -n demo --timeout=10m
+
+        kubectl apply -f ../samples/kafka/connectcluster/monitoring/connectcluster.yaml
+        kubectl wait --for=jsonpath='{.status.phase}'=Ready ConnectCluster connectcluster -n demo --timeout=10m
+    fi
+}
 
+cleanup() {
+  path="$1"
+  kubectl delete -f $path
+  kubectl delete secret -n demo --all
 }
 
 check_dashboard_for_non_dbs() {
-    sleep 30s # waiting for the metrics to be generated
+    sleep 60s # waiting for the metrics to be generated
     folder="$1"
     inside_files_array="$2"
     for file in "${inside_files_array[@]}"; do
@@ -99,7 +109,7 @@ for folder in "${folder_array[@]}"; do
     kubectl apply -f $path
     kubectl wait --for=jsonpath='{.status.phase}'=Ready ${kind[$folder]} $folder -n demo --timeout=10m
 
-    sleep 30s
+    sleep 60s
     for file in "${inside_files_array[@]}"; do
       if [[ $file == *.json ]]; then
         dashboard_name="${file::-5}"
@@ -107,9 +117,8 @@ for folder in "${folder_array[@]}"; do
         $HOME/go/bin/kubectl-dba monitor dashboard $folder $folder -n demo $dashboard_name --prom-svc-name=prometheus-kube-prometheus-prometheus --prom-svc-namespace=monitoring --prom-svc-port=9090
       fi
     done
+    cleanup "$path"
 
-    kubectl delete -f $path
-    delete_db_dependencies "$folder"
   elif [ "$folder" == "stash" ]; then
     echo "non db object name: $folder"
     readarray -t inside_files_array < <(ls "$folder")
@@ -117,10 +126,7 @@ for folder in "${folder_array[@]}"; do
     bash ./hack/scripts/stash-flow.sh
     check_dashboard_for_non_dbs "$folder" "$inside_files_array"
 
-    kubectl delete -f ./hack/yamls/backupconfiguration.yaml
-    kubectl delete -f ./hack/yamls/restoresession.yaml
-    kubectl delete -f ./hack/yamls/repository.yaml
-    kubectl delete -f ../samples/mongodb/monitoring/mongodb_standalone.yaml
+    cleanup "./hack/yamls/stash"
 
   elif [ "$folder" == "policy" ]; then
     echo "non db object name: $folder"
@@ -129,7 +135,7 @@ for folder in "${folder_array[@]}"; do
     bash ./hack/scripts/policy-flow.sh
     check_dashboard_for_non_dbs "$folder" "$inside_files_array"
 
-    kubectl delete -f ./hack/yamls/policy/constraint-template.yaml
-    kubectl delete -f ./hack/yamls/policy/constraint.yaml
+    cleanup "./hack/yamls/policy"
   fi
+
 done
\ No newline at end of file
diff --git a/hack/scripts/stash-flow.sh b/hack/scripts/stash-flow.sh
index 0c92c1d..a09cb8b 100644
--- a/hack/scripts/stash-flow.sh
+++ b/hack/scripts/stash-flow.sh
@@ -39,7 +39,7 @@ curl -o kubectl-stash.tar.gz -fsSL https://github.com/stashed/cli/releases/downl
 kubectl apply -f ./hack/yamls/stash/repository.yaml
 sleep 10
 
-kubectl apply -f ../samples/mongodb/monitoring/mongodb_standalone.yaml
+kubectl apply -f ./hack/yamls/stash/mongodb_standalone.yaml
 kubectl wait --for=jsonpath='{.status.phase}'=Ready MongoDB mongodb-standalone -n demo --timeout=10m
 
 kubectl apply -f ./hack/yamls/stash/backupconfiguration.yaml
diff --git a/hack/yamls/stash/mongodb_standalone.yaml b/hack/yamls/stash/mongodb_standalone.yaml
new file mode 100644
index 0000000..9ea8b3c
--- /dev/null
+++ b/hack/yamls/stash/mongodb_standalone.yaml
@@ -0,0 +1,22 @@
+apiVersion: kubedb.com/v1alpha2
+kind: MongoDB
+metadata:
+  name: mongodb-standalone
+  namespace: demo
+spec:
+  version: "4.4.26"
+  terminationPolicy: WipeOut
+  storage:
+    storageClassName: "standard"
+    accessModes:
+      - ReadWriteOnce
+    resources:
+      requests:
+        storage: 1Gi
+  monitor:
+    agent: prometheus.io/operator
+    prometheus:
+      serviceMonitor:
+        labels:
+          release: prometheus
+        interval: 10s
\ No newline at end of file