diff --git a/grafana/files/dashboards/apache/apache_prometheus.json b/grafana/files/dashboards/apache/apache_prometheus.json
index eb2374f..9fc40d8 100644
--- a/grafana/files/dashboards/apache/apache_prometheus.json
+++ b/grafana/files/dashboards/apache/apache_prometheus.json
@@ -1769,7 +1769,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "irate(apache_TotalkBytes{environment=\"$environment\", host=~\"$host\"}[1m])",
+          "expr": "irate(apache_TotalkBytes{environment=\"$environment\", host=~\"$host\"}[$rate_interval])",
           "format": "time_series",
           "intervalFactor": 2,
           "legendFormat": "{{ host }}",
diff --git a/grafana/files/dashboards/jenkins/jenkins_prometheus.json b/grafana/files/dashboards/jenkins/jenkins_prometheus.json
index e7a1f4a..9cb0257 100644
--- a/grafana/files/dashboards/jenkins/jenkins_prometheus.json
+++ b/grafana/files/dashboards/jenkins/jenkins_prometheus.json
@@ -987,7 +987,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "rate(jenkins_job_building_duration_count{environment=\"$environment\",host=~\"$host\"}[1m])",
+          "expr": "rate(jenkins_job_building_duration_count{environment=\"$environment\",host=~\"$host\"}[$rate_interval])",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A",
@@ -1070,7 +1070,7 @@
       "tableColumn": "",
       "targets": [
         {
-          "expr": "rate(jenkins_job_queuing_duration_count{environment=\"$environment\",host=~\"$host\"}[1m])",
+          "expr": "rate(jenkins_job_queuing_duration_count{environment=\"$environment\",host=~\"$host\"}[$rate_interval])",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A",
@@ -1331,6 +1331,54 @@
         "tagsQuery": "",
         "type": "query",
         "useTags": false
+      },
+      {
+        "auto": false,
+        "auto_count": 30,
+        "auto_min": "10s",
+        "current": {
+          "selected": true,
+          "text": "3m",
+          "value": "3m"
+        },
+        "hide": 0,
+        "label": null,
+        "name": "rate_interval",
+        "options": [
+          {
+            "selected": false,
+            "text": "1m",
+            "value": "1m"
+          },
+          {
+            "selected": false,
+            "text": "2m",
+            "value": "2m"
+          },
+          {
+            "selected": true,
+            "text": "3m",
+            "value": "3m"
+          },
+          {
+            "selected": false,
+            "text": "5m",
+            "value": "5m"
+          },
+          {
+            "selected": false,
+            "text": "10m",
+            "value": "10m"
+          },
+          {
+            "selected": false,
+            "text": "15m",
+            "value": "15m"
+          }
+        ],
+        "query": "1m,2m,3m,5m,10m,15m",
+        "refresh": 2,
+        "type": "interval"
       }
     ]
   },