diff --git a/pkg/models/metrics/metrics.go b/pkg/models/metrics/metrics.go
index ed15facef..880acc797 100644
--- a/pkg/models/metrics/metrics.go
+++ b/pkg/models/metrics/metrics.go
@@ -480,7 +480,7 @@ func collectWorkspaceMetric(monitoringRequest *client.MonitoringRequestParams, w
 		wg.Add(1)
 		go func(metricName string) {
 
-			queryType, params := AssembleSpecificWorkspaceMetricRequestInfo(monitoringRequest, namespaceArray, "", metricName)
+			queryType, params := AssembleSpecificWorkspaceMetricRequestInfo(monitoringRequest, namespaceArray, ".*", metricName)
 			metricsStr := client.SendMonitoringRequest(client.PrometheusEndpoint, queryType, params)
 			ch <- ReformatJson(metricsStr, metricName, map[string]string{ResultItemMetricResourceName: ws})
 			wg.Done()
diff --git a/pkg/models/metrics/metricsrule.go b/pkg/models/metrics/metricsrule.go
index 9b1a0f6a4..d5c5f2d1f 100644
--- a/pkg/models/metrics/metricsrule.go
+++ b/pkg/models/metrics/metricsrule.go
@@ -119,13 +119,9 @@ func MakeAllWorkspacesPromQL(metricsName, nsFilter string) string {
 func MakeSpecificWorkspacePromQL(metricsName, nsFilter string, workspace string) string {
 
 	var promql = RulePromQLTmplMap[metricsName]
-	nsFilter = "=~\"" + nsFilter + "\""
 
-	if workspace == "" {
-		workspace = "=~\".*\""
-	} else {
-		workspace = "=\"" + workspace + "\""
-	}
+	nsFilter = "=~\"" + nsFilter + "\""
+	workspace = "=~\"^(" + workspace + ")$\""
 
 	promql = strings.Replace(promql, "$1", nsFilter, -1)
 	promql = strings.Replace(promql, "$2", workspace, -1)