diff --git a/dashboards/usage-report.jsonnet b/dashboards/usage-report.jsonnet
index d9a2812..888f22d 100755
--- a/dashboards/usage-report.jsonnet
+++ b/dashboards/usage-report.jsonnet
@@ -2,144 +2,143 @@
 local grafonnet = import 'grafonnet/main.libsonnet';
 local dashboard = grafonnet.dashboard;
 local ts = grafonnet.panel.timeSeries;
-local barChart = grafonnet.panel.barChart;
 local barGauge = grafonnet.panel.barGauge;
 local prometheus = grafonnet.query.prometheus;
-local var = grafonnet.dashboard.variable;
-local row = grafonnet.panel.row;
 
 local common = import './common.libsonnet';
 
-local memoryUsageUserPods = common.barChartOptions + barGauge.new(
-  'User pod memory usage',
-) + barGauge.standardOptions.withUnit(
-  'bytes'
-) + barGauge.queryOptions.withTargets([
-  // Computes sum of pod memory requests, grouped by username, for notebook pods
-  prometheus.new(
-    '$PROMETHEUS_DS',
-    |||
-      kube_pod_labels{
-        label_app="jupyterhub",
-        label_component="singleuser-server",
-        namespace=~"$hub"
-      }
-      * on (namespace, pod) group_left()
-      sum(
-        container_memory_working_set_bytes{
-          namespace=~"$hub",
-          container="notebook",
-          hub_jupyter_org_node_purpose="user",
-          name!="",
-        }
-      ) by (namespace, pod)
-    |||,
-  ) + prometheus.withLegendFormat('{{label_hub_jupyter_org_username}} ({{namespace}})'),
-]);
-
-// Dask-gateway related dashboard
-local memoryUsageDaskWorkerPods = common.barChartOptions + barGauge.new(
-  'Dask-gateway worker pod memory usage',
-) + barGauge.standardOptions.withUnit(
-  'bytes'
-) + barGauge.queryOptions.withTargets([
-  // Computes sum of pod memory requests, grouped by username, and dask-gateway cluster
-  // for dask-gateway worker pods
-  prometheus.new(
-    '$PROMETHEUS_DS',
-    |||
+// FIXME: apply threshold coloring, provided like this historically, for all
+//        four panels in this dashboard
+//
+// thresholds=[
+//   {
+//     value: 0,
+//     color: 'green',
+//   },
+// ]
 
-      sum(
+local memoryUsageUserPods =
+  common.barGaugeOptions
+  + barGauge.new('User pod memory usage')
+  + barGauge.standardOptions.withUnit('bytes')
+  + barGauge.queryOptions.withTargets([
+    // Computes sum of pod memory requests, grouped by username, for notebook pods
+    prometheus.new(
+      '$PROMETHEUS_DS',
+      |||
         kube_pod_labels{
-          namespace=~"$hub",
-          label_app_kubernetes_io_component="dask-worker",
+          label_app="jupyterhub",
+          label_component="singleuser-server",
+          namespace=~"$hub"
         }
         * on (namespace, pod) group_left()
         sum(
           container_memory_working_set_bytes{
             namespace=~"$hub",
-            container="dask-worker",
-            k8s_dask_org_node_purpose="worker",
+            container="notebook",
+            hub_jupyter_org_node_purpose="user",
             name!="",
           }
         ) by (namespace, pod)
-      ) by (label_hub_jupyter_org_username, label_gateway_dask_org_cluster)
-    |||,
-  ) + prometheus.withLegendFormat('{{label_hub_jupyter_org_username}}-{{label_gateway_dask_org_cluster}}'),
-]);
+      |||,
+    )
+    + prometheus.withLegendFormat('{{label_hub_jupyter_org_username}} ({{namespace}})'),
+  ]);
+
+// Dask-gateway related dashboard
+local memoryUsageDaskWorkerPods =
+  common.barGaugeOptions
+  + barGauge.new('Dask-gateway worker pod memory usage')
+  + barGauge.standardOptions.withUnit('bytes')
+  + barGauge.queryOptions.withTargets([
+    // Computes sum of pod memory requests, grouped by username, and dask-gateway cluster
+    // for dask-gateway worker pods
+    prometheus.new(
+      '$PROMETHEUS_DS',
+      |||
+        sum(
+          kube_pod_labels{
+            namespace=~"$hub",
+            label_app_kubernetes_io_component="dask-worker",
+          }
+          * on (namespace, pod) group_left()
+          sum(
+            container_memory_working_set_bytes{
+              namespace=~"$hub",
+              container="dask-worker",
+              k8s_dask_org_node_purpose="worker",
+              name!="",
+            }
+          ) by (namespace, pod)
+        ) by (label_hub_jupyter_org_username, label_gateway_dask_org_cluster)
+      |||,
+    )
+    + prometheus.withLegendFormat('{{label_hub_jupyter_org_username}}-{{label_gateway_dask_org_cluster}}'),
+  ]);
 
 
-// // dask-scheduler
-// local memoryUsageDaskSchedulerPods = barGaugePanel.new(
-//   'Dask-gateway scheduler pod memory usage',
-//   datasource='$PROMETHEUS_DS',
-//   unit='bytes',
-//   thresholds=[
-//     {
-//       value: 0,
-//       color: 'green',
-//     },
-//   ]
-// ).addTargets([
-//   // Computes sum of pod memory requests, grouped by username, and dask-gateway cluster
-//   // for dask-gateway scheduler pods
-//   prometheus.target(
-//     |||
-//       sum(
-//         kube_pod_labels{
-//           namespace=~"$hub",
-//           label_app_kubernetes_io_component="dask-scheduler",
-//         }
-//         * on (namespace, pod) group_left()
-//         sum(
-//           container_memory_working_set_bytes{
-//             namespace=~"$hub",
-//             container="dask-scheduler",
-//             k8s_dask_org_node_purpose="scheduler",
-//             name!="",
-//           }
-//         ) by (namespace, pod)
-//       ) by (label_hub_jupyter_org_username, label_gateway_dask_org_cluster)
-//     |||,
-//     legendFormat='{{label_hub_jupyter_org_username}}-{{label_gateway_dask_org_cluster}}',
-//   ),
-// ]);
+// dask-scheduler
+local memoryUsageDaskSchedulerPods =
+  common.barGaugeOptions
+  + barGauge.new('Dask-gateway scheduler pod memory usage')
+  + barGauge.standardOptions.withUnit('bytes')
+  + barGauge.queryOptions.withTargets([
+    // Computes sum of pod memory requests, grouped by username, and dask-gateway cluster
+    // for dask-gateway scheduler pods
+    prometheus.new(
+      '$PROMETHEUS_DS',
+      |||
+        sum(
+          kube_pod_labels{
+            namespace=~"$hub",
+            label_app_kubernetes_io_component="dask-scheduler",
+          }
+          * on (namespace, pod) group_left()
+          sum(
+            container_memory_working_set_bytes{
+              namespace=~"$hub",
+              container="dask-scheduler",
+              k8s_dask_org_node_purpose="scheduler",
+              name!="",
+            }
+          ) by (namespace, pod)
+        ) by (label_hub_jupyter_org_username, label_gateway_dask_org_cluster)
+      |||,
+    )
+    + prometheus.withLegendFormat('{{label_hub_jupyter_org_username}}-{{label_gateway_dask_org_cluster}}'),
+  ]);
 
-// // GPU memory usage dashboard
-// local memoryUsageGPUPods = barGaugePanel.new(
-//   'GPU pod memory usage',
-//   datasource='$PROMETHEUS_DS',
-//   unit='bytes',
-//   thresholds=[
-//     {
-//       value: 0,
-//       color: 'green',
-//     },
-//   ]
-// ).addTargets([
-//   // Computes sum of pod memory requests, grouped by username for notebook gpu pods
-//   prometheus.target(
-//     |||
-//       kube_pod_labels{
-//         label_app="jupyterhub",
-//         label_component="singleuser-server",
-//         namespace=~"$hub"
-//       }
-//       * on (namespace, pod) group_left()
-//       sum(
-//         container_memory_working_set_bytes{
-//           namespace=~"$hub",
-//           container="notebook",
-//           hub_jupyter_org_node_purpose="user",
-//           cloud_google_com_gke_nodepool="nb-gpu-k80",
-//           cloud_google_com_gke_accelerator="nvidia-tesla-k80",
-//           name!="",
-//         }
-//       ) by (namespace, pod)
-//     |||,
-//     legendFormat='{{label_hub_jupyter_org_username}}-{{label_gateway_dask_org_cluster}}',
-//   ),
-// ]);
+
+// GPU memory usage dashboard
+local memoryUsageGPUPods =
+  common.barGaugeOptions
+  + barGauge.new('GPU pod memory usage')
+  + barGauge.standardOptions.withUnit('bytes')
+  + barGauge.queryOptions.withTargets([
+    // Computes sum of pod memory requests, grouped by username for notebook gpu pods
+    prometheus.new(
+      '$PROMETHEUS_DS',
+      |||
+        kube_pod_labels{
+          label_app="jupyterhub",
+          label_component="singleuser-server",
+          namespace=~"$hub"
+        }
+        * on (namespace, pod) group_left()
+        sum(
+          container_memory_working_set_bytes{
+            namespace=~"$hub",
+            container="notebook",
+            hub_jupyter_org_node_purpose="user",
+            cloud_google_com_gke_nodepool="nb-gpu-k80",
+            cloud_google_com_gke_accelerator="nvidia-tesla-k80",
+            name!="",
+          }
+        ) by (namespace, pod)
+      |||,
+    )
+    + prometheus.withLegendFormat('{{label_hub_jupyter_org_username}}-{{label_gateway_dask_org_cluster}}'),
+  ]);
 
 
 dashboard.new('Usage Report')
@@ -153,9 +152,9 @@ dashboard.new('Usage Report')
   grafonnet.util.grid.makeGrid(
     [
       memoryUsageUserPods,
-      // memoryUsageDaskWorkerPods,
-      // memoryUsageDaskSchedulerPods,
-      // memoryUsageGPUPods
+      memoryUsageDaskWorkerPods,
+      memoryUsageDaskSchedulerPods,
+      memoryUsageGPUPods,
     ],
     panelWidth=12,
     panelHeight=8,