diff --git a/dashboards/magento-business-insights/magentoBI.json b/dashboards/magento-business-insights/magentoBI.json
index feea2f1a47..45f485c7ec 100644
--- a/dashboards/magento-business-insights/magentoBI.json
+++ b/dashboards/magento-business-insights/magentoBI.json
@@ -3592,8 +3592,8 @@
 			  },
 			  "nrqlQueries": [
 				{
-				  "accountId": 0,
-				  "query": "SELECT latest(host.cpuPercent) AS 'CPU used %' FROM Metric TIMESERIES"
+				  "accountIds": [],
+				  "query": "SELECT latest(host.cpuPercent) AS 'CPU used %' FROM Metric WHERE entity.name IN ({{hostName}}) TIMESERIES"
 				}
 			  ],
 			  "platformOptions": {
@@ -3622,8 +3622,8 @@
 			  },
 			  "nrqlQueries": [
 				{
-				  "accountId": 0,
-				  "query": "SELECT latest(host.memoryUsedPercent) AS 'Memory used %' FROM Metric TIMESERIES"
+				  "accountIds": [],
+				  "query": "SELECT latest(host.memoryUsedPercent) AS 'Memory used %' FROM Metric WHERE entity.name IN ({{hostName}}) TIMESERIES"
 				}
 			  ],
 			  "platformOptions": {
@@ -3652,8 +3652,8 @@
 			  },
 			  "nrqlQueries": [
 				{
-				  "accountId": 0,
-				  "query": "SELECT latest(host.disk.usedPercent) as 'Storage used %' FROM Metric TIMESERIES"
+				  "accountIds": [],
+				  "query": "SELECT latest(host.disk.usedPercent) as 'Storage used %' FROM Metric WHERE entity.name IN ({{hostName}}) TIMESERIES"
 				}
 			  ],
 			  "platformOptions": {
@@ -3679,8 +3679,8 @@
 			  },
 			  "nrqlQueries": [
 				{
-				  "accountId": 0,
-				  "query": "SELECT latest(host.disk.usedPercent) as 'Used %' FROM Metric FACET device"
+				  "accountIds": [],
+				  "query": "SELECT latest(host.disk.usedPercent) as 'Used %' FROM Metric  WHERE entity.name IN ({{hostName}}) FACET device"
 				}
 			  ],
 			  "platformOptions": {
@@ -5416,6 +5416,25 @@
 		"type": "NRQL",
 		"isMultiSelection": true,
 		"replacementStrategy": "STRING"
+	  },
+	  {
+		"name": "hostName",
+		"items": null,
+		"defaultValues": [
+		  {
+			"value": {
+			  "string": "ip-172-31-8-210"
+			}
+		  }
+		],
+		"nrqlQuery": {
+		  "accountIds": [],
+		  "query": "SELECT uniques(entity.name) FROM Metric since 1 month ago"
+		},
+		"title": "Host",
+		"type": "NRQL",
+		"isMultiSelection": true,
+		"replacementStrategy": "STRING"
 	  }
 	]
   }
\ No newline at end of file
diff --git a/dashboards/magento-business-insights/magentoBI01.png b/dashboards/magento-business-insights/magentoBI001.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI01.png
rename to dashboards/magento-business-insights/magentoBI001.png
diff --git a/dashboards/magento-business-insights/magentoBI02.png b/dashboards/magento-business-insights/magentoBI002.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI02.png
rename to dashboards/magento-business-insights/magentoBI002.png
diff --git a/dashboards/magento-business-insights/magentoBI03.png b/dashboards/magento-business-insights/magentoBI003.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI03.png
rename to dashboards/magento-business-insights/magentoBI003.png
diff --git a/dashboards/magento-business-insights/magentoBI04a.png b/dashboards/magento-business-insights/magentoBI004.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI04a.png
rename to dashboards/magento-business-insights/magentoBI004.png
diff --git a/dashboards/magento-business-insights/magentoBI05.png b/dashboards/magento-business-insights/magentoBI005.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI05.png
rename to dashboards/magento-business-insights/magentoBI005.png
diff --git a/dashboards/magento-business-insights/magentoBI06.png b/dashboards/magento-business-insights/magentoBI006.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI06.png
rename to dashboards/magento-business-insights/magentoBI006.png
diff --git a/dashboards/magento-business-insights/magentoBI07.png b/dashboards/magento-business-insights/magentoBI007.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI07.png
rename to dashboards/magento-business-insights/magentoBI007.png
diff --git a/dashboards/magento-business-insights/magentoBI08a.png b/dashboards/magento-business-insights/magentoBI008.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI08a.png
rename to dashboards/magento-business-insights/magentoBI008.png
diff --git a/dashboards/magento-business-insights/magentoBI09a.png b/dashboards/magento-business-insights/magentoBI009.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI09a.png
rename to dashboards/magento-business-insights/magentoBI009.png
diff --git a/dashboards/magento-business-insights/magentoBI10.png b/dashboards/magento-business-insights/magentoBI010.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI10.png
rename to dashboards/magento-business-insights/magentoBI010.png
diff --git a/dashboards/magento-business-insights/magentoBI11.png b/dashboards/magento-business-insights/magentoBI011.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI11.png
rename to dashboards/magento-business-insights/magentoBI011.png
diff --git a/dashboards/magento-business-insights/magentoBI12.png b/dashboards/magento-business-insights/magentoBI012.png
similarity index 100%
rename from dashboards/magento-business-insights/magentoBI12.png
rename to dashboards/magento-business-insights/magentoBI012.png