diff --git a/dashboards/ghes_dashboards/main.tf b/dashboards/ghes_dashboards/main.tf
index 881426b..d48d3c6 100644
--- a/dashboards/ghes_dashboards/main.tf
+++ b/dashboards/ghes_dashboards/main.tf
@@ -1,3 +1,1406 @@
 resource "dynatrace_json_dashboard" "this" {
-    contents = var.dashboard_json
+  contents = <<EOT
+{
+    "metadata": {
+      "configurationVersions": [
+        7
+      ],
+      "clusterVersion": "1.305.88.20250104-012102"
+    },
+    "id": "404588b4-96d3-4f24-a79c-aa18b3ef729b",
+    "dashboardMetadata": {
+      "name": "GHES Monitoring Dashboard",
+      "shared": false,
+      "owner": "e-Mohammed.Shareef42@eng.homeoffice.gov.uk",
+      "popularity": 1,
+      "hasConsistentColors": false
+    },
+    "tiles": [
+      {
+        "name": "Host Performance ",
+        "tileType": "HEADER",
+        "configured": true,
+        "bounds": {
+          "top": 0,
+          "left": 0,
+          "width": 304,
+          "height": 38
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false
+      },
+      {
+        "name": "Process Analysis",
+        "tileType": "HEADER",
+        "configured": true,
+        "bounds": {
+          "top": 342,
+          "left": 0,
+          "width": 304,
+          "height": 38
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false
+      },
+      {
+        "name": "Disk Analysis",
+        "tileType": "HEADER",
+        "configured": true,
+        "bounds": {
+          "top": 646,
+          "left": 0,
+          "width": 304,
+          "height": 38
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false
+      },
+      {
+        "name": "CPU usage",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 38,
+          "left": 0,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "CPU usage",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.cpu.idle:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "B",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.cpu.iowait:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "C",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.cpu.user:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "D",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.cpu.system:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "E",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.cpu.steal:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "F",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.cpu.other:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "STACKED_AREA",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "GRAY",
+                "seriesType": "AREA"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "B:",
+              "properties": {
+                "color": "DEFAULT",
+                "seriesType": "AREA"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "C:",
+              "properties": {
+                "color": "DEFAULT",
+                "seriesType": "AREA"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "D:",
+              "properties": {
+                "color": "DEFAULT",
+                "seriesType": "AREA"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "E:",
+              "properties": {
+                "color": "DEFAULT",
+                "seriesType": "AREA"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "F:",
+              "properties": {
+                "color": "DEFAULT",
+                "seriesType": "AREA"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": [
+              {
+                "visible": true,
+                "min": "0",
+                "max": "100.00001",
+                "position": "LEFT",
+                "queryIds": [
+                  "A",
+                  "B",
+                  "C",
+                  "D",
+                  "E",
+                  "F"
+                ],
+                "defaultAxis": true
+              }
+            ]
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:host.cpu.idle:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg):limit(100):names,(builtin:host.cpu.iowait:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg):limit(100):names,(builtin:host.cpu.user:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg):limit(100):names,(builtin:host.cpu.system:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg):limit(100):names,(builtin:host.cpu.steal:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg):limit(100):names,(builtin:host.cpu.other:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg):limit(100):names"
+        ]
+      },
+      {
+        "name": "Memory usage",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 38,
+          "left": 608,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "Memory usage",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.total:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "B",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.recl:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "C",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "D",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.kernel:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "LINE"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "B:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "STACKED_AREA"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "C:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "STACKED_AREA"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "D:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "LINE"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:host.mem.total:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names,(builtin:host.mem.recl:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names,(builtin:host.mem.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names,(builtin:host.mem.kernel:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names"
+        ]
+      },
+      {
+        "name": "Traffic",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 38,
+          "left": 1216,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "Traffic",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.net.nic.trafficIn:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):merge(\"dt.entity.network_interface\"):sum",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "B",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.net.nic.trafficOut:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):merge(\"dt.entity.network_interface\"):sum",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "ROYALBLUE",
+                "seriesType": "LINE"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "B:",
+              "properties": {
+                "color": "ROYALBLUE",
+                "seriesType": "LINE"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:host.net.nic.trafficIn:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):merge(\"dt.entity.network_interface\"):sum):limit(100):names,(builtin:host.net.nic.trafficOut:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):merge(\"dt.entity.network_interface\"):sum):limit(100):names"
+        ]
+      },
+      {
+        "name": "CPU usage",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 380,
+          "left": 0,
+          "width": 988,
+          "height": 266
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "CPU usage",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:tech.generic.cpu.usage:filter(or(in(\"dt.entity.process_group_instance\",entitySelector(\"type(PROCESS_GROUP_INSTANCE) AND fromRelationship.isProcessOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.process_group_instance\"):sort(value(auto,descending)):limit(10):avg",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:tech.generic.cpu.usage:filter(or(in(\"dt.entity.process_group_instance\",entitySelector(\"type(PROCESS_GROUP_INSTANCE) AND fromRelationship.isProcessOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.process_group_instance\"):sort(value(auto,descending)):limit(10):avg):limit(100):names"
+        ]
+      },
+      {
+        "name": "Memory usage",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 380,
+          "left": 1026,
+          "width": 798,
+          "height": 266
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "Memory usage",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:tech.generic.mem.workingSetSize:filter(or(in(\"dt.entity.process_group_instance\",entitySelector(\"type(PROCESS_GROUP_INSTANCE) AND fromRelationship.isProcessOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.process_group_instance\"):sort(value(auto,descending)):limit(10):avg",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:tech.generic.mem.workingSetSize:filter(or(in(\"dt.entity.process_group_instance\",entitySelector(\"type(PROCESS_GROUP_INSTANCE) AND fromRelationship.isProcessOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.process_group_instance\"):sort(value(auto,descending)):limit(10):avg):limit(100):names"
+        ]
+      },
+      {
+        "name": "Space usage",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 684,
+          "left": 0,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "Space usage",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "((builtin:host.disk.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))))+(builtin:host.disk.avail:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))))):splitBy(\"dt.entity.host\"):sum",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "B",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.disk.avail:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "C",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.disk.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "LINE",
+                "alias": "Disk total"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "B:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "STACKED_AREA",
+                "alias": "Disk available"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "C:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "STACKED_AREA",
+                "alias": "Disk used"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(((builtin:host.disk.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))))+(builtin:host.disk.avail:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))))):splitBy(\"dt.entity.host\"):sum):limit(100):names,(builtin:host.disk.avail:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum):limit(100):names,(builtin:host.disk.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum):limit(100):names"
+        ]
+      },
+      {
+        "name": "Throughput",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 684,
+          "left": 608,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "Throughput",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.disk.bytesWritten:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "B",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.disk.bytesRead:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "B:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:host.disk.bytesWritten:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum):limit(100):names,(builtin:host.disk.bytesRead:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum):limit(100):names"
+        ]
+      },
+      {
+        "name": "IOPS",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 684,
+          "left": 1216,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "IOPS",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.disk.writeOps:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "B",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.disk.readOps:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "B:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:host.disk.writeOps:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum):limit(100):names,(builtin:host.disk.readOps:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):filter(or(in(\"dt.entity.disk\",entitySelector(\"type(DISK) AND fromRelationship.isDiskOf(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy(\"dt.entity.host\"):sum):limit(100):names"
+        ]
+      },
+      {
+        "name": "Container Analysis",
+        "tileType": "HEADER",
+        "configured": true,
+        "bounds": {
+          "top": 988,
+          "left": 0,
+          "width": 304,
+          "height": 38
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false
+      },
+      {
+        "name": "CPU usage",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 1026,
+          "left": 0,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "CPU usage",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:containers.cpu.usageSystemMilliCores:filter(or(in(\"dt.entity.container_group_instance\",entitySelector(\"type(CONTAINER_GROUP_INSTANCE) AND fromRelationships.isCgiOfHost(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy():avg",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "B",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:containers.cpu.usageUserMilliCores:filter(or(in(\"dt.entity.container_group_instance\",entitySelector(\"type(CONTAINER_GROUP_INSTANCE) AND fromRelationships.isCgiOfHost(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy():avg",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "B:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:containers.cpu.usageSystemMilliCores:filter(or(in(\"dt.entity.container_group_instance\",entitySelector(\"type(CONTAINER_GROUP_INSTANCE) AND fromRelationships.isCgiOfHost(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy():avg):limit(100):names,(builtin:containers.cpu.usageUserMilliCores:filter(or(in(\"dt.entity.container_group_instance\",entitySelector(\"type(CONTAINER_GROUP_INSTANCE) AND fromRelationships.isCgiOfHost(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy():avg):limit(100):names"
+        ]
+      },
+      {
+        "name": "Memory usage",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 1026,
+          "left": 608,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "Memory usage",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:containers.memory.residentSetBytes:filter(or(in(\"dt.entity.container_group_instance\",entitySelector(\"type(CONTAINER_GROUP_INSTANCE) AND fromRelationships.isCgiOfHost(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy():avg",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:containers.memory.residentSetBytes:filter(or(in(\"dt.entity.container_group_instance\",entitySelector(\"type(CONTAINER_GROUP_INSTANCE) AND fromRelationships.isCgiOfHost(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy():avg):limit(100):names"
+        ]
+      },
+      {
+        "name": "CPU throttling",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 1026,
+          "left": 1216,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "CPU throttling",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:containers.cpu.throttledTime:filter(or(in(\"dt.entity.container_group_instance\",entitySelector(\"type(CONTAINER_GROUP_INSTANCE) AND fromRelationships.isCgiOfHost(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy():avg",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "DEFAULT"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:containers.cpu.throttledTime:filter(or(in(\"dt.entity.container_group_instance\",entitySelector(\"type(CONTAINER_GROUP_INSTANCE) AND fromRelationships.isCgiOfHost(type(HOST),entityId(${var.ghes_hostname}))\")))):splitBy():avg):limit(100):names"
+        ]
+      },
+      {
+        "name": "Memory Analysis",
+        "tileType": "HEADER",
+        "configured": true,
+        "bounds": {
+          "top": 1330,
+          "left": 0,
+          "width": 304,
+          "height": 38
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false
+      },
+      {
+        "name": "Memory usage",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 1368,
+          "left": 0,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "Memory usage",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.total:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "B",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.recl:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "C",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "D",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.kernel:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "LINE"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "B:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "STACKED_AREA"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "C:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "STACKED_AREA"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "D:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "LINE"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:host.mem.total:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names,(builtin:host.mem.recl:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names,(builtin:host.mem.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names,(builtin:host.mem.kernel:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names"
+        ]
+      },
+      {
+        "name": "Page faults",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 1368,
+          "left": 608,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "Page faults",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.avail.pfps:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "LINE"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:host.mem.avail.pfps:filter(eq(\"dt.entity.host\",${var.ghes_hostname})):avg):limit(100):names"
+        ]
+      },
+      {
+        "name": "Swap usage",
+        "tileType": "DATA_EXPLORER",
+        "configured": true,
+        "bounds": {
+          "top": 1368,
+          "left": 1216,
+          "width": 608,
+          "height": 304
+        },
+        "tileFilter": {},
+        "isAutoRefreshDisabled": false,
+        "customName": "Swap usage",
+        "queries": [
+          {
+            "id": "A",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.swap.total:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          },
+          {
+            "id": "B",
+            "spaceAggregation": "AUTO",
+            "timeAggregation": "DEFAULT",
+            "metricSelector": "builtin:host.mem.swap.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))",
+            "rate": "NONE",
+            "enabled": true
+          }
+        ],
+        "visualConfig": {
+          "type": "GRAPH_CHART",
+          "global": {
+            "hideLegend": false
+          },
+          "rules": [
+            {
+              "matcher": "A:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "LINE"
+              },
+              "seriesOverrides": []
+            },
+            {
+              "matcher": "B:",
+              "properties": {
+                "color": "BLUE",
+                "seriesType": "LINE"
+              },
+              "seriesOverrides": []
+            }
+          ],
+          "axes": {
+            "xAxis": {
+              "visible": true
+            },
+            "yAxes": []
+          },
+          "heatmapSettings": {
+            "yAxis": "VALUE"
+          },
+          "thresholds": [
+            {
+              "axisTarget": "LEFT",
+              "rules": [],
+              "visible": true
+            }
+          ],
+          "tableSettings": {
+            "hiddenColumns": []
+          },
+          "graphChartSettings": {
+            "connectNulls": false
+          },
+          "honeycombSettings": {
+            "showHive": true,
+            "showLegend": true,
+            "showLabels": false
+          }
+        },
+        "queriesSettings": {
+          "resolution": ""
+        },
+        "metricExpressions": [
+          "resolution=null&(builtin:host.mem.swap.total:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names,(builtin:host.mem.swap.used:filter(eq(\"dt.entity.host\",${var.ghes_hostname}))):limit(100):names"
+        ]
+      }
+    ]
+  }
+EOT
 }
diff --git a/dashboards/ghes_dashboards/variables.tf b/dashboards/ghes_dashboards/variables.tf
index f8be2b8..cbd8b82 100644
--- a/dashboards/ghes_dashboards/variables.tf
+++ b/dashboards/ghes_dashboards/variables.tf
@@ -1,4 +1,4 @@
-variable "dashboard_json" {
-  type = string
-  description = "The json defination of the dynatrace dashboard"
-}
\ No newline at end of file
+variable "ghes_hostname" {
+  type        = string
+  description = "GHES dashboard hostname"
+}
diff --git a/main.tf b/main.tf
index 7c9d778..8180a77 100644
--- a/main.tf
+++ b/main.tf
@@ -27,7 +27,8 @@ module "ghes_alerts" {
 
   ghes_alert_config = var.tenant_vars.ghes_alert
 }
+
 module "ghes_dashboards" {
-  source = "./dashboards/ghes_dashboards"
-  dashboard_json = var.dashboard_json.dashboard_json
-}
\ No newline at end of file
+  source        = "./dashboards/ghes_dashboards"
+  ghes_hostname = var.tenant_vars.ghes_dashboard_hostname
+}