diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/dashboard.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/dashboard.yaml
index ad5ff89e..aee092f7 100644
--- a/freeleaps/helm-pkg/authentication/templates/authentication/dashboard.yaml
+++ b/freeleaps/helm-pkg/authentication/templates/authentication/dashboard.yaml
@@ -384,7 +384,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[30s]))",
+              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -720,7 +720,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -829,7 +829,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/dashboard.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/dashboard.yaml
index ad5ff89e..aee092f7 100644
--- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/dashboard.yaml
+++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/dashboard.yaml
@@ -384,7 +384,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[30s]))",
+              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -720,7 +720,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -829,7 +829,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
diff --git a/freeleaps/helm-pkg/chat/templates/chat/dashboard.yaml b/freeleaps/helm-pkg/chat/templates/chat/dashboard.yaml
index ad5ff89e..aee092f7 100644
--- a/freeleaps/helm-pkg/chat/templates/chat/dashboard.yaml
+++ b/freeleaps/helm-pkg/chat/templates/chat/dashboard.yaml
@@ -384,7 +384,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[30s]))",
+              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -720,7 +720,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -829,7 +829,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
diff --git a/freeleaps/helm-pkg/content/templates/content/dashboard.yaml b/freeleaps/helm-pkg/content/templates/content/dashboard.yaml
index ad5ff89e..aee092f7 100644
--- a/freeleaps/helm-pkg/content/templates/content/dashboard.yaml
+++ b/freeleaps/helm-pkg/content/templates/content/dashboard.yaml
@@ -384,7 +384,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[30s]))",
+              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -720,7 +720,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -829,7 +829,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/dashboard.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/dashboard.yaml
index ad5ff89e..aee092f7 100644
--- a/freeleaps/helm-pkg/devsvc/templates/devsvc/dashboard.yaml
+++ b/freeleaps/helm-pkg/devsvc/templates/devsvc/dashboard.yaml
@@ -384,7 +384,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[30s]))",
+              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -720,7 +720,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -829,7 +829,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
diff --git a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/dashboard.yaml b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/dashboard.yaml
index ad5ff89e..aee092f7 100644
--- a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/dashboard.yaml
+++ b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/dashboard.yaml
@@ -384,7 +384,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[30s]))",
+              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -720,7 +720,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -829,7 +829,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
diff --git a/freeleaps/helm-pkg/notification/templates/notification/dashboard.yaml b/freeleaps/helm-pkg/notification/templates/notification/dashboard.yaml
index ad5ff89e..aee092f7 100644
--- a/freeleaps/helm-pkg/notification/templates/notification/dashboard.yaml
+++ b/freeleaps/helm-pkg/notification/templates/notification/dashboard.yaml
@@ -384,7 +384,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[30s]))",
+              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -720,7 +720,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -829,7 +829,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
diff --git a/freeleaps/helm-pkg/payment/templates/payment/dashboard.yaml b/freeleaps/helm-pkg/payment/templates/payment/dashboard.yaml
index ad5ff89e..aee092f7 100644
--- a/freeleaps/helm-pkg/payment/templates/payment/dashboard.yaml
+++ b/freeleaps/helm-pkg/payment/templates/payment/dashboard.yaml
@@ -384,7 +384,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[30s]))",
+              "expr": "sum(rate({{ .Values.dashboard.metricsPrefix }}_http_requests_total{status=\"5xx\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -720,7 +720,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.9, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,
@@ -829,7 +829,7 @@ data:
                 "uid": "e4584a9f-5364-4b3d-a851-7abbc5250820"
               },
               "editorMode": "code",
-              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[30s]))",
+              "expr": "histogram_quantile(0.5, rate({{ .Values.dashboard.metricsPrefix }}_http_request_duration_seconds_bucket{handler!=\"none\"}[1m]))",
               "format": "time_series",
               "interval": "",
               "intervalFactor": 1,