diff --git a/dashboards/aws-certificate-manager/aws-certificate-manager.json b/dashboards/aws-certificate-manager/aws-certificate-manager.json
new file mode 100644
index 0000000000..86ba9b8162
--- /dev/null
+++ b/dashboards/aws-certificate-manager/aws-certificate-manager.json
@@ -0,0 +1,108 @@
+{
+    "name": "AWS CertificateManager",
+    "description": null,
+    "pages": [
+      {
+        "name": "AWS CertificateManager",
+        "description": null,
+        "widgets": [
+          {
+            "title": "",
+            "layout": {
+              "column": 1,
+              "row": 1,
+              "width": 4,
+              "height": 3
+            },
+            "visualization": {
+              "id": "viz.markdown"
+            },
+            "rawConfiguration": {
+              "text": "# AWS Certificate Manager\nUse AWS Certificate Manager (ACM) to provision, manage, and deploy public and private SSL/TLS certificates for use with AWS services and your internal connected resources. ACM removes the time-consuming manual process of purchasing, uploading, and renewing SSL/TLS certificates.\n\n"
+            }
+          },
+          {
+            "title": "DaysToExpiry",
+            "layout": {
+              "column": 5,
+              "row": 1,
+              "width": 4,
+              "height": 3
+            },
+            "visualization": {
+              "id": "viz.table"
+            },
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": false
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM Metric \nSELECT average(`aws.certificatemanager.DaysToExpiry`) AS 'DaysToExpiry'\nWHERE aws.Namespace = 'AWS/CertificateManager' \nFACET `aws.certificatemanager.CertificateArn`, `aws.accountId`, `aws.region`"
+                }
+              ],
+              "platformOptions": {
+                "ignoreTimeRange": false
+              }
+            }
+          },
+          {
+            "title": "Total Certificate By Region",
+            "layout": {
+              "column": 9,
+              "row": 1,
+              "width": 4,
+              "height": 3
+            },
+            "visualization": {
+              "id": "viz.pie"
+            },
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": true
+              },
+              "legend": {
+                "enabled": true
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM Metric SELECT uniqueCount(aws.certificatemanager.CertificateArn) WHERE aws.Namespace = 'AWS/CertificateManager' FACET aws.region "
+                }
+              ],
+              "platformOptions": {
+                "ignoreTimeRange": false
+              }
+            }
+          },
+          {
+            "title": "Total Certificate By AccountID",
+            "layout": {
+              "column": 1,
+              "row": 4,
+              "width": 12,
+              "height": 4
+            },
+            "visualization": {
+              "id": "viz.bar"
+            },
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": false
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM Metric SELECT uniqueCount(aws.certificatemanager.CertificateArn) AS 'Total Certificates' WHERE aws.Namespace = 'AWS/CertificateManager' FACET aws.accountId "
+                }
+              ],
+              "platformOptions": {
+                "ignoreTimeRange": false
+              }
+            }
+          }
+        ]
+      }
+    ]
+  }
\ No newline at end of file
diff --git a/dashboards/aws-certificate-manager/aws-certificate-manager.png b/dashboards/aws-certificate-manager/aws-certificate-manager.png
new file mode 100644
index 0000000000..20960b27e0
Binary files /dev/null and b/dashboards/aws-certificate-manager/aws-certificate-manager.png differ
diff --git a/quickstarts/aws/amazon-cloudwatch-network-monitor/config.yml b/quickstarts/aws/amazon-cloudwatch-network-monitor/config.yml
index d4b4e4256c..68e2917f34 100644
--- a/quickstarts/aws/amazon-cloudwatch-network-monitor/config.yml
+++ b/quickstarts/aws/amazon-cloudwatch-network-monitor/config.yml
@@ -27,7 +27,7 @@ keywords:
   - Amazon CloudWatch Network Monitor
   - active network monitoring
 dataSourceIds:
-  - amazon-cloudwatch-network-monitor
+  - amazon-cloudwatch-metric-streams
 dashboards:
   - amazon-cloudwatch-network-monitor
 alertPolicies:
diff --git a/quickstarts/aws/amazon-security-lake/config.yml b/quickstarts/aws/amazon-security-lake/config.yml
index 70b92ab21b..8bbb953610 100644
--- a/quickstarts/aws/amazon-security-lake/config.yml
+++ b/quickstarts/aws/amazon-security-lake/config.yml
@@ -45,4 +45,4 @@ dashboards:
 installPlans:
   - aws-security-lake
 dataSourceIds:
-  - amazon-security-lake
+  - amazon-cloudwatch-metric-streams
diff --git a/quickstarts/aws/amazon-vpc-lattice/config.yml b/quickstarts/aws/amazon-vpc-lattice/config.yml
index dd5ec92759..7513764d52 100644
--- a/quickstarts/aws/amazon-vpc-lattice/config.yml
+++ b/quickstarts/aws/amazon-vpc-lattice/config.yml
@@ -32,7 +32,6 @@ keywords:
   - vpc
   - network
 dataSourceIds:
-  - amazon-vpc-lattice
   - amazon-cloudwatch-metric-streams
 dashboards:
   - amazon-vpc-lattice-access-logs
diff --git a/quickstarts/aws/aws-apprunner/config.yml b/quickstarts/aws/aws-apprunner/config.yml
index 822e5d2ec8..dc91f757b8 100644
--- a/quickstarts/aws/aws-apprunner/config.yml
+++ b/quickstarts/aws/aws-apprunner/config.yml
@@ -23,9 +23,7 @@ keywords:
   - amazon
   - app runner
   - logs
-installPlans:
-  - aws-apprunner
 dataSourceIds:
-  - aws-apprunner
+  - amazon-cloudwatch-metric-streams
 dashboards:
   - aws-apprunner
diff --git a/quickstarts/aws/aws-certificate-manager/config.yml b/quickstarts/aws/aws-certificate-manager/config.yml
new file mode 100644
index 0000000000..cd641f2e8d
--- /dev/null
+++ b/quickstarts/aws/aws-certificate-manager/config.yml
@@ -0,0 +1,31 @@
+id: 426cc432-88e7-40bb-80fb-4f9cd8e8816d
+slug: aws-certificate-manager
+description: |-
+  ## What is AWS Certificate Manager?
+  Use AWS Certificate Manager (ACM) to provision, manage, and deploy public and private SSL/TLS certificates for use with AWS services and your internal connected resources. ACM removes the time-consuming manual process of purchasing, uploading, and renewing SSL/TLS certificates.
+  ### Get started!
+  Start monitoring AWS Certificate Manager by using AWS Kinesis Firehose to send logs to New Relic! Take a look at our documentation for information on how to set this integration.
+  ### More info
+  Check out the [documentation](https://docs.newrelic.com/docs/infrastructure/amazon-integrations/aws-integrations-list/aws-certificate-manager-monitoring-integration/) to learn more about New Relic monitoring for AWS Certificate Manager.
+summary: |-
+  Monitor AWS Certificate Manager by connecting AWS to New Relic
+icon: logo.png
+level: New Relic
+authors:
+  - New Relic
+title: AWS Certificate Manager
+documentation:
+  - name: AWS Certificate Manager installation docs
+    description: |
+      Monitor AWS Certificate Manager by connecting AWS to New Relic.
+    url: >-
+      https://docs.newrelic.com/docs/infrastructure/amazon-integrations/aws-integrations-list/aws-certificate-manager-monitoring-integration/
+keywords:
+  - aws
+  - amazon web services
+  - networking
+  - aws certificate manager
+dashboards:
+  - aws-certificate-manager
+dataSourceIds:
+  - amazon-cloudwatch-metric-streams
\ No newline at end of file
diff --git a/quickstarts/aws/aws-certificate-manager/logo.png b/quickstarts/aws/aws-certificate-manager/logo.png
new file mode 100644
index 0000000000..cf9414d316
Binary files /dev/null and b/quickstarts/aws/aws-certificate-manager/logo.png differ
diff --git a/quickstarts/aws/aws-lambda-telemetry-extension/config.yml b/quickstarts/aws/aws-lambda-telemetry-extension/config.yml
index 888c60c669..3d5e775cbf 100644
--- a/quickstarts/aws/aws-lambda-telemetry-extension/config.yml
+++ b/quickstarts/aws/aws-lambda-telemetry-extension/config.yml
@@ -27,9 +27,7 @@ keywords:
   - serverless
   - lambda
   - telemetry extension
-installPlans:
-  - aws-lambda-telemetry-extension
 dataSourceIds:
-  - aws-lambda-telemetry-extension
+  - amazon-cloudwatch-metric-streams
 dashboards:
   - aws-lambda-telemetry-extension
diff --git a/quickstarts/aws/aws-lex/config.yml b/quickstarts/aws/aws-lex/config.yml
index 40ce54cc24..d4522ca7c9 100644
--- a/quickstarts/aws/aws-lex/config.yml
+++ b/quickstarts/aws/aws-lex/config.yml
@@ -26,7 +26,7 @@ keywords:
   - amazon web services
   - lex
 dataSourceIds:
-  - aws-lex
+  - amazon-cloudwatch-metric-streams
 dashboards:
   - aws-lex
 alertPolicies:
diff --git a/quickstarts/aws/aws-polly/config.yml b/quickstarts/aws/aws-polly/config.yml
index 03a6f6b5d7..5739369126 100644
--- a/quickstarts/aws/aws-polly/config.yml
+++ b/quickstarts/aws/aws-polly/config.yml
@@ -26,6 +26,6 @@ keywords:
   - amazon web services
   - polly
 dataSourceIds:
-  - aws-polly
+  - amazon-cloudwatch-metric-streams
 dashboards:
   - aws-polly
diff --git a/quickstarts/aws/aws-rekognition/config.yml b/quickstarts/aws/aws-rekognition/config.yml
index 792e2e7536..6ca87d4b7f 100644
--- a/quickstarts/aws/aws-rekognition/config.yml
+++ b/quickstarts/aws/aws-rekognition/config.yml
@@ -26,6 +26,6 @@ keywords:
   - amazon web services
   - rekognition
 dataSourceIds:
-  - aws-rekognition
+  - amazon-cloudwatch-metric-streams
 dashboards:
   - aws-rekognition
diff --git a/quickstarts/aws/aws-textract/config.yml b/quickstarts/aws/aws-textract/config.yml
index 1668a7ee3e..5196728621 100644
--- a/quickstarts/aws/aws-textract/config.yml
+++ b/quickstarts/aws/aws-textract/config.yml
@@ -26,6 +26,6 @@ keywords:
   - amazon web services
   - textract
 dataSourceIds:
-  - aws-textract
+  - amazon-cloudwatch-metric-streams
 dashboards:
   - aws-textract
diff --git a/quickstarts/aws/aws-translate/config.yml b/quickstarts/aws/aws-translate/config.yml
index 2b074dd281..7fc027fccb 100644
--- a/quickstarts/aws/aws-translate/config.yml
+++ b/quickstarts/aws/aws-translate/config.yml
@@ -26,6 +26,6 @@ keywords:
   - amazon web services
   - translate
 dataSourceIds:
-  - aws-translate
+  - amazon-cloudwatch-metric-streams
 dashboards:
   - aws-translate
diff --git a/quickstarts/aws/aws-verified-access/config.yml b/quickstarts/aws/aws-verified-access/config.yml
index 7910ee0182..90b4515d81 100644
--- a/quickstarts/aws/aws-verified-access/config.yml
+++ b/quickstarts/aws/aws-verified-access/config.yml
@@ -42,7 +42,5 @@ keywords:
   - networking
 dashboards:
   - aws-verified-access
-installPlans:
-  - aws-verified-access
 dataSourceIds:
-  - amazon-verified-access
+  - amazon-cloudwatch-metric-streams