diff --git a/metrics-operator/controllers/common/providers/elk/elk.go b/metrics-operator/controllers/common/providers/elk/elk.go
index 636f520c49..7b03c1fd9d 100644
--- a/metrics-operator/controllers/common/providers/elk/elk.go
+++ b/metrics-operator/controllers/common/providers/elk/elk.go
@@ -1,121 +1,151 @@
 package elasticsearch
 
 import (
-    "context"
-    "encoding/json"
-    "fmt"
-    "strings"
-    "time"
-
-    "github.com/go-logr/logr"
-    metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1"
-    elastic "github.com/elastic/go-elasticsearch/v8"
-    "sigs.k8s.io/controller-runtime/pkg/client"
+	"context"
+	"encoding/json"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/go-logr/logr"
+	metricsapi "github.com/keptn/lifecycle-toolkit/metrics-operator/api/v1"
+	elastic "github.com/elastic/go-elasticsearch/v8"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 const (
-    warningLogStringElastic = "%s API returned warnings: %s"
+	warningLogStringElastic = "%s API returned warnings: %s"
+	defaultTimeRange        = 30 * time.Minute
 )
 
 type KeptnElasticProvider struct {
-    Log       logr.Logger
-    K8sClient client.Client
-    Elastic   *elastic.Client
+	Log       logr.Logger
+	K8sClient client.Client
+	Elastic   *elastic.Client
+}
+
+type ElasticsearchResponse struct {
+	Hits struct {
+		Total struct {
+			Value int `json:"value"`
+		} `json:"total"`
+	} `json:"hits"`
 }
 
 func NewElasticProvider(log logr.Logger, k8sClient client.Client, elasticURL string) (*KeptnElasticProvider, error) {
-    cfg := elastic.Config{
-        Addresses: []string{
-            elasticURL,
-        },
-    }
-    es, err := elastic.NewClient(cfg)
-    if err != nil {
-        return nil, fmt.Errorf("failed to create elasticsearch client: %w", err)
-    }
-
-    return &KeptnElasticProvider{
-        Log:       log,
-        K8sClient: k8sClient,
-        Elastic:   es,
-    }, nil
+	cfg := elastic.Config{
+		Addresses: []string{
+			elasticURL,
+		},
+	}
+	es, err := elastic.NewClient(cfg)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create elasticsearch client: %w", err)
+	}
+	return &KeptnElasticProvider{
+		Log:       log,
+		K8sClient: k8sClient,
+		Elastic:   es,
+	}, nil
 }
 
 func (r *KeptnElasticProvider) FetchAnalysisValue(ctx context.Context, query string, analysis metricsapi.Analysis, provider *metricsapi.KeptnMetricsProvider) (string, error) {
-    ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
-    defer cancel()
+	ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
+	defer cancel()
 
-    result, err := r.runElasticQuery(ctx, query, analysis.GetFrom(), analysis.GetTo())
-    if err != nil {
-        return "", err
-    }
+	result, err := r.runElasticQuery(ctx, query, analysis.GetFrom(), analysis.GetTo())
+	if err != nil {
+		return "", err
+	}
 
-    r.Log.Info(fmt.Sprintf("Elasticsearch query result: %v", result))
-    return r.extractMetric(result)
+	r.Log.Info(fmt.Sprintf("Elasticsearch query result: %v", result))
+	return r.extractMetric(result)
 }
 
 func (r *KeptnElasticProvider) EvaluateQuery(ctx context.Context, metric metricsapi.KeptnMetric, provider metricsapi.KeptnMetricsProvider) (string, []byte, error) {
-    ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
-    defer cancel()
+	ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
+	defer cancel()
 
-    result, err := r.runElasticQuery(ctx, metric.Spec.Query, time.Now().Add(-30*time.Minute), time.Now())
-    if err != nil {
-        return "", nil, err
-    }
+	timeRange := getTimeRangeFromSpec(metric.Spec.Range)
 
-    metricValue, err := r.extractMetric(result)
-    if err != nil {
-        return "", nil, err
-    }
+	result, err := r.runElasticQuery(ctx, metric.Spec.Query, time.Now().Add(-timeRange), time.Now())
+	if err != nil {
+		return "", nil, err
+	}
 
-    return metricValue, []byte{}, nil
-}
+	metricValue, err := r.extractMetric(result)
+	if err != nil {
+		return "", nil, err
+	}
 
-func (r *KeptnElasticProvider) runElasticQuery(ctx context.Context, query string, from, to time.Time) (map[string]interface{}, error) {
-    queryBody := fmt.Sprintf(`
-    {
-        "query": {
-            "range": {
-                "@timestamp": {
-                    "gte": "%s",
-                    "lte": "%s"
-                }
-            }
-        }
-    }`, from.Format(time.RFC3339), to.Format(time.RFC3339))
-
-    res, err := r.Elastic.Search(
-        r.Elastic.Search.WithContext(ctx),
-        r.Elastic.Search.WithBody(strings.NewReader(queryBody)),
-    )
-    if err != nil {
-        return nil, fmt.Errorf("failed to execute Elasticsearch query: %w", err)
-    }
-    defer res.Body.Close()
-
-    if warnings, ok := res.Header["Warning"]; ok {
-        r.Log.Info(fmt.Sprintf(warningLogStringElastic, "Elasticsearch", warnings))
-    }
-
-    var result map[string]interface{}
-    if err := json.NewDecoder(res.Body).Decode(&result); err != nil {
-        return nil, fmt.Errorf("failed to parse Elasticsearch response: %w", err)
-    }
-    return result, nil
+	return metricValue, []byte{}, nil
 }
 
-func (r *KeptnElasticProvider) extractMetric(result map[string]interface{}) (string, error) {
-    hits, ok := result["hits"].(map[string]interface{})
-    if !ok {
-        return "", fmt.Errorf("invalid result format: missing 'hits' field")
-    }
+func getTimeRangeFromSpec(rangeSpec *metricsapi.RangeSpec) time.Duration {
+	if rangeSpec == nil || rangeSpec.Interval == "" {
+		return defaultTimeRange
+	}
 
-    totalHits, ok := hits["total"].(map[string]interface{})
-    if !ok {
-        return "", fmt.Errorf("invalid result format: missing 'total' field in 'hits'")
-    }
+	duration, err := time.ParseDuration(rangeSpec.Interval)
+	if err != nil {
+		return defaultTimeRange
+	}
 
-    value := fmt.Sprintf("%v", totalHits["value"])
+	return duration
+}
 
-    return value, nil
+func (r *KeptnElasticProvider) runElasticQuery(ctx context.Context, query string, from, to time.Time) (map[string]interface{}, error) {
+	queryBody := fmt.Sprintf(`
+	{
+		"query": {
+			"bool": {
+				"must": [
+					%s,
+					{
+						"range": {
+							"@timestamp": {
+								"gte": "%s",
+								"lte": "%s"
+							}
+						}
+					}
+				]
+			}
+		}
+	}`, query, from.Format(time.RFC3339), to.Format(time.RFC3339))
+
+	res, err := r.Elastic.Search(
+		r.Elastic.Search.WithContext(ctx),
+		r.Elastic.Search.WithBody(strings.NewReader(queryBody)),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to execute Elasticsearch query: %w", err)
+	}
+	defer res.Body.Close()
+
+	if warnings, ok := res.Header["Warning"]; ok {
+		r.Log.Info(fmt.Sprintf(warningLogStringElastic, "Elasticsearch", warnings))
+	}
+
+	var result map[string]interface{}
+	if err := json.NewDecoder(res.Body).Decode(&result); err != nil {
+		return nil, fmt.Errorf("failed to parse Elasticsearch response: %w", err)
+	}
+
+	return result, nil
 }
+
+func (r *KeptnElasticProvider) extractMetric(result map[string]interface{}) (string, error) {
+	var response ElasticsearchResponse
+	jsonData, err := json.Marshal(result)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal result: %w", err)
+	}
+
+	if err := json.Unmarshal(jsonData, &response); err != nil {
+		return "", fmt.Errorf("failed to unmarshal result into struct: %w", err)
+	}
+
+	value := fmt.Sprintf("%d", response.Hits.Total.Value)
+	return value, nil
+}
\ No newline at end of file