diff --git a/modules/cloudtrail-dashboard/main.tf b/modules/cloudtrail-dashboard/main.tf
index 82beb1c..104f35f 100644
--- a/modules/cloudtrail-dashboard/main.tf
+++ b/modules/cloudtrail-dashboard/main.tf
@@ -8,7 +8,7 @@ terraform {
   required_version = ">= v1.0.11"
 }
 
-resource "lightstep_metric_dashboard" "aws_cloudtrail_dashboard" {
+resource "lightstep_dashboard" "aws_cloudtrail_dashboard" {
   project_name   = var.lightstep_project
   dashboard_name = "AWS CloudTrail"
 
@@ -18,19 +18,12 @@ resource "lightstep_metric_dashboard" "aws_cloudtrail_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "a"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.cloudtrail.units_sum"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.cloudtrail.units_sum | delta | group_by [], sum
+EOT
     }
 
   }
@@ -41,19 +34,12 @@ resource "lightstep_metric_dashboard" "aws_cloudtrail_dashboard" {
     type = "timeseries"
 
     query {
-      query_name = "b"
-      display    = "bar"
-      hidden     = false
-
-      metric              = "aws.cloudtrail.total_data_retained_sum"
-      timeseries_operator = "delta"
-
-
-      group_by {
-        aggregation_method = "sum"
-        keys               = []
-      }
-
+      query_name   = "a"
+      display      = "line"
+      hidden       = false
+      query_string = <<EOT
+metric aws.cloudtrail.total_data_retained_sum | delta | group_by [], sum
+EOT
     }
 
   }
diff --git a/modules/cloudtrail-dashboard/outputs.tf b/modules/cloudtrail-dashboard/outputs.tf
index fa38390..03bbc05 100644
--- a/modules/cloudtrail-dashboard/outputs.tf
+++ b/modules/cloudtrail-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_cloudtrail_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_cloudtrail_dashboard.id}"
   description = "CloudTrail Dashboard URL"
 }