diff --git a/modules/monitoring/dashboards/mendix_native.json.tpl b/modules/monitoring/dashboards/mendix_native.json.tpl
index 21aac09..e897306 100644
--- a/modules/monitoring/dashboards/mendix_native.json.tpl
+++ b/modules/monitoring/dashboards/mendix_native.json.tpl
@@ -830,7 +830,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "jvm_memory_used_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",id!=\"Eden Space\"}",
+          "expr": "jvm_memory_used_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",id!~\"G1 Eden Space|Eden Space\"}",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -839,17 +839,6 @@
           "queryType": "randomWalk",
           "refId": "JVM memory pool (except eden space)"
         },
-        {
-          "exemplar": true,
-          "expr": "jvm_memory_used_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",id=\"Eden Space\"}",
-          "format": "time_series",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "legendFormat": "{{id}}",
-          "queryType": "randomWalk",
-          "refId": "JVM memory pool (eden space)"
-        },
         {
           "exemplar": true,
           "expr": "sum(jvm_memory_committed_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",area=\"heap\"})-sum(jvm_memory_used_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",area=\"heap\"})",
@@ -881,6 +870,17 @@
           "legendFormat": "max memory",
           "refId": "Memory limit"
         },
+        {
+          "exemplar": true,
+          "expr": "jvm_memory_used_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",id=~\"G1 Eden Space|Eden Space\"}",
+          "format": "time_series",
+          "hide": false,
+          "instant": false,
+          "interval": "",
+          "legendFormat": "Eden Space",
+          "queryType": "randomWalk",
+          "refId": "JVM memory pool (eden space)"
+        },
         {
           "exemplar": true,
           "expr": "max without (id, name) (container_memory_usage_bytes{namespace=~\"$namespace\",pod=~\"$pod_name\",container=\"mendix\"}) ",
@@ -1414,7 +1414,7 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "jvm_memory_used_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",area=\"heap\",id!=\"Eden Space\"}",
+          "expr": "jvm_memory_used_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",area=\"heap\",id!~\"G1 Eden Space|Eden Space\"}",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -1425,10 +1425,10 @@
         },
         {
           "exemplar": true,
-          "expr": "jvm_memory_used_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",area=\"heap\",id=\"Eden Space\"}",
+          "expr": "jvm_memory_used_bytes{namespace=~\"$namespace\",privatecloud_mendix_com_app=\"$environment_id\",pod=~\"$pod_name\",area=\"heap\",id=~\"G1 Eden Space|Eden Space\"}",
           "hide": false,
           "interval": "",
-          "legendFormat": "{{id}}",
+          "legendFormat": "Eden Space",
           "refId": "Eden space"
         },
         {