diff --git a/pkg/cluster/ClusterServiceExtended.go b/pkg/cluster/ClusterServiceExtended.go
index d1efda3b3a..812cd37f91 100644
--- a/pkg/cluster/ClusterServiceExtended.go
+++ b/pkg/cluster/ClusterServiceExtended.go
@@ -267,7 +267,8 @@ func (impl *ClusterServiceImplExtended) CreateGrafanaDataSource(clusterBean *bea
 	if grafanaDatasourceId == 0 {
 		//starts grafana creation
 		// appending envId to ensure unique datasource name for each environment (ex- env got deleted and created with same name)
-		DataSourceName := "Prometheus-" + env.Name + "-EnvId-" + fmt.Sprint(env.Id)
+		// reverting to old name will be done in next release
+		DataSourceName := "Prometheus-" + env.Name
 		createDatasourceReq := grafana.CreateDatasourceRequest{
 			Name:      DataSourceName,
 			Type:      "prometheus",