diff --git a/deploy/kubernetes/platform/values.yaml b/deploy/kubernetes/platform/values.yaml
index a747ab7f8f..12ec40d040 100644
--- a/deploy/kubernetes/platform/values.yaml
+++ b/deploy/kubernetes/platform/values.yaml
@@ -10,6 +10,9 @@ kafka:
     zookeeperConnectionTimeoutMs: 6000
 
 druid:
+    image:
+    tag: 0.21.1-rc2
+
     configVars:
 
         # To store data on local disks attached
diff --git a/pkg/query-service/druidQuery/mysql-query.go b/pkg/query-service/druidQuery/mysql-query.go
index 07fd7ed251..c262f39002 100644
--- a/pkg/query-service/druidQuery/mysql-query.go
+++ b/pkg/query-service/druidQuery/mysql-query.go
@@ -517,7 +517,7 @@ func GetServices(client *SqlClient, query *model.GetServicesParams) (*[]model.Se
 
 func GetServiceMapDependencies(client *SqlClient, query *model.GetServicesParams) (*[]model.ServiceMapDependencyResponseItem, error) {
 
-	sqlQuery := fmt.Sprintf(`SELECT SpanId, ParentSpanId, ServiceName FROM %s WHERE "__time" >= '%s' AND "__time" <= '%s' ORDER BY __time DESC`, constants.DruidDatasource, query.StartTime, query.EndTime)
+	sqlQuery := fmt.Sprintf(`SELECT SpanId, ParentSpanId, ServiceName FROM %s WHERE "__time" >= '%s' AND "__time" <= '%s' ORDER BY __time DESC LIMIT 100000`, constants.DruidDatasource, query.StartTime, query.EndTime)
 
 	// zap.S().Debug(sqlQuery)
 
diff --git a/pkg/query-service/test/clickhouse/clickhouse.go b/pkg/query-service/test/clickhouse/clickhouse.go
deleted file mode 100644
index 6dff517a86..0000000000
--- a/pkg/query-service/test/clickhouse/clickhouse.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package clickhouse
-
-type ClickHouseReader struct {
-	ClickHouseClientUrl string
-}
-
-func connect() string {
-	return "Connected to ClickHouse"
-}
-
-func NewSpanReader() *ClickHouseReader {
-	connect()
-	return &ClickHouseReader{
-		ClickHouseClientUrl: "http://localhost:9000",
-	}
-}
-
-func (chReader *ClickHouseReader) GetServices() string {
-	return "Hello from ClickHouse"
-}
diff --git a/pkg/query-service/test/druid/druid.go b/pkg/query-service/test/druid/druid.go
deleted file mode 100644
index 252966944a..0000000000
--- a/pkg/query-service/test/druid/druid.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package druid
-
-type DruidReader struct {
-	DruidClientUrl string
-}
-
-func connect() string {
-	return "Connected to Druid"
-}
-
-func NewSpanReader() *DruidReader {
-	connect()
-	return &DruidReader{
-		DruidClientUrl: "http://localhost:8888",
-	}
-}
-
-func (druidReader *DruidReader) GetServices() string {
-	return "Hello from Druid"
-}
diff --git a/pkg/query-service/test/test.go b/pkg/query-service/test/test.go
deleted file mode 100644
index 755851a374..0000000000
--- a/pkg/query-service/test/test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"go.signoz.io/query-service/test/clickhouse"
-	"go.signoz.io/query-service/test/druid"
-)
-
-type StorageReader interface {
-	GetServices() string
-}
-
-func main() {
-	storage := os.Getenv("STORAGE")
-	var client StorageReader
-
-	if storage == "druid" {
-		client = druid.NewSpanReader()
-	} else if storage == "clickhouse" {
-		client = clickhouse.NewSpanReader()
-	}
-
-	services := client.GetServices()
-	fmt.Println(services)
-}