diff --git a/alert-policies/network-flow-devices/Flow Destinations Baseline.yml b/alert-policies/network-flow-devices/Flow Destinations Baseline.yml
new file mode 100644
index 0000000000..57e343db8a
--- /dev/null
+++ b/alert-policies/network-flow-devices/Flow Destinations Baseline.yml	
@@ -0,0 +1,43 @@
+# Name of the alert
+name: Flow Destinations Baseline
+
+# Description and details
+description: |+
+  This alert is triggered when the unique count of 'Destination:Port' endpoints for a Flow Device fluctuates more than 2 standard deviations above or below baseline for over 5 minutes.
+  This is a measurement on the total number of destinations for your traffic and can be an associated metric to throughput signals from your applications.
+
+# Type of alert
+type: BASELINE
+
+# NRQL query
+nrql:
+  # Baseline alerts can use an optional FACET
+  query: "FROM KFlow SELECT uniqueCount(dst_addr, l4_dst_port) FACET entity.name, entity.guid"
+
+# Direction in which baseline is set (Default: LOWER_ONLY)
+baselineDirection: UPPER_AND_LOWER
+
+# List of Critical and Warning thresholds for the condition
+terms:
+  - priority: CRITICAL
+    # Operator used to compare against the threshold.
+    operator: ABOVE
+    # Value that triggers a violation
+    threshold: 2
+    # Time in seconds; 120 - 3600, must be a multiple of 60 for Baseline conditions
+    thresholdDuration: 300
+    # How many data points must be in violation for the duration
+    thresholdOccurrences: ALL
+
+# Loss of Signal Settings
+expiration:
+  # Close open violations if signal is lost (Default: false)
+  closeViolationsOnExpiration: true
+  # Open "Loss of Signal" violation if signal is lost (Default: false)
+  openViolationOnExpiration: true
+  # Time in seconds; Max value: 172800 (48hrs), null if closeViolationsOnExpiration and openViolationOnExpiration are both 'false'
+  expirationDuration: 86400
+
+# Duration after which a violation automatically closes
+# Time in seconds; 300 - 2592000 (Default: 86400 [1 day])
+violationTimeLimitSeconds: 86400
diff --git a/alert-policies/network-flow-devices/Flow Sources Baseline.yml b/alert-policies/network-flow-devices/Flow Sources Baseline.yml
new file mode 100644
index 0000000000..81cd8c0c48
--- /dev/null
+++ b/alert-policies/network-flow-devices/Flow Sources Baseline.yml	
@@ -0,0 +1,43 @@
+# Name of the alert
+name: Flow Sources Baseline
+
+# Description and details
+description: |+
+  This alert is triggered when the unique count of 'Source:Port' endpoints for a Flow Device fluctuates more than 2 standard deviations above or below baseline for over 5 minutes.
+  This is a measurement on the total number of sources for your traffic and can be an associated metric to throughput signals from your applications.
+
+# Type of alert
+type: BASELINE
+
+# NRQL query
+nrql:
+  # Baseline alerts can use an optional FACET
+  query: "FROM KFlow SELECT uniqueCount(src_addr, l4_src_port) FACET entity.name, entity.guid"
+
+# Direction in which baseline is set (Default: LOWER_ONLY)
+baselineDirection: UPPER_AND_LOWER
+
+# List of Critical and Warning thresholds for the condition
+terms:
+  - priority: CRITICAL
+    # Operator used to compare against the threshold.
+    operator: ABOVE
+    # Value that triggers a violation
+    threshold: 2
+    # Time in seconds; 120 - 3600, must be a multiple of 60 for Baseline conditions
+    thresholdDuration: 300
+    # How many data points must be in violation for the duration
+    thresholdOccurrences: ALL
+
+# Loss of Signal Settings
+expiration:
+  # Close open violations if signal is lost (Default: false)
+  closeViolationsOnExpiration: true
+  # Open "Loss of Signal" violation if signal is lost (Default: false)
+  openViolationOnExpiration: true
+  # Time in seconds; Max value: 172800 (48hrs), null if closeViolationsOnExpiration and openViolationOnExpiration are both 'false'
+  expirationDuration: 86400
+
+# Duration after which a violation automatically closes
+# Time in seconds; 300 - 2592000 (Default: 86400 [1 day])
+violationTimeLimitSeconds: 86400
diff --git a/alert-policies/prometheus-agent/DupMetrics.yml b/alert-policies/prometheus-agent/DupMetrics.yml
index 9c814950bd..cbd754d918 100644
--- a/alert-policies/prometheus-agent/DupMetrics.yml
+++ b/alert-policies/prometheus-agent/DupMetrics.yml
@@ -4,7 +4,7 @@ description: |+
   This alert is triggered if two or more jobs scraping the same instance in the same cluster.
 type: STATIC
 nrql:
-  query: "FROM Metric select uniqueCount(job) WHERE metricName LIKE 'prometheus%' facet instance, cluster_name"
+  query: "FROM Metric select uniqueCount(job) facet instance, cluster_name"
 
 # Function used to aggregate the NRQL query value(s) for comparison to the terms.threshold (Default: SINGLE_VALUE)
 valueFunction: SINGLE_VALUE
diff --git a/dashboards/amazon-s3-storagelens/amazon-s3-storagelens.json b/dashboards/amazon-s3-storagelens/amazon-s3-storagelens.json
deleted file mode 100644
index 7ea81baa4e..0000000000
--- a/dashboards/amazon-s3-storagelens/amazon-s3-storagelens.json
+++ /dev/null
@@ -1,526 +0,0 @@
-{
-    "name": "Amazon S3 Storage Lens",
-    "description": null,
-    "pages": [
-      {
-        "name": "S3 Storage Lens",
-        "description": null,
-        "widgets": [
-          {
-            "title": "",
-            "layout": {
-              "column": 1,
-              "row": 1,
-              "width": 2,
-              "height": 4
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.markdown"
-            },
-            "rawConfiguration": {
-              "text": "![AWS S3 Storage Lens logo](https://lh6.googleusercontent.com/eY3HD-U5lVs38NUsZIgraXMVSuMDfopVCUihlytZ9e6-tF_na-3ENIBte7l05mfPrpp7MXUY_vnmyeS5QlDN1xqm00HrHEoxPkHIAi1BERTdjZZKAraFeIzJ1I6ts_hYnLzXes1a)\n# AWS S3 Storage Lens Dashboard"
-            }
-          },
-          {
-            "title": "Total Storage (bytes)",
-            "layout": {
-              "column": 3,
-              "row": 1,
-              "width": 2,
-              "height": 2
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.billboard"
-            },
-            "rawConfiguration": {
-              "dataFormatters": [],
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM (FROM Metric SELECT max(aws.s3.storagelens.StorageBytes)as 'gb' FACET aws.s3.storagelens.bucket_name WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) ) \nSELECT sum(`gb`) as '' SINCE 1 day ago"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Object Count",
-            "layout": {
-              "column": 5,
-              "row": 1,
-              "width": 2,
-              "height": 2
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.billboard"
-            },
-            "rawConfiguration": {
-              "dataFormatters": [],
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM (FROM Metric SELECT max(aws.s3.storagelens.ObjectCount) as 'objects' FACET aws.s3.storagelens.bucket_name WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) )\nSELECT sum(`objects`) as 'Objects'  SINCE 1 day ago"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Average Object Size (bytes)",
-            "layout": {
-              "column": 7,
-              "row": 1,
-              "width": 2,
-              "height": 2
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.billboard"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM(FROM Metric SELECT sum(aws.s3.storagelens.StorageBytes) as 'bytes', sum(aws.s3.storagelens.ObjectCount) as 'objects' FACET dimensions() WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}})  )\nSELECT sum(`bytes`)/sum(`objects`) as '' SINCE 1 day ago"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Active buckets",
-            "layout": {
-              "column": 9,
-              "row": 1,
-              "width": 2,
-              "height": 2
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.billboard"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT uniqueCount(aws.s3.storagelens.bucket_name) as 'Buckets' WHERE metricName = 'aws.s3.storagelens.StorageBytes' AND `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 1 day ago"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Total buckets",
-            "layout": {
-              "column": 11,
-              "row": 1,
-              "width": 2,
-              "height": 2
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.billboard"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT uniqueCount(aws.s3.storagelens.bucket_name) as 'Buckets' WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 1 day ago"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Accounts",
-            "layout": {
-              "column": 3,
-              "row": 3,
-              "width": 2,
-              "height": 2
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.billboard"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT uniqueCount(`aws.accountId`) as 'Accounts' WHERE metricName = 'aws.s3.storagelens.StorageBytes' SINCE 1 day ago"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Storage trend (bytes)",
-            "layout": {
-              "column": 5,
-              "row": 3,
-              "width": 4,
-              "height": 3
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.area"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "legend": {
-                "enabled": true
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT sum(aws.s3.storagelens.StorageBytes) as 'Storage (bytes)' WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 2 weeks ago TIMESERIES 1 day"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Object count trend",
-            "layout": {
-              "column": 9,
-              "row": 3,
-              "width": 4,
-              "height": 3
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.area"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "legend": {
-                "enabled": true
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT sum(aws.s3.storagelens.ObjectCount) as 'Objects' WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 2 weeks ago TIMESERIES 1 day"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Average object size trend (bytes)",
-            "layout": {
-              "column": 1,
-              "row": 5,
-              "width": 4,
-              "height": 3
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.area"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "legend": {
-                "enabled": true
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT sum(aws.s3.storagelens.StorageBytes)/sum(aws.s3.storagelens.ObjectCount) as 'Object size (bytes)' WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 2 weeks ago TIMESERIES 1 day"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Bucket count trend",
-            "layout": {
-              "column": 5,
-              "row": 6,
-              "width": 4,
-              "height": 3
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.line"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "legend": {
-                "enabled": true
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT uniqueCount(aws.s3.storagelens.bucket_name) as 'Active Buckets' WHERE metricName = 'aws.s3.storagelens.StorageBytes' AND `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 2 weeks ago TIMESERIES"
-                },
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT uniqueCount(aws.s3.storagelens.bucket_name) as 'Total Buckets' WHERE  `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 2 weeks ago TIMESERIES"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              },
-              "thresholds": {
-                "isLabelVisible": true
-              },
-              "yAxisLeft": {
-                "zero": true
-              },
-              "yAxisRight": {
-                "zero": true
-              }
-            }
-          },
-          {
-            "title": "Total Storage by region",
-            "layout": {
-              "column": 9,
-              "row": 6,
-              "width": 4,
-              "height": 3
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.pie"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": true
-              },
-              "legend": {
-                "enabled": true
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT sum(aws.s3.storagelens.StorageBytes) WHERE `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) FACET aws.s3.storagelens.aws_region SINCE 1 day ago"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Top 10 buckets",
-            "layout": {
-              "column": 1,
-              "row": 8,
-              "width": 4,
-              "height": 4
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.bar"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT sum(aws.s3.storagelens.StorageBytes) as 'Total Storage'  FACET aws.s3.storagelens.bucket_name WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 1 day ago LIMIT 10"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Top 5 regions",
-            "layout": {
-              "column": 5,
-              "row": 9,
-              "width": 4,
-              "height": 3
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.bar"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT sum(aws.s3.storagelens.StorageBytes) as 'Total Storage'  FACET aws.s3.storagelens.aws_region WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 1 day ago LIMIT 5"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Top 5 accounts",
-            "layout": {
-              "column": 9,
-              "row": 9,
-              "width": 4,
-              "height": 3
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.bar"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "FROM Metric SELECT sum(aws.s3.storagelens.StorageBytes) as 'Total Storage'  FACET aws.s3.storagelens.aws_account_number WHERE `aws.s3.storagelens.aws_region` IN ({{aws_region}}) AND `aws.s3.storagelens.aws_account_number` IN ({{aws_account}}) AND `aws.s3.storagelens.bucket_name` IN ({{aws_bucket}}) AND `aws.s3.storagelens.storage_class` IN ({{aws_storageClass}}) SINCE 1 day ago LIMIT 5"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "variables": [
-      {
-        "name": "aws_region",
-        "items": null,
-        "defaultValues": [
-          {
-            "value": {
-              "string": "*"
-            }
-          }
-        ],
-        "nrqlQuery": {
-          "accountIds": [],
-          "query": "FROM Metric SELECT uniques(aws.s3.storagelens.aws_region) SINCE 2 days ago"
-        },
-        "options": {
-          "ignoreTimeRange": true
-        },
-        "title": "Region",
-        "type": "NRQL",
-        "isMultiSelection": true,
-        "replacementStrategy": "STRING"
-      },
-      {
-        "name": "aws_account",
-        "items": null,
-        "defaultValues": [
-          {
-            "value": {
-              "string": "*"
-            }
-          }
-        ],
-        "nrqlQuery": {
-          "accountIds": [],
-          "query": "FROM Metric SELECT uniques(aws.s3.storagelens.aws_account_number) SINCE 2 days ago"
-        },
-        "options": {
-          "ignoreTimeRange": true
-        },
-        "title": "Account",
-        "type": "NRQL",
-        "isMultiSelection": true,
-        "replacementStrategy": "STRING"
-      },
-      {
-        "name": "aws_bucket",
-        "items": null,
-        "defaultValues": [
-          {
-            "value": {
-              "string": "*"
-            }
-          }
-        ],
-        "nrqlQuery": {
-          "accountIds": [],
-          "query": "FROM  Metric SELECT uniques(aws.s3.storagelens.bucket_name) SINCE 2 days ago"
-        },
-        "options": {
-          "ignoreTimeRange": true
-        },
-        "title": "Buckets",
-        "type": "NRQL",
-        "isMultiSelection": true,
-        "replacementStrategy": "STRING"
-      },
-      {
-        "name": "aws_storageClass",
-        "items": null,
-        "defaultValues": [
-          {
-            "value": {
-              "string": "*"
-            }
-          }
-        ],
-        "nrqlQuery": {
-          "accountIds": [],
-          "query": "FROM Metric SELECT uniques(aws.s3.storagelens.storage_class) SINCE 2 days ago"
-        },
-        "options": {
-          "ignoreTimeRange": true
-        },
-        "title": "Storage Class",
-        "type": "NRQL",
-        "isMultiSelection": true,
-        "replacementStrategy": "STRING"
-      }
-    ]
-  }
\ No newline at end of file
diff --git a/dashboards/amazon-s3-storagelens/amazon-s3-storagelens01.png b/dashboards/amazon-s3-storagelens/amazon-s3-storagelens01.png
deleted file mode 100644
index c8732c6e51..0000000000
Binary files a/dashboards/amazon-s3-storagelens/amazon-s3-storagelens01.png and /dev/null differ
diff --git a/dashboards/amazon-s3-storagelens/amazon-s3-storagelens02.png b/dashboards/amazon-s3-storagelens/amazon-s3-storagelens02.png
deleted file mode 100644
index e293745bb7..0000000000
Binary files a/dashboards/amazon-s3-storagelens/amazon-s3-storagelens02.png and /dev/null differ
diff --git a/dashboards/network-flow-devices/network-flow-devices.json b/dashboards/network-flow-devices/network-flow-devices.json
new file mode 100644
index 0000000000..07d152b0f7
--- /dev/null
+++ b/dashboards/network-flow-devices/network-flow-devices.json
@@ -0,0 +1,340 @@
+{
+    "name": "Kentik Firehose",
+    "description": "",
+    "pages": [
+      {
+        "name": "Top Talkers",
+        "description": "",
+        "widgets": [
+          {
+            "visualization": {
+              "id": "viz.pie"
+            },
+            "layout": {
+              "column": 1,
+              "row": 1,
+              "height": 8,
+              "width": 6
+            },
+            "title": "Top 10 - Conversations",
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": false
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT sum(in_bytes) AS 'bytes' FACET src_endpoint AS 'Source', application, dst_endpoint AS 'Destination' SINCE 1 HOUR AGO LIMIT 10"
+                }
+              ]
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "viz.bar"
+            },
+            "layout": {
+              "column": 7,
+              "row": 1,
+              "height": 8,
+              "width": 3
+            },
+            "title": "Top 10 - Known Apps by TCP Port",
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": false
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT sum(in_bytes) AS 'bytes' FACET l4_src_port AS 'TCP Port', application WHERE application IS NOT NULL SINCE 1 HOUR AGO LIMIT 10"
+                }
+              ]
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "viz.bar"
+            },
+            "layout": {
+              "column": 10,
+              "row": 1,
+              "height": 4,
+              "width": 3
+            },
+            "title": "Top 5 - Source Endpoints",
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": false
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT sum(in_bytes) AS 'bytes' FACET src_endpoint SINCE 1 HOUR AGO LIMIT 5"
+                }
+              ]
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "viz.bar"
+            },
+            "layout": {
+              "column": 10,
+              "row": 5,
+              "height": 4,
+              "width": 3
+            },
+            "title": "Top 5 - Destination Endpoints",
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": false
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT sum(in_bytes) AS 'bytes' FACET dst_endpoint SINCE 1 HOUR AGO LIMIT 5"
+                }
+              ]
+            },
+            "linkedEntityGuids": null
+          }
+        ]
+      },
+      {
+        "name": "Flow Overview",
+        "description": "",
+        "widgets": [
+          {
+            "visualization": {
+              "id": "38301291-54c7-4042-855f-777bbf9e9294.kentik-map"
+            },
+            "layout": {
+              "column": 1,
+              "row": 1,
+              "height": 8,
+              "width": 4
+            },
+            "title": "Traffic by Geo",
+            "rawConfiguration": {
+              "accountId": 0,
+              "autoZoom": null,
+              "initialLat": "41.8336479",
+              "initialLng": "-87.8720462",
+              "initialZoom": "3",
+              "metric": "kentik.rollup.bytes.rcv",
+              "showTable": true
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "viz.bar"
+            },
+            "layout": {
+              "column": 5,
+              "row": 1,
+              "height": 4,
+              "width": 3
+            },
+            "title": "Top 5 - bps per Destination Geo",
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": true
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT rate(sum(in_bytes)*8, 1 SECOND) FACET dst_geo AS 'Geo' WHERE instrumentation.name = 'netflow-events' AND dst_geo IS NOT NULL LIMIT 5"
+                }
+              ]
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "38301291-54c7-4042-855f-777bbf9e9294.kentik-sankey"
+            },
+            "layout": {
+              "column": 8,
+              "row": 1,
+              "height": 8,
+              "width": 5
+            },
+            "title": "Source > Destination by Geo",
+            "rawConfiguration": {
+              "chartName": "",
+              "dimensionLeft": "src_geo",
+              "dimensionRight": "dst_geo",
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "select rate(sum(in_bytes*sample_rate)*8/1000/1000, 1 second) as mbits from KFlow facet src_geo, dst_geo where src_geo is not null or dst_geo is not null since 60 minutes ago"
+                }
+              ],
+              "showTable": false
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "viz.bar"
+            },
+            "layout": {
+              "column": 5,
+              "row": 5,
+              "height": 4,
+              "width": 3
+            },
+            "title": "Top 5 - bps per Source Geo",
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": true
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT rate(sum(in_bytes)*8, 1 SECOND) FACET src_geo AS 'Geo' WHERE instrumentation.name = 'netflow-events' AND src_geo IS NOT NULL LIMIT 5"
+                }
+              ]
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "viz.line"
+            },
+            "layout": {
+              "column": 1,
+              "row": 9,
+              "height": 4,
+              "width": 4
+            },
+            "title": "Total Endpoints",
+            "rawConfiguration": {
+              "legend": {
+                "enabled": true
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT uniqueCount(src_addr) AS 'Sources', uniqueCount(dst_addr) AS 'Destinations' WHERE instrumentation.name = 'netflow-events' TIMESERIES "
+                }
+              ],
+              "yAxisLeft": {
+                "zero": false
+              }
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "viz.bar"
+            },
+            "layout": {
+              "column": 5,
+              "row": 9,
+              "height": 4,
+              "width": 3
+            },
+            "title": "Top 5 - bps per Destination ASN",
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": true
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT rate(sum(in_bytes)*8, 1 SECOND) FACET dst_as_name AS 'ASN' WHERE instrumentation.name = 'netflow-events' AND dst_as_name IS NOT NULL LIMIT 5"
+                }
+              ]
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "38301291-54c7-4042-855f-777bbf9e9294.kentik-sankey"
+            },
+            "layout": {
+              "column": 8,
+              "row": 9,
+              "height": 8,
+              "width": 5
+            },
+            "title": "Source > Destination by ASN",
+            "rawConfiguration": {
+              "chartName": "",
+              "dimensionLeft": "src_as_name",
+              "dimensionRight": "dst_as_name",
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "select rate(sum(in_bytes*sample_rate)*8/1000/1000, 1 second) as mbits from KFlow facet src_as_name, dst_as_name where src_as_name is not null or dst_as_name is not null since 60 minutes ago"
+                }
+              ],
+              "showTable": false
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "viz.line"
+            },
+            "layout": {
+              "column": 1,
+              "row": 13,
+              "height": 4,
+              "width": 4
+            },
+            "title": "Estimated Packets/sec (Flows * Sample Rate)",
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": false
+              },
+              "legend": {
+                "enabled": true
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT count(*) * latest(sample_rate) AS 'Packets/sec' WHERE instrumentation.name = 'netflow-events' FACET device_name TIMESERIES "
+                }
+              ],
+              "yAxisLeft": {
+                "zero": true
+              }
+            },
+            "linkedEntityGuids": null
+          },
+          {
+            "visualization": {
+              "id": "viz.bar"
+            },
+            "layout": {
+              "column": 5,
+              "row": 13,
+              "height": 4,
+              "width": 3
+            },
+            "title": "Top 5 - bps per Source ASN",
+            "rawConfiguration": {
+              "facet": {
+                "showOtherSeries": true
+              },
+              "nrqlQueries": [
+                {
+                  "accountId": 0,
+                  "query": "FROM KFlow SELECT rate(sum(in_bytes)*8, 1 SECOND) FACET src_as_name AS 'ASN' WHERE instrumentation.name = 'netflow-events' AND src_as_name IS NOT NULL LIMIT 5"
+                }
+              ]
+            },
+            "linkedEntityGuids": null
+          }
+        ]
+      }
+    ]
+  }
+  
\ No newline at end of file
diff --git a/dashboards/network-flow-devices/network-flow-devices01.png b/dashboards/network-flow-devices/network-flow-devices01.png
new file mode 100644
index 0000000000..239f624cb4
Binary files /dev/null and b/dashboards/network-flow-devices/network-flow-devices01.png differ
diff --git a/dashboards/network-flow-devices/network-flow-devices02.png b/dashboards/network-flow-devices/network-flow-devices02.png
new file mode 100644
index 0000000000..52d2a06436
Binary files /dev/null and b/dashboards/network-flow-devices/network-flow-devices02.png differ
diff --git a/dashboards/onepane/onepane.json b/dashboards/onepane/onepane.json
deleted file mode 100644
index 2017774721..0000000000
--- a/dashboards/onepane/onepane.json
+++ /dev/null
@@ -1,210 +0,0 @@
-{
-    "name": "Onepane Dashboard",
-    "description": null,
-    "pages": [
-      {
-        "name": "Overview",
-        "description": null,
-        "widgets": [
-          {
-            "title": "",
-            "layout": {
-              "column": 1,
-              "row": 1,
-              "width": 4,
-              "height": 1
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.markdown"
-            },
-            "rawConfiguration": {
-              "text": "# ![Onepane](https://console.onepane.ai/images/logos/full-logo.svg) \n### Simplifying and enhancing your cloud experience [](https://www.onepane.ai/)"
-            }
-          },
-          {
-            "title": "Incidents and Issues",
-            "layout": {
-              "column": 5,
-              "row": 1,
-              "width": 8,
-              "height": 4
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.line"
-            },
-            "rawConfiguration": {
-              "colors": {
-                "seriesOverrides": [
-                  {
-                    "color": "#fe1616",
-                    "seriesName": "Issues"
-                  },
-                  {
-                    "color": "#194342",
-                    "seriesName": "Incidents"
-                  }
-                ]
-              },
-              "facet": {
-                "showOtherSeries": false
-              },
-              "legend": {
-                "enabled": true
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "SELECT filter(count(*), WHERE event ='open') AS Incidents, filter(count(*),WHERE event != 'close') AS Issues FROM NrAiIncident, NrAiIssue TIMESERIES "
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              },
-              "thresholds": {
-                "isLabelVisible": true
-              },
-              "yAxisLeft": {
-                "zero": true
-              },
-              "yAxisRight": {
-                "zero": true
-              }
-            }
-          },
-          {
-            "title": "Deployment Count by Owner",
-            "layout": {
-              "column": 1,
-              "row": 2,
-              "width": 4,
-              "height": 2
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.bar"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "SELECT count(*) AS EventCount\r\nFROM \r\n  Deployment\r\nFACET user\r\n"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Pipeline Triggered Reason",
-            "layout": {
-              "column": 1,
-              "row": 4,
-              "width": 4,
-              "height": 3
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.pie"
-            },
-            "rawConfiguration": {
-              "colors": {
-                "seriesOverrides": [
-                  {
-                    "color": "#f70808",
-                    "seriesName": "PR Triggered"
-                  },
-                  {
-                    "color": "#0c8097",
-                    "seriesName": "Manual Triggered"
-                  },
-                  {
-                    "color": "#b7e316",
-                    "seriesName": "CI Triggered"
-                  }
-                ]
-              },
-              "facet": {
-                "showOtherSeries": true
-              },
-              "legend": {
-                "enabled": true
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "SELECT count(*) as counts\r\nFROM Deployment \r\nFACET \r\n  CASES(\r\n    WHERE description LIKE '%EventReason: \\'Manual Triggered%' AS 'Manual Triggered',\r\n    WHERE description LIKE '%EventReason: \\'PR Triggered%' AS 'PR Triggered',\r\n    WHERE description LIKE '%EventReason: \\'CI Triggered%' AS 'CI Triggered'\r\n  )\r\n"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Deployment and Events",
-            "layout": {
-              "column": 5,
-              "row": 5,
-              "width": 8,
-              "height": 4
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.stacked-bar"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": false
-              },
-              "legend": {
-                "enabled": true
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "SELECT filter(count(InfrastructureEvent.entityGuid),WHERE entityGuid IN (SELECT uniques(entity.guid) FROM NrAiIncident where event='open') \r\nAND integrationName ='onepane_integration') as Events, filter(count(Deployment.entity.guid),WHERE entity.guid IN (SELECT uniques(entity.guid) FROM NrAiIncident where event='open')) as Deployments  from InfrastructureEvent, Deployment TIMESERIES"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          },
-          {
-            "title": "Deployments by Application Name",
-            "layout": {
-              "column": 1,
-              "row": 7,
-              "width": 4,
-              "height": 2
-            },
-            "linkedEntityGuids": null,
-            "visualization": {
-              "id": "viz.billboard"
-            },
-            "rawConfiguration": {
-              "facet": {
-                "showOtherSeries": true
-              },
-              "nrqlQueries": [
-                {
-                  "accountIds": [],
-                  "query": "SELECT \r\n count(*) AS EventCount\r\nFROM \r\n  Deployment FACET entity.name\r\n"
-                }
-              ],
-              "platformOptions": {
-                "ignoreTimeRange": false
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "variables": []
-  }
\ No newline at end of file
diff --git a/dashboards/onepane/onepane01.png b/dashboards/onepane/onepane01.png
deleted file mode 100644
index 80117e8c7a..0000000000
Binary files a/dashboards/onepane/onepane01.png and /dev/null differ
diff --git a/data-sources/onepane/config.yml b/data-sources/onepane/config.yml
index b79a91bfb8..56de41518b 100644
--- a/data-sources/onepane/config.yml
+++ b/data-sources/onepane/config.yml
@@ -1,6 +1,6 @@
 id: onepane
-displayName: Onepane
-description: Connect Onepane change tracking and automated RCA to New Relic
+displayName: OnePane
+description: Connect OnePane change tracking and automated RCA to New Relic
 icon: logo.png
 install:
   primary:
diff --git a/install/network/flow/install.yml b/install/network/flow/install.yml
new file mode 100644
index 0000000000..ae377b4408
--- /dev/null
+++ b/install/network/flow/install.yml
@@ -0,0 +1,21 @@
+id: network-flow
+name: Network flow
+title: New Relic network flow monitoring
+description: |
+  Set up your network devices so they send network data to New Relic One.
+
+target:
+  type: agent
+  destination: host
+  os:
+    - linux
+
+install:
+  mode: nerdlet
+  destination:
+    nerdletId: network-performance-monitoring.setup-network-flow
+
+fallback:
+  mode: link
+  destination:
+    url: https://docs.newrelic.com/docs/network-performance-monitoring/setup-performance-monitoring/network-flow-monitoring
\ No newline at end of file
diff --git a/quickstarts/apis/event/config.yml b/quickstarts/apis/event/config.yml
index c7e83883c8..bb0d1e32d3 100644
--- a/quickstarts/apis/event/config.yml
+++ b/quickstarts/apis/event/config.yml
@@ -23,5 +23,3 @@ keywords:
   - custom events
   - new relic
   - MELT
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/apis/trace/config.yml b/quickstarts/apis/trace/config.yml
index a080c7ac80..635b8581f5 100644
--- a/quickstarts/apis/trace/config.yml
+++ b/quickstarts/apis/trace/config.yml
@@ -24,5 +24,3 @@ keywords:
   - zipkin
   - new relic
   - MELT
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/apm-change-tracking/config.yml b/quickstarts/apm-change-tracking/config.yml
index 71736bc790..65f1e6ecf7 100644
--- a/quickstarts/apm-change-tracking/config.yml
+++ b/quickstarts/apm-change-tracking/config.yml
@@ -14,8 +14,6 @@ keywords:
   - marker
   - change
   - tracking
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - change-tracking
 dataSourceIds:
diff --git a/quickstarts/audit/account-data-ingestion-analysis/config.yml b/quickstarts/audit/account-data-ingestion-analysis/config.yml
index de9f083cf6..a593f0ac4b 100644
--- a/quickstarts/audit/account-data-ingestion-analysis/config.yml
+++ b/quickstarts/audit/account-data-ingestion-analysis/config.yml
@@ -13,8 +13,6 @@ authors:
 keywords:
   - data
   - ingest
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - telemetry-data-platform
 dataSourceIds:
diff --git a/quickstarts/aws/amazon-s3-storagelens/config.yml b/quickstarts/aws/amazon-s3-storagelens/config.yml
deleted file mode 100644
index 22155d0489..0000000000
--- a/quickstarts/aws/amazon-s3-storagelens/config.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-id: 423d4d12-0a2a-4ac3-b5ba-4e77832b1937
-slug: aws-s3-storagelens
-description: |-
-  ## What is Amazon S3 Storage Lens?
-
-  Provides developers and IT teams with deeper understanding and insights into their secure, durable, highly-scalable cloud
-  storage.
-
-  ### Get started!
-
-  Start monitoring Amazon S3 Storage Lens by connecting Amazon Web Services (AWS) to New Relic!
-
-  Check out our [Amazon S3 Storage Lens documentation](https://docs.newrelic.com/docs/infrastructure/amazon-integrations/aws-integrations-list/aws-s3-storagelens-monitoring-integration/) to instrument your cloud service and manage the stability, scalability, and reliability of your systems with New Relic's infrastructure monitoring capabilities.
-
-summary: |-
-  Monitor Amazon S3 Storage lLens by connecting AWS to New Relic
-icon: logo.svg
-level: New Relic
-authors:
-  - New Relic
-title: Amazon S3 Storage Lens
-documentation:
-  - name: Amazon S3 storage lens installation docs
-    description: |
-      Monitor Amazon S3 Storage Lens by connecting AWS to New Relic.
-    url: >-
-      https://docs.newrelic.com/docs/infrastructure/amazon-integrations/aws-integrations-list/aws-s3-storagelens-monitoring-integration/
-keywords:
-  - aws
-  - amazon web services
-  - storage
-  - logs
-  - logging
-installPlans:
-  - aws-cloudwatch-metric-streams
-dataSourceIds:
-  - amazon-cloudwatch-metric-streams
-dashboards:
-  - amazon-s3-storagelens
diff --git a/quickstarts/aws/amazon-s3-storagelens/logo.svg b/quickstarts/aws/amazon-s3-storagelens/logo.svg
deleted file mode 100644
index 96ecdde007..0000000000
--- a/quickstarts/aws/amazon-s3-storagelens/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Icon-Resource/Storage/Res_Amazon-Simple-Storage-Service_S3-Storage-Lens_48</title>
-    <g id="Icon-Resource/Storage/Res_Amazon-Simple-Storage-Service_S3-Storage-Lens_48" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M10.604,25.036 L10.604,23.036 C13.781,23.036 16.365,25.62 16.365,28.797 L14.365,28.797 C14.365,26.723 12.677,25.036 10.604,25.036 M40.813,26.016 L41.097,24.266 C43.145,25.466 43.771,26.158 43.956,26.453 C43.641,26.513 42.789,26.537 40.813,26.016 M23.641,13.481 C13.299,13.481 6.293,11.012 5.779,9.228 L5.75,9.019 C5.889,7.227 13.227,4 23.641,4 C34.056,4 41.395,7.227 41.534,9.019 L41.505,9.228 C40.991,11.012 33.984,13.481 23.641,13.481 M17,28.5 C17,32.084 14.083,35 10.5,35 C6.916,35 4,32.084 4,28.5 C4,24.916 6.916,22 10.5,22 C14.083,22 17,24.916 17,28.5 M45.999,26.249 C45.774,25.051 44.36,23.785 41.438,22.16 L43.471,9.619 C43.473,9.61 43.469,9.6 43.47,9.591 L43.475,9.591 L43.527,9.203 C43.533,9.159 43.536,9.115 43.536,9.071 C43.536,4.904 33.051,2 23.641,2 C14.232,2 3.749,4.904 3.749,9.071 C3.749,9.115 3.751,9.159 3.757,9.203 L3.809,9.591 L3.82,9.59 C3.823,9.612 3.815,9.634 3.82,9.656 L6.142,21.216 C3.666,22.703 2,25.407 2,28.5 C2,33.187 5.813,37 10.5,37 C11.498,37 12.453,36.818 13.343,36.5 L18.108,45.665 L19.883,44.743 L15.138,35.614 C17.459,34.095 19,31.476 19,28.5 C19,23.813 15.186,20 10.5,20 C9.634,20 8.8,20.132 8.013,20.373 L6.414,12.411 C10.094,14.435 17.034,15.481 23.641,15.481 C30.33,15.481 37.359,14.41 41.004,12.336 L38.88,25.441 C34.419,23.991 28.708,21.397 25.988,20.12 C25.99,20.079 26,20.041 26,20 C26,18.897 25.102,18 24,18 C22.897,18 22,18.897 22,20 C22,21.103 22.897,22 24,22 C24.308,22 24.597,21.924 24.858,21.799 C27.901,23.236 33.885,25.956 38.556,27.439 L36.35,41.046 C35.918,41.636 32.515,44.051 23.641,44.051 L23.641,46.051 C32.912,46.051 38.122,43.317 38.327,41.355 L40.492,27.997 C41.731,28.316 42.74,28.485 43.528,28.485 C44.518,28.485 45.186,28.233 45.611,27.726 C45.96,27.309 46.098,26.785 45.999,26.249" id="Fill-1" fill="#7AA116"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/quickstarts/boomi/config.yaml b/quickstarts/boomi/config.yaml
index 33c6f0d4cc..2f3b364651 100644
--- a/quickstarts/boomi/config.yaml
+++ b/quickstarts/boomi/config.yaml
@@ -20,8 +20,6 @@ keywords:
   - boomi
   - apm
   - traces
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - boomi
 documentation:
diff --git a/quickstarts/botolytics/config.yml b/quickstarts/botolytics/config.yml
index 8648b559ee..ed3970a51a 100644
--- a/quickstarts/botolytics/config.yml
+++ b/quickstarts/botolytics/config.yml
@@ -20,8 +20,6 @@ keywords:
   - bot
   - traffic analysis
   - apm
-  - NR1_addData
-  - NR1_sys
 
 documentation:
   - name: Installation docs
diff --git a/quickstarts/browser-segment-investigation/config.yml b/quickstarts/browser-segment-investigation/config.yml
index bbf9fec58b..b60b68ba6e 100644
--- a/quickstarts/browser-segment-investigation/config.yml
+++ b/quickstarts/browser-segment-investigation/config.yml
@@ -15,8 +15,6 @@ keywords:
   - browser
   - segment
   - segments
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Usage instructions
     url: https://docs.newrelic.com/docs/new-relic-solutions/observability-maturity/customer-experience/quality-foundation-implementation-guide#validate-browser-url-grouping
diff --git a/quickstarts/calico/config.yml b/quickstarts/calico/config.yml
index 540cc849da..6036b2cae3 100644
--- a/quickstarts/calico/config.yml
+++ b/quickstarts/calico/config.yml
@@ -17,8 +17,6 @@ keywords:
   - prometheus
   - remote-write
   - cni
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-prometheus
   - setup-prometheus-agent-mode
diff --git a/quickstarts/catchpoint/config.yml b/quickstarts/catchpoint/config.yml
index cb00a97b5d..55a5643c6e 100644
--- a/quickstarts/catchpoint/config.yml
+++ b/quickstarts/catchpoint/config.yml
@@ -22,8 +22,6 @@ keywords:
   - timestamp
   - catchpoint
   - metrics api
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Catchpoint installation docs
     url: https://www.catchpoint.com/blog/webhook-implementation
diff --git a/quickstarts/centos/config.yml b/quickstarts/centos/config.yml
index 23c611cc25..03ea23813a 100644
--- a/quickstarts/centos/config.yml
+++ b/quickstarts/centos/config.yml
@@ -22,8 +22,6 @@ documentation:
 keywords:
   - os
   - operating system
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - guided-install
 dataSourceIds:
diff --git a/quickstarts/cloudfoundry/config.yml b/quickstarts/cloudfoundry/config.yml
index 34f3a9d23f..d481aaba94 100644
--- a/quickstarts/cloudfoundry/config.yml
+++ b/quickstarts/cloudfoundry/config.yml
@@ -17,7 +17,5 @@ keywords:
   - containers
   - kubernetes
   - k8s
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - vmware-tanzu
diff --git a/quickstarts/cockroach-db/config.yml b/quickstarts/cockroach-db/config.yml
index fdb534a02f..84f00e7da4 100644
--- a/quickstarts/cockroach-db/config.yml
+++ b/quickstarts/cockroach-db/config.yml
@@ -20,8 +20,6 @@ keywords:
   - prometheus
   - remote-write
   - sql
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-prometheus
   - setup-prometheus-agent-mode
diff --git a/quickstarts/confluent-cloud/config.yml b/quickstarts/confluent-cloud/config.yml
index 5d86ecb4ad..6aa562e0f3 100644
--- a/quickstarts/confluent-cloud/config.yml
+++ b/quickstarts/confluent-cloud/config.yml
@@ -36,8 +36,6 @@ keywords:
   - Kafka
   - newrelic partner
   - featured
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-confluent-cloud
 dataSourceIds:
diff --git a/quickstarts/conviva/config.yml b/quickstarts/conviva/config.yml
index 75c77bcaab..371389eee3 100644
--- a/quickstarts/conviva/config.yml
+++ b/quickstarts/conviva/config.yml
@@ -57,8 +57,6 @@ keywords:
   - NRI
   - integration
   - newrelic
-  - NR1_addData
-  - NR1_sys
 
 # Reference to dashboards to be included in this quickstart
 dashboards:
diff --git a/quickstarts/core-web-vitals/config.yml b/quickstarts/core-web-vitals/config.yml
index 0ba677cab3..045d5ccae3 100644
--- a/quickstarts/core-web-vitals/config.yml
+++ b/quickstarts/core-web-vitals/config.yml
@@ -46,8 +46,6 @@ keywords:
   - safari
   - ajax
   - core web vitals
-  - NR1_addData
-  - NR1_sys
 
 dashboards:
   - core-web-vitals
diff --git a/quickstarts/coredns/config.yml b/quickstarts/coredns/config.yml
index 39423b4bcb..8bed306f80 100644
--- a/quickstarts/coredns/config.yml
+++ b/quickstarts/coredns/config.yml
@@ -19,8 +19,6 @@ keywords:
   - promql
   - grafana
   - featured
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Prometheus Installation Docs
     description: |
diff --git a/quickstarts/dapr/config.yml b/quickstarts/dapr/config.yml
index 0d4bfd562c..f5c68bdc88 100644
--- a/quickstarts/dapr/config.yml
+++ b/quickstarts/dapr/config.yml
@@ -13,8 +13,6 @@ authors:
 keywords:
   - apm
   - dapr
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - dapr-metrics
   - dapr-system-services
diff --git a/quickstarts/debian/config.yml b/quickstarts/debian/config.yml
index 4aea2d18cd..f18964a40a 100644
--- a/quickstarts/debian/config.yml
+++ b/quickstarts/debian/config.yml
@@ -24,8 +24,6 @@ documentation:
 keywords:
   - os
   - operating system
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - guided-install
 dataSourceIds:
diff --git a/quickstarts/docker-otel/config.yml b/quickstarts/docker-otel/config.yml
index a521060da6..60138e63a4 100644
--- a/quickstarts/docker-otel/config.yml
+++ b/quickstarts/docker-otel/config.yml
@@ -38,5 +38,3 @@ keywords:
   - docker
   - infrastructure
   - featured
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/dojo/config.yml b/quickstarts/dojo/config.yml
index c78519551d..2667a0cd37 100644
--- a/quickstarts/dojo/config.yml
+++ b/quickstarts/dojo/config.yml
@@ -33,8 +33,6 @@ documentation:
 keywords:
   - dojo
   - browser monitoring
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - dojo
 dashboards:
diff --git a/quickstarts/dotnet/csla-dotnet/config.yml b/quickstarts/dotnet/csla-dotnet/config.yml
index 2163de5ddf..a6753fe635 100644
--- a/quickstarts/dotnet/csla-dotnet/config.yml
+++ b/quickstarts/dotnet/csla-dotnet/config.yml
@@ -31,8 +31,6 @@ keywords:
   - apm
   - dotnet
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - dotnet-agent
 dataSourceIds:
diff --git a/quickstarts/dotnet/dnn-community/config.yml b/quickstarts/dotnet/dnn-community/config.yml
index 74dee968a3..5a98508da7 100644
--- a/quickstarts/dotnet/dnn-community/config.yml
+++ b/quickstarts/dotnet/dnn-community/config.yml
@@ -33,8 +33,6 @@ keywords:
   - cms
   - content management system
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - dotnet-agent
 dataSourceIds:
diff --git a/quickstarts/dotnet/dnn-evoq/config.yml b/quickstarts/dotnet/dnn-evoq/config.yml
index 6c4b72afed..baccd2e0f7 100644
--- a/quickstarts/dotnet/dnn-evoq/config.yml
+++ b/quickstarts/dotnet/dnn-evoq/config.yml
@@ -42,8 +42,6 @@ keywords:
   - cms
   - content management system
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - dotnet-agent
 dataSourceIds:
diff --git a/quickstarts/dotnet/episerver-cms/config.yml b/quickstarts/dotnet/episerver-cms/config.yml
index c1c1abed3d..7cf74e41d0 100644
--- a/quickstarts/dotnet/episerver-cms/config.yml
+++ b/quickstarts/dotnet/episerver-cms/config.yml
@@ -34,8 +34,6 @@ keywords:
   - cms
   - content management system
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - dotnet-windows-agent
 dataSourceIds:
diff --git a/quickstarts/dotnet/fubumvc/config.yml b/quickstarts/dotnet/fubumvc/config.yml
index 18820b40b6..11a717fa80 100644
--- a/quickstarts/dotnet/fubumvc/config.yml
+++ b/quickstarts/dotnet/fubumvc/config.yml
@@ -34,8 +34,6 @@ keywords:
   - apm
   - dotnet
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - dotnet-agent
 dataSourceIds:
diff --git a/quickstarts/drupal/config.yml b/quickstarts/drupal/config.yml
index 0ff0cd508c..25996c3249 100644
--- a/quickstarts/drupal/config.yml
+++ b/quickstarts/drupal/config.yml
@@ -35,5 +35,3 @@ keywords:
   - php
   - drupal
   - CMS
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/elixir/config.yml b/quickstarts/elixir/config.yml
index b3ab7e0570..93c1769e9c 100644
--- a/quickstarts/elixir/config.yml
+++ b/quickstarts/elixir/config.yml
@@ -22,8 +22,6 @@ keywords:
   - apm
   - elixir
   - language agent
-  - NR1_addData
-  - NR1_sys
 
 installPlans:
   - setup-elixir-agent
diff --git a/quickstarts/etcd/config.yml b/quickstarts/etcd/config.yml
index da6dfa0157..d2d1c1a8bb 100644
--- a/quickstarts/etcd/config.yml
+++ b/quickstarts/etcd/config.yml
@@ -23,8 +23,6 @@ keywords:
   - prometheus
   - remote-write
   - featured
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-prometheus
   - setup-prometheus-agent-mode
diff --git a/quickstarts/fivetran/config.yml b/quickstarts/fivetran/config.yml
index 81f60a62b1..b9ca65330d 100644
--- a/quickstarts/fivetran/config.yml
+++ b/quickstarts/fivetran/config.yml
@@ -17,8 +17,6 @@ keywords:
   - fivetran
   - connector
   - pipeline
-  - NR1_addData
-  - NR1_sys
 icon: logo.jpeg
 # Reference to alert policies to be included in this quickstart
 alertPolicies:
diff --git a/quickstarts/fluent-bit-plugin-for-logs/config.yml b/quickstarts/fluent-bit-plugin-for-logs/config.yml
index 6f66cab5ed..dd840181cc 100644
--- a/quickstarts/fluent-bit-plugin-for-logs/config.yml
+++ b/quickstarts/fluent-bit-plugin-for-logs/config.yml
@@ -20,8 +20,6 @@ documentation:
 keywords:
   - logs
   - logging
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-fluent-bit-plugin-for-logs
 dataSourceIds:
diff --git a/quickstarts/flutter-android/config.yml b/quickstarts/flutter-android/config.yml
index 75bf1c2278..7c493267aa 100644
--- a/quickstarts/flutter-android/config.yml
+++ b/quickstarts/flutter-android/config.yml
@@ -36,8 +36,6 @@ keywords:
   - flutter android application
   - android agent
   - flutter agent
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - flutter-android
 alertPolicies:
diff --git a/quickstarts/flutter-ios/config.yml b/quickstarts/flutter-ios/config.yml
index ea6dddd604..0e0aabb3aa 100644
--- a/quickstarts/flutter-ios/config.yml
+++ b/quickstarts/flutter-ios/config.yml
@@ -38,8 +38,6 @@ keywords:
   - flutter ios application
   - ios agent
   - flutter agent
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - flutter-ios
 alertPolicies:
diff --git a/quickstarts/flutter-web/config.yml b/quickstarts/flutter-web/config.yml
index 802cd5438a..5aefae2eca 100644
--- a/quickstarts/flutter-web/config.yml
+++ b/quickstarts/flutter-web/config.yml
@@ -34,8 +34,6 @@ keywords:
   - flutter
   - flutter web application
   - browser agent
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - flutter-web
 dashboards:
diff --git a/quickstarts/full-stack-observability/config.yml b/quickstarts/full-stack-observability/config.yml
index bedbdd479f..7c2670ef2c 100644
--- a/quickstarts/full-stack-observability/config.yml
+++ b/quickstarts/full-stack-observability/config.yml
@@ -17,8 +17,6 @@ dataSourceIds:
   - guided-install
 keywords:
   - full stack observability
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - full-stack-observability
 
diff --git a/quickstarts/full-story/config.yml b/quickstarts/full-story/config.yml
index 35f500473e..b61a8b9370 100644
--- a/quickstarts/full-story/config.yml
+++ b/quickstarts/full-story/config.yml
@@ -9,8 +9,6 @@ summary: |
 icon: logo.png
 keywords:
   - newrelic partner
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-full-story
 dataSourceIds:
diff --git a/quickstarts/gcp/gcp-composer/config.yml b/quickstarts/gcp/gcp-composer/config.yml
index 9b11f8913e..83d68b92d7 100644
--- a/quickstarts/gcp/gcp-composer/config.yml
+++ b/quickstarts/gcp/gcp-composer/config.yml
@@ -28,8 +28,6 @@ keywords:
   - gcp
   - google cloud platform
   - composer
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - google-cloud-platform
 dashboards:
diff --git a/quickstarts/gcp/gcp-dedicated-interconnect/config.yml b/quickstarts/gcp/gcp-dedicated-interconnect/config.yml
index 1e88741fce..dca63a356d 100644
--- a/quickstarts/gcp/gcp-dedicated-interconnect/config.yml
+++ b/quickstarts/gcp/gcp-dedicated-interconnect/config.yml
@@ -31,8 +31,6 @@ keywords:
   - gcp
   - google cloud platform
   - networking
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - gcp-infrastructure-monitoring
 dataSourceIds:
diff --git a/quickstarts/gcp/gcp-redis/config.yml b/quickstarts/gcp/gcp-redis/config.yml
index 5be600b665..19736c4948 100644
--- a/quickstarts/gcp/gcp-redis/config.yml
+++ b/quickstarts/gcp/gcp-redis/config.yml
@@ -29,8 +29,6 @@ keywords:
   - google cloud platform
   - redis
   - memorystore
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - google-cloud-platform
 dashboards:
diff --git a/quickstarts/gcp/google-app-engine/config.yml b/quickstarts/gcp/google-app-engine/config.yml
index 6265d01707..cba47f9f92 100644
--- a/quickstarts/gcp/google-app-engine/config.yml
+++ b/quickstarts/gcp/google-app-engine/config.yml
@@ -30,8 +30,6 @@ documentation:
 keywords:
   - gcp
   - google cloud platform
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - gcp-infrastructure-monitoring
 dataSourceIds:
diff --git a/quickstarts/gcp/google-cloud-bigtable/config.yml b/quickstarts/gcp/google-cloud-bigtable/config.yml
index 39a89a4188..0be920a250 100644
--- a/quickstarts/gcp/google-cloud-bigtable/config.yml
+++ b/quickstarts/gcp/google-cloud-bigtable/config.yml
@@ -30,8 +30,6 @@ keywords:
   - google cloud platform
   - database
   - bigtable
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - google-cloud-platform
 dashboards:
diff --git a/quickstarts/github-repo/config.yml b/quickstarts/github-repo/config.yml
index d3f85e20f8..66cafda020 100644
--- a/quickstarts/github-repo/config.yml
+++ b/quickstarts/github-repo/config.yml
@@ -19,8 +19,6 @@ keywords:
   - repository
   - workflows
   - pipelines
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - github-repo
 documentation:
diff --git a/quickstarts/gitlab/config.yml b/quickstarts/gitlab/config.yml
index eb32c7b310..aaa5663ce5 100644
--- a/quickstarts/gitlab/config.yml
+++ b/quickstarts/gitlab/config.yml
@@ -18,8 +18,6 @@ keywords:
   - opentelemetry
   - otel
   - pipelines
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - gitlab
 installPlans:
diff --git a/quickstarts/golang/echo/config.yml b/quickstarts/golang/echo/config.yml
index 5011aab6cc..c148a18d9e 100644
--- a/quickstarts/golang/echo/config.yml
+++ b/quickstarts/golang/echo/config.yml
@@ -25,8 +25,6 @@ documentation:
 keywords:
   - apm
   - golang
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-go-agent
 dataSourceIds:
diff --git a/quickstarts/golang/gin/config.yml b/quickstarts/golang/gin/config.yml
index 9166779a4c..3b6a739d04 100644
--- a/quickstarts/golang/gin/config.yml
+++ b/quickstarts/golang/gin/config.yml
@@ -25,8 +25,6 @@ documentation:
 keywords:
   - apm
   - golang
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-go-agent
 dataSourceIds:
diff --git a/quickstarts/golang/pkg-errors/config.yml b/quickstarts/golang/pkg-errors/config.yml
index 96e8915148..e4ed92b5fd 100644
--- a/quickstarts/golang/pkg-errors/config.yml
+++ b/quickstarts/golang/pkg-errors/config.yml
@@ -23,8 +23,6 @@ keywords:
   - golang
   - errors
   - pkg/errors
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-go-agent
 dataSourceIds:
diff --git a/quickstarts/golang/zap/config.yml b/quickstarts/golang/zap/config.yml
index 3cfa46ed80..59c72bed5d 100644
--- a/quickstarts/golang/zap/config.yml
+++ b/quickstarts/golang/zap/config.yml
@@ -25,8 +25,6 @@ documentation:
 keywords:
   - apm
   - golang
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-go-agent
 dataSourceIds:
diff --git a/quickstarts/golden-signals-dashboard/config.yml b/quickstarts/golden-signals-dashboard/config.yml
index 5179c561e9..6b9e0bae5d 100644
--- a/quickstarts/golden-signals-dashboard/config.yml
+++ b/quickstarts/golden-signals-dashboard/config.yml
@@ -29,8 +29,6 @@ keywords:
   - errors
   - error rates
   - availability
-  - NR1_addData
-  - NR1_sys
 
 # # Reference to alert policies to be included in this quickstart
 # alertPolicies:
diff --git a/quickstarts/golden-signals-web/config.yml b/quickstarts/golden-signals-web/config.yml
index d3acd9f763..62fa1bfb15 100644
--- a/quickstarts/golden-signals-web/config.yml
+++ b/quickstarts/golden-signals-web/config.yml
@@ -49,8 +49,6 @@ keywords:
   - errors
   - saturation
   - site reliability
-  - NR1_addData
-  - NR1_sys
 
 dashboards:
   - golden-signals
diff --git a/quickstarts/java/coldfusion/config.yml b/quickstarts/java/coldfusion/config.yml
index a8ce96ae26..a819462280 100644
--- a/quickstarts/java/coldfusion/config.yml
+++ b/quickstarts/java/coldfusion/config.yml
@@ -31,8 +31,6 @@ keywords:
   - apm
   - java
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-java-agent
 dataSourceIds:
diff --git a/quickstarts/java/cxf/config.yml b/quickstarts/java/cxf/config.yml
index bfb0c4f747..97d2b8ca88 100644
--- a/quickstarts/java/cxf/config.yml
+++ b/quickstarts/java/cxf/config.yml
@@ -26,8 +26,6 @@ keywords:
   - apm
   - java
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-java-agent
 dataSourceIds:
diff --git a/quickstarts/java/datastax-cassandra/config.yml b/quickstarts/java/datastax-cassandra/config.yml
index e2bbcff059..9481890938 100644
--- a/quickstarts/java/datastax-cassandra/config.yml
+++ b/quickstarts/java/datastax-cassandra/config.yml
@@ -16,8 +16,6 @@ keywords:
   - java
   - database
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-java-agent
 dataSourceIds:
diff --git a/quickstarts/java/derby/config.yml b/quickstarts/java/derby/config.yml
index 55409e2414..4024575895 100644
--- a/quickstarts/java/derby/config.yml
+++ b/quickstarts/java/derby/config.yml
@@ -32,8 +32,6 @@ keywords:
   - java
   - database
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-java-agent
 dataSourceIds:
diff --git a/quickstarts/java/ejb-session-beans/config.yml b/quickstarts/java/ejb-session-beans/config.yml
index c0e86d387f..f33aa900c2 100644
--- a/quickstarts/java/ejb-session-beans/config.yml
+++ b/quickstarts/java/ejb-session-beans/config.yml
@@ -30,8 +30,6 @@ keywords:
   - apm
   - java
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-ejb-session-beans
 dataSourceIds:
diff --git a/quickstarts/java/elasticsearch-query/config.yml b/quickstarts/java/elasticsearch-query/config.yml
index ab18ddb935..58aef2095e 100644
--- a/quickstarts/java/elasticsearch-query/config.yml
+++ b/quickstarts/java/elasticsearch-query/config.yml
@@ -21,8 +21,6 @@ keywords:
   - java
   - elasticsearch
   - language agent
-  - NR1_addData
-  - NR1_sys
 authors:
   - New Relic Labs
 installPlans:
diff --git a/quickstarts/java/generic-jdbc/config.yml b/quickstarts/java/generic-jdbc/config.yml
index cfb6410f3f..408b526313 100644
--- a/quickstarts/java/generic-jdbc/config.yml
+++ b/quickstarts/java/generic-jdbc/config.yml
@@ -35,8 +35,6 @@ keywords:
   - apm
   - java
   - language agent
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - java
 alertPolicies:
diff --git a/quickstarts/java/glassfish/config.yml b/quickstarts/java/glassfish/config.yml
index 8b97520a1e..a74b1c4116 100644
--- a/quickstarts/java/glassfish/config.yml
+++ b/quickstarts/java/glassfish/config.yml
@@ -26,8 +26,6 @@ keywords:
   - apm
   - java
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-java-agent
 dataSourceIds:
diff --git a/quickstarts/network-monitoring/cisco-ip-sla-operations/config.yml b/quickstarts/network-monitoring/cisco-ip-sla-operations/config.yml
index b7d9ea8b86..4485180f0b 100644
--- a/quickstarts/network-monitoring/cisco-ip-sla-operations/config.yml
+++ b/quickstarts/network-monitoring/cisco-ip-sla-operations/config.yml
@@ -21,8 +21,6 @@ keywords:
   - cisco
   - ipsla
   - ip sla
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Network SNMP collection installation docs
     url: https://docs.newrelic.com/docs/network-performance-monitoring/setup-performance-monitoring/snmp-performance-monitoring/
diff --git a/quickstarts/network-monitoring/ciscoHardware/config.yml b/quickstarts/network-monitoring/ciscoHardware/config.yml
index 97e92a5b62..4d1e1c485f 100644
--- a/quickstarts/network-monitoring/ciscoHardware/config.yml
+++ b/quickstarts/network-monitoring/ciscoHardware/config.yml
@@ -16,8 +16,6 @@ keywords:
   - ktranslate
   - cisco
   - infrastructure
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: KTranslate Container Health Monitoring docs
     url: https://docs.newrelic.com/docs/network-performance-monitoring/get-started/npm-introduction/
diff --git a/quickstarts/network-monitoring/network-flow-devices/config.yml b/quickstarts/network-monitoring/network-flow-devices/config.yml
new file mode 100644
index 0000000000..426665d3b9
--- /dev/null
+++ b/quickstarts/network-monitoring/network-flow-devices/config.yml
@@ -0,0 +1,42 @@
+id: 6d275d10-9aaf-4351-b556-0174fca3ffca
+slug: network-flow-devices
+title: Network Flow Devices
+description: |
+  The Network Flow Devices quickstart provides dashboards and alerts designed to give you deeper insights into your flow data.
+
+  Use this quickstart together with New Relic's Network Performance Monitoring (NPM) feature to visualize how users are consuming  your bandwidth.
+
+  (This quickstart contains Custom Visualizations which require Full User permissions to access)
+summary: |
+  Network Flow Devices from NPM give you valuable insights into how your network bandwidth is being used.
+level: Verified
+authors:
+  - New Relic
+  - Zack Mutchler
+keywords:
+  - npm
+  - network
+  - networking
+  - flow
+  - netflow
+  - sflow
+  - ipfix
+  - jflow
+  - ktranslate
+  - kentik
+  - infrastructure
+  - newrelic partner
+documentation:
+  - name: Network flow data installation docs
+    url: https://docs.newrelic.com/docs/network-performance-monitoring/setup-performance-monitoring/network-flow-monitoring/
+    description: |
+      Install NPM for flow data collection using a simple Docker container.
+installPlans:
+  - network-flow
+dataSourceIds:
+  - network-syslog
+icon: logo.svg
+dashboards:
+  - network-flow-devices
+alertPolicies:
+  - network-flow-devices
diff --git a/quickstarts/network-monitoring/network-flow-devices/logo.svg b/quickstarts/network-monitoring/network-flow-devices/logo.svg
new file mode 100644
index 0000000000..8dea5435a1
--- /dev/null
+++ b/quickstarts/network-monitoring/network-flow-devices/logo.svg
@@ -0,0 +1,43 @@
+<svg viewBox="0 0 330 60" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <clipPath id="a">
+      <path fill="#fff" d="M0 0h82.431v16H0z"></path>
+    </clipPath>
+    <clipPath id="clip-1">
+      <path fill="#fff" d="M0 0h82.431v16H0z"></path>
+    </clipPath>
+    <linearGradient gradientUnits="userSpaceOnUse" x1="121.91" y1="59.2" x2="121.91" y2="78.526" id="gradient-0">
+      <stop offset="0" style="stop-color: rgba(211, 206, 137, 1)"></stop>
+      <stop offset="1" style="stop-color: rgba(179, 172, 67, 1)"></stop>
+    </linearGradient>
+  </defs>
+  <g id="text" transform="matrix(1, 0, 0, 1, 67.089386, -32.604816)">
+    <path d="M 162.31 44.18 C 162.369 45.072 161.997 45.938 161.31 46.51 C 160.433 47.119 159.374 47.408 158.31 47.33 L 157.13 47.33 L 157.13 51.26 L 156 51.26 L 156 41.26 L 158.59 41.26 C 161.07 41.267 162.31 42.24 162.31 44.18 Z M 157.13 46.33 L 158.18 46.33 C 158.957 46.395 159.735 46.221 160.41 45.83 C 160.895 45.447 161.155 44.846 161.1 44.23 C 161.145 43.662 160.901 43.109 160.45 42.76 C 159.852 42.389 159.152 42.217 158.45 42.27 L 157.15 42.27 L 157.13 46.33 Z"></path>
+    <path d="M 170.56 47.51 C 170.621 48.546 170.289 49.568 169.63 50.37 C 168.971 51.066 168.036 51.433 167.08 51.37 C 166.455 51.38 165.839 51.217 165.3 50.9 C 164.774 50.575 164.357 50.102 164.1 49.54 C 163.798 48.896 163.651 48.191 163.67 47.48 C 163.61 46.445 163.938 45.425 164.59 44.62 C 165.248 43.929 166.177 43.563 167.13 43.62 C 168.071 43.565 168.987 43.932 169.63 44.62 C 170.297 45.429 170.63 46.463 170.56 47.51 Z M 164.85 47.51 C 164.798 48.282 164.998 49.051 165.42 49.7 C 166.325 50.699 167.895 50.699 168.8 49.7 C 169.23 49.054 169.434 48.284 169.38 47.51 C 169.435 46.742 169.231 45.978 168.8 45.34 C 167.883 44.359 166.327 44.359 165.41 45.34 C 164.995 45.984 164.799 46.745 164.85 47.51 Z"></path>
+    <path d="M 178.52 51.26 L 177.15 46.87 C 177.06 46.6 176.9 45.99 176.66 45.03 C 176.48 45.83 176.32 46.45 176.18 46.88 L 174.76 51.26 L 173.4 51.26 L 171.4 43.77 L 172.59 43.77 L 173.69 48.07 C 173.872 48.728 174.019 49.396 174.13 50.07 C 174.18 49.81 174.26 49.47 174.37 49.07 C 174.48 48.67 174.58 48.33 174.66 48.07 L 176.04 43.77 L 177.27 43.77 L 178.61 48.07 C 178.83 48.724 179.004 49.392 179.13 50.07 L 179.18 50.07 C 179.217 49.814 179.267 49.561 179.33 49.31 C 179.41 48.96 179.88 47.13 180.75 43.79 L 181.93 43.79 L 179.86 51.28 L 178.52 51.26 Z"></path>
+    <path d="M 186.32 51.4 C 185.344 51.453 184.392 51.089 183.7 50.4 C 183.01 49.631 182.651 48.622 182.7 47.59 C 182.64 46.554 182.956 45.532 183.59 44.71 C 184.183 43.997 185.073 43.598 186 43.63 C 186.845 43.588 187.665 43.93 188.23 44.56 C 188.801 45.241 189.094 46.112 189.05 47 L 189.05 47.72 L 183.89 47.72 C 183.858 48.447 184.097 49.159 184.56 49.72 C 185.024 50.199 185.674 50.451 186.34 50.41 C 187.163 50.406 187.977 50.232 188.73 49.9 L 188.73 50.9 C 188.364 51.065 187.982 51.193 187.59 51.28 C 187.171 51.36 186.746 51.4 186.32 51.4 Z M 186 44.58 C 185.457 44.558 184.931 44.773 184.56 45.17 C 184.174 45.628 183.952 46.202 183.93 46.8 L 187.85 46.8 C 187.89 46.211 187.72 45.626 187.37 45.15 C 187.025 44.76 186.52 44.55 186 44.58 Z"></path>
+    <path d="M 194.29 43.63 C 194.589 43.627 194.888 43.657 195.18 43.72 L 195 44.77 C 194.731 44.706 194.456 44.672 194.18 44.67 C 193.58 44.669 193.011 44.936 192.63 45.4 C 192.193 45.912 191.962 46.567 191.98 47.24 L 191.98 51.24 L 190.85 51.24 L 190.85 43.77 L 191.79 43.77 L 191.91 45.16 L 192 45.16 C 192.237 44.7 192.58 44.302 193 44 C 193.383 43.749 193.833 43.621 194.29 43.63 Z"></path>
+    <path d="M 199.61 51.4 C 198.634 51.453 197.682 51.089 196.99 50.4 C 196.3 49.631 195.941 48.622 195.99 47.59 C 195.93 46.554 196.246 45.532 196.88 44.71 C 197.471 44.006 198.352 43.612 199.27 43.64 C 200.115 43.598 200.935 43.94 201.5 44.57 C 202.071 45.251 202.364 46.122 202.32 47.01 L 202.32 47.73 L 197.2 47.73 C 197.168 48.457 197.407 49.169 197.87 49.73 C 198.334 50.209 198.984 50.461 199.65 50.42 C 200.46 50.407 201.26 50.23 202 49.9 L 202 50.9 C 201.634 51.065 201.252 51.193 200.86 51.28 C 200.448 51.359 200.029 51.399 199.61 51.4 Z M 199.3 44.58 C 198.757 44.558 198.231 44.773 197.86 45.17 C 197.474 45.628 197.252 46.202 197.23 46.8 L 201.15 46.8 C 201.19 46.211 201.02 45.626 200.67 45.15 C 200.325 44.76 199.82 44.55 199.3 44.58 Z"></path>
+    <path d="M 209.26 50.26 L 209.2 50.26 C 208.665 51.025 207.771 51.457 206.84 51.4 C 205.965 51.446 205.119 51.075 204.56 50.4 C 203.964 49.574 203.674 48.566 203.74 47.55 C 203.674 46.524 203.964 45.507 204.56 44.67 C 205.117 43.992 205.964 43.621 206.84 43.67 C 207.757 43.621 208.638 44.039 209.18 44.78 L 209.27 44.78 L 209.22 44.24 L 209.22 43.71 L 209.22 40.71 L 210.35 40.71 L 210.35 51.26 L 209.43 51.26 L 209.26 50.26 Z M 206.99 50.45 C 207.617 50.506 208.235 50.274 208.67 49.82 C 209.062 49.23 209.248 48.527 209.2 47.82 L 209.2 47.58 C 209.268 46.783 209.082 45.985 208.67 45.3 C 208.246 44.812 207.613 44.559 206.97 44.62 C 206.361 44.592 205.783 44.889 205.45 45.4 C 205.057 46.06 204.872 46.823 204.92 47.59 C 204.867 48.35 205.049 49.107 205.44 49.76 C 205.812 50.236 206.397 50.495 207 50.45 L 206.99 50.45 Z"></path>
+    <path d="M 219.58 43.65 C 220.459 43.602 221.308 43.973 221.87 44.65 C 222.465 45.48 222.755 46.491 222.69 47.51 C 222.754 48.532 222.465 49.546 221.87 50.38 C 221.308 51.057 220.459 51.428 219.58 51.38 C 219.119 51.385 218.663 51.293 218.24 51.11 C 217.84 50.925 217.495 50.639 217.24 50.28 L 217.16 50.28 L 216.92 51.28 L 216.1 51.28 L 216.1 40.63 L 217.24 40.63 L 217.24 43.21 C 217.24 43.79 217.22 44.31 217.18 44.77 L 217.24 44.77 C 217.775 44.019 218.659 43.596 219.58 43.65 Z M 219.42 44.65 C 218.787 44.59 218.163 44.835 217.74 45.31 C 217.342 45.989 217.163 46.775 217.23 47.56 C 217.162 48.349 217.344 49.14 217.75 49.82 C 218.171 50.305 218.8 50.558 219.44 50.5 C 220.057 50.538 220.65 50.25 221 49.74 C 221.379 49.075 221.556 48.314 221.51 47.55 C 221.564 46.785 221.386 46.022 221 45.36 C 220.637 44.854 220.042 44.568 219.42 44.6 L 219.42 44.65 Z"></path>
+    <path d="M 223.34 43.77 L 224.56 43.77 L 226.2 48 C 226.468 48.688 226.692 49.393 226.87 50.11 L 226.93 50.11 C 226.93 49.88 227.11 49.48 227.3 48.92 C 227.49 48.36 228.11 46.63 229.15 43.73 L 230.37 43.73 L 227.15 52.26 C 226.929 52.961 226.534 53.594 226 54.1 C 225.557 54.458 225 54.646 224.43 54.63 C 224.093 54.628 223.758 54.588 223.43 54.51 L 223.43 53.6 C 223.707 53.654 223.988 53.681 224.27 53.68 C 225.082 53.7 225.8 53.157 226 52.37 L 226.41 51.3 L 223.34 43.77 Z"></path>
+    <path class="cls-1" d="M 177.22 68.8 C 176.816 68.481 176.376 68.209 175.91 67.99 C 175.426 67.775 174.9 67.669 174.37 67.68 C 173.893 67.658 173.418 67.769 173 68 C 172.571 68.277 172.184 68.614 171.85 69 L 168.33 73 C 167.907 73.472 167.612 74.043 167.47 74.66 L 167.47 62.86 C 167.487 62.399 167.398 61.941 167.21 61.52 C 167.046 61.197 166.806 60.919 166.51 60.71 C 166.211 60.503 165.869 60.366 165.51 60.31 C 165.157 60.242 164.799 60.209 164.44 60.21 C 164.107 60.189 163.773 60.189 163.44 60.21 C 163.261 60.219 163.084 60.246 162.91 60.29 L 162.91 83.69 L 167.42 83.69 L 167.42 75.69 C 167.502 76.301 167.756 76.876 168.15 77.35 L 171.84 82.3 C 172.246 82.86 172.777 83.319 173.39 83.64 C 174.021 83.911 174.704 84.041 175.39 84.02 C 175.889 84.021 176.385 83.943 176.86 83.79 C 177.272 83.662 177.663 83.474 178.02 83.23 L 171.81 75 L 177.22 68.8 Z" style="fill: rgb(38, 38, 46);"></path>
+    <path class="cls-1" d="M 191 69.72 C 190.423 69.048 189.702 68.515 188.89 68.16 C 187.893 67.745 186.819 67.548 185.74 67.58 C 184.791 67.577 183.848 67.733 182.95 68.04 C 182.043 68.351 181.212 68.848 180.51 69.5 C 179.745 70.197 179.138 71.049 178.73 72 C 178.273 73.144 178.052 74.368 178.08 75.6 C 178.037 77.045 178.285 78.483 178.81 79.83 C 179.233 80.855 179.886 81.769 180.72 82.5 C 181.5 83.163 182.419 83.642 183.41 83.9 C 184.412 84.163 185.444 84.297 186.48 84.3 C 187.494 84.318 188.505 84.187 189.48 83.91 C 190.196 83.73 190.874 83.422 191.48 83 C 191.96 82.722 192.272 82.224 192.31 81.67 C 192.274 81.218 192.126 80.781 191.88 80.4 C 191.637 79.953 191.359 79.525 191.05 79.12 L 190.38 79.7 C 190.115 79.924 189.827 80.118 189.52 80.28 C 189.161 80.471 188.782 80.622 188.39 80.73 C 187.914 80.858 187.423 80.918 186.93 80.91 C 185.749 81.016 184.586 80.569 183.78 79.7 C 183.103 78.841 182.708 77.793 182.65 76.7 L 192.41 76.7 C 192.436 76.551 192.453 76.401 192.46 76.25 L 192.46 75.67 C 192.46 75.47 192.46 75.28 192.46 75.11 L 192.46 74.64 C 192.466 73.743 192.342 72.851 192.09 71.99 C 191.889 71.166 191.518 70.392 191 69.72 Z M 182.65 74.18 C 182.592 73.234 182.872 72.299 183.44 71.54 C 183.991 70.906 184.801 70.56 185.64 70.6 C 186.501 70.509 187.343 70.891 187.84 71.6 C 188.282 72.389 188.497 73.286 188.46 74.19 L 182.65 74.18 Z" style="fill: rgb(38, 38, 46);"></path>
+    <path class="cls-1" d="M 209.28 71 C 209.098 70.036 208.581 69.169 207.82 68.55 C 206.801 67.851 205.572 67.523 204.34 67.62 C 203.253 67.566 202.17 67.786 201.19 68.26 C 200.52 68.602 199.93 69.083 199.46 69.67 C 199.367 69.086 198.993 68.585 198.46 68.33 C 197.883 68.067 197.254 67.937 196.62 67.95 C 196.41 67.939 196.2 67.939 195.99 67.95 L 195.52 67.95 L 195.12 68.02 L 195.12 83.72 L 199.67 83.72 L 199.67 73 C 199.702 72.443 200.041 71.95 200.55 71.72 C 201.195 71.362 201.923 71.183 202.66 71.2 C 203.12 71.179 203.578 71.265 204 71.45 C 204.304 71.599 204.551 71.846 204.7 72.15 C 204.851 72.492 204.942 72.857 204.97 73.23 C 204.97 73.65 204.97 74.1 204.97 74.59 L 204.97 83.75 L 209.48 83.75 L 209.48 74.38 C 209.48 73.81 209.48 73.22 209.43 72.62 C 209.428 72.077 209.377 71.535 209.28 71 Z" style="fill: rgb(38, 38, 46);"></path>
+    <path class="cls-1" d="M 222 79.59 C 221.898 79.699 221.788 79.799 221.67 79.89 C 221.492 80.038 221.297 80.166 221.09 80.27 C 220.86 80.39 220.6 80.5 220.33 80.61 C 220.046 80.703 219.749 80.75 219.45 80.75 C 218.19 80.75 217.56 79.98 217.56 78.43 L 217.56 71.33 L 222.2 71.33 L 222.2 67.94 L 217.56 67.94 L 217.56 65.62 C 217.579 65.155 217.486 64.692 217.29 64.27 C 217.126 63.947 216.886 63.669 216.59 63.46 C 216.29 63.255 215.949 63.118 215.59 63.06 C 215.24 62.997 214.886 62.964 214.53 62.96 L 214 63 L 213.5 63.05 L 213 63.12 L 213 78.5 C 212.999 78.988 213.022 79.475 213.07 79.96 C 213.108 80.435 213.209 80.902 213.37 81.35 C 213.679 82.202 214.249 82.933 215 83.44 C 215.967 84.029 217.09 84.308 218.22 84.24 C 218.893 84.25 219.565 84.177 220.22 84.02 C 220.752 83.901 221.267 83.713 221.75 83.46 C 222.128 83.271 222.467 83.013 222.75 82.7 C 222.968 82.47 223.093 82.167 223.1 81.85 C 223.088 81.502 222.999 81.16 222.84 80.85 C 222.585 80.414 222.304 79.993 222 79.59 Z" style="fill: rgb(38, 38, 46);"></path>
+    <path class="cls-1" d="M 228.5 68.39 C 228.198 68.193 227.857 68.063 227.5 68.01 C 227.151 67.943 226.796 67.909 226.44 67.91 C 226.08 67.91 225.75 67.91 225.44 67.91 C 225.291 67.928 225.144 67.958 225 68 L 225 81.32 C 224.886 82.143 225.19 82.968 225.81 83.52 C 226.442 83.911 227.177 84.103 227.92 84.07 C 228.27 84.07 228.61 84.07 228.92 84.07 C 229.128 84.071 229.334 84.037 229.53 83.97 L 229.53 70.53 C 229.544 70.069 229.452 69.61 229.26 69.19 C 229.087 68.857 228.823 68.58 228.5 68.39 Z" style="fill: rgb(38, 38, 46);"></path>
+    <path class="cls-1" d="M 241.94 75 L 247.35 68.76 C 246.932 68.453 246.479 68.198 246 68 C 245.516 67.785 244.99 67.679 244.46 67.69 C 243.966 67.676 243.477 67.8 243.05 68.05 C 242.621 68.327 242.234 68.664 241.9 69.05 L 238.38 73.05 C 237.957 73.522 237.662 74.093 237.52 74.71 L 237.52 62.86 C 237.537 62.399 237.448 61.941 237.26 61.52 C 237.096 61.197 236.856 60.919 236.56 60.71 C 236.261 60.503 235.919 60.366 235.56 60.31 C 235.207 60.242 234.849 60.209 234.49 60.21 C 234.157 60.189 233.823 60.189 233.49 60.21 C 233.311 60.219 233.134 60.246 232.96 60.29 L 232.96 83.69 L 237.47 83.69 L 237.47 75.69 C 237.557 76.3 237.81 76.874 238.2 77.35 L 242 82.35 C 242.412 82.909 242.945 83.367 243.56 83.69 C 244.19 83.963 244.873 84.093 245.56 84.07 C 246.056 84.07 246.548 83.993 247.02 83.84 C 247.432 83.712 247.823 83.524 248.18 83.28 L 241.94 75 Z" style="fill: rgb(38, 38, 46);"></path>
+    <path class="cls-1" d="M 227.08 60.31 C 226.435 60.293 225.811 60.538 225.35 60.99 C 224.417 61.958 224.417 63.492 225.35 64.46 C 225.816 64.902 226.438 65.139 227.08 65.12 C 227.714 65.13 228.327 64.893 228.79 64.46 C 229.739 63.498 229.739 61.952 228.79 60.99 C 228.332 60.547 227.717 60.303 227.08 60.31 Z" style="fill: rgb(38, 38, 46);"></path>
+    <path class="cls-2" d="M 154.57 70.41 C 154.111 69.97 153.496 69.729 152.86 69.74 C 151.501 69.687 150.382 70.8 150.43 72.16 C 150.407 72.807 150.662 73.433 151.13 73.88 C 151.592 74.328 152.216 74.57 152.86 74.55 C 153.496 74.561 154.111 74.32 154.57 73.88 C 155.044 73.436 155.303 72.809 155.28 72.16 C 155.3 71.503 155.042 70.868 154.57 70.41 Z" style="fill: rgb(224, 85, 32);"></path>
+    <path class="cls-2" d="M 145.92 72.14 L 154.25 61 C 153.892 60.758 153.502 60.57 153.09 60.44 C 152.619 60.287 152.126 60.209 151.63 60.21 C 150.222 60.109 148.868 60.769 148.08 61.94 L 140.5 72.14 L 148.08 82.35 C 148.492 82.909 149.025 83.367 149.64 83.69 C 150.27 83.963 150.953 84.093 151.64 84.07 C 152.136 84.071 152.629 83.993 153.1 83.84 C 153.513 83.714 153.905 83.525 154.26 83.28 L 145.92 72.14 Z" style="fill: rgb(224, 85, 32);"></path>
+    <path class="cls-2" d="M 146.35 61 C 145.989 60.758 145.595 60.57 145.18 60.44 C 144.047 60.088 142.828 60.141 141.73 60.59 C 141.115 60.917 140.582 61.378 140.17 61.94 L 132.59 72.14 L 140.17 82.35 C 140.582 82.909 141.115 83.367 141.73 83.69 C 142.828 84.139 144.047 84.192 145.18 83.84 C 145.596 83.712 145.99 83.524 146.35 83.28 L 138 72.14 L 146.35 61 Z" style="fill: rgb(224, 85, 32);"></path>
+    <path class="cls-3" d="M 251.58 84.1 C 250.973 84.112 250.389 83.869 249.97 83.43 C 249.531 83.007 249.288 82.42 249.3 81.81 C 249.3 80.055 251.2 78.958 252.72 79.835 C 253.425 80.243 253.86 80.995 253.86 81.81 C 253.872 82.42 253.629 83.007 253.19 83.43 C 252.771 83.869 252.187 84.112 251.58 84.1 Z M 251.58 79.8 C 250.475 79.8 249.58 80.695 249.58 81.8 C 249.58 82.905 250.475 83.8 251.58 83.8 C 252.685 83.8 253.58 82.905 253.58 81.8 C 253.58 80.695 252.685 79.8 251.58 79.8 Z M 252.69 83.24 L 252.2 83.24 L 251.88 82.54 C 251.72 82.2 251.55 82.02 251.36 82.02 L 251.09 82.02 L 251.09 83.24 L 250.69 83.24 L 250.69 80.34 L 251.51 80.34 C 251.786 80.323 252.06 80.397 252.29 80.55 C 252.472 80.686 252.576 80.903 252.57 81.13 C 252.572 81.32 252.5 81.502 252.37 81.64 C 252.223 81.787 252.035 81.885 251.83 81.92 C 251.99 81.96 252.15 82.14 252.31 82.46 L 252.69 83.24 Z M 251.09 80.68 L 251.09 81.68 L 251.53 81.68 C 251.93 81.68 252.13 81.51 252.13 81.18 C 252.147 81.034 252.086 80.89 251.97 80.8 C 251.816 80.709 251.638 80.667 251.46 80.68 L 251.09 80.68 Z" style="fill: rgb(35, 31, 32);"></path>
+    <g clip-path="url(#clip-1)" transform="matrix(2.076555, 0, 0, 2.076555, -58.191444, 50.52512)" style="">
+      <path d="M11.191 5.539v4.922l-4.262 2.462V16l6.928-4V4l-2.666 1.539Z" fill="#00AC69"></path>
+      <path d="m6.929 3.078 4.262 2.46L13.857 4 6.93 0 0 4l2.665 1.539L6.93 3.078Z" fill="#1CE783"></path>
+      <path d="M4.263 9.54v4.922L6.93 16V8L0 4v3.078l4.263 2.461ZM23.367 3.989c-1.491 0-2.198.942-2.198.942h-.078l-.156-.785h-1.807v8.007h1.963v-4.63c0-1.02.704-1.727 1.727-1.727 1.022 0 1.727.705 1.727 1.727v4.63h1.963V7.364c0-2.04-1.335-3.375-3.14-3.375ZM44.534 9.406h-.113l-1.335-5.26H41.09l-1.335 5.26h-.112l-1.335-5.26h-2.041l2.04 8.007h2.391l1.334-5.181h.112l1.335 5.181h2.39l2.04-8.007h-2.04l-1.335 5.26ZM53.92 4.852h-.08l-.156-.704h-1.649v8.006h1.963v-4.63c0-1.02.47-1.491 1.491-1.491h1.007V4.147h-1.168a1.767 1.767 0 0 0-1.409.705ZM60.839 3.989c-2.355 0-4.082 1.727-4.082 4.16 0 2.434 1.63 4.161 4.082 4.161 1.985 0 3.181-1.168 3.68-2.028l-1.802-.642c-.178.326-.897.953-1.878.953-1.145 0-1.962-.716-2.119-1.811h5.965c.056-.258.082-.522.079-.786 0-2.28-1.727-4.007-3.925-4.007ZM58.72 7.443c.236-1.02.942-1.806 2.119-1.806 1.1 0 1.805.785 1.962 1.806H58.72ZM31.845 3.989c-2.355 0-4.082 1.727-4.082 4.16 0 2.434 1.626 4.161 4.082 4.161 1.986 0 3.18-1.168 3.679-2.028l-1.802-.642c-.178.326-.896.953-1.877.953-1.144 0-1.963-.716-2.12-1.811h5.967a3.57 3.57 0 0 0 .078-.786c0-2.28-1.727-4.007-3.925-4.007Zm-2.12 3.454c.236-1.02.942-1.806 2.12-1.806 1.1 0 1.806.785 1.963 1.806h-4.083ZM71.625.984h-1.963v1.963h1.963V.984ZM77.041 10.505c-1.178 0-2.12-.942-2.12-2.356 0-1.413.942-2.355 2.12-2.355 1.178 0 1.649.785 1.806 1.256l1.777-.632c-.43-1.118-1.488-2.43-3.583-2.43-2.355 0-4.082 1.728-4.082 4.161 0 2.434 1.727 4.161 4.082 4.161 2.114 0 3.17-1.332 3.593-2.504l-1.787-.636c-.157.55-.628 1.335-1.806 1.335ZM64.981 2.729h1.115v9.424h1.962V.984h-3.077V2.73ZM71.625 4.146h-1.963v8.007h1.963V4.146ZM81.685 10.617a.758.758 0 1 0 .746.757.732.732 0 0 0-.746-.757Zm0 1.398a.641.641 0 1 1 .63-.64.617.617 0 0 1-.63.636v.004Z" fill="#1D252C"></path>
+      <path d="M82.01 11.234a.266.266 0 0 0-.284-.263h-.336v.789h.116v-.274h.105l.273.274h.144l-.273-.274a.255.255 0 0 0 .255-.252Zm-.503.136v-.284h.22a.149.149 0 0 1 .117.037.152.152 0 0 1 .051.111c0 .084-.053.136-.169.136h-.22Z" fill="#1D252C"></path>
+    </g>
+  </g>
+  <g clip-path="url(#a)" transform="matrix(1, 0, 0, 1, 159.737627, 175.478942)"></g>
+</svg>
diff --git a/quickstarts/node-js/express/config.yml b/quickstarts/node-js/express/config.yml
index 2d6f75a3e4..0d028e2fd3 100644
--- a/quickstarts/node-js/express/config.yml
+++ b/quickstarts/node-js/express/config.yml
@@ -31,8 +31,6 @@ keywords:
   - apm
   - node.js
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - node-agent
 dataSourceIds:
diff --git a/quickstarts/node-js/typescript/config.yml b/quickstarts/node-js/typescript/config.yml
index f512e3b574..3997e11405 100644
--- a/quickstarts/node-js/typescript/config.yml
+++ b/quickstarts/node-js/typescript/config.yml
@@ -37,8 +37,6 @@ keywords:
   - node.js
   - typescript
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - node-agent
 dataSourceIds:
diff --git a/quickstarts/notification-channels/email-notifications/config.yml b/quickstarts/notification-channels/email-notifications/config.yml
index 94f2bdc583..a3eebd72a5 100644
--- a/quickstarts/notification-channels/email-notifications/config.yml
+++ b/quickstarts/notification-channels/email-notifications/config.yml
@@ -28,5 +28,3 @@ keywords:
   - AIOps
   - Incident Intelligence
   - Destinations
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/notification-channels/slack-notifications/config.yml b/quickstarts/notification-channels/slack-notifications/config.yml
index 4c72de4088..85aac69de1 100644
--- a/quickstarts/notification-channels/slack-notifications/config.yml
+++ b/quickstarts/notification-channels/slack-notifications/config.yml
@@ -33,6 +33,4 @@ keywords:
   - AIOps
   - Incident Intelligence
   - Destinations
-  - NR1_addData
-  - NR1_sys
 website: https://slack.com/
diff --git a/quickstarts/notification-channels/webhook-notifications/config.yml b/quickstarts/notification-channels/webhook-notifications/config.yml
index 8c8fdebe4e..0033b65be4 100644
--- a/quickstarts/notification-channels/webhook-notifications/config.yml
+++ b/quickstarts/notification-channels/webhook-notifications/config.yml
@@ -31,5 +31,3 @@ keywords:
   - AIOps
   - Incident Intelligence
   - Destinations
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/observability-as-code/terraform/config.yml b/quickstarts/observability-as-code/terraform/config.yml
index efe782be73..ddfd35add7 100644
--- a/quickstarts/observability-as-code/terraform/config.yml
+++ b/quickstarts/observability-as-code/terraform/config.yml
@@ -21,8 +21,6 @@ keywords:
   - devops
   - sre
   - gitops
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-terraform
 dataSourceIds:
diff --git a/quickstarts/okhttp/config.yml b/quickstarts/okhttp/config.yml
index b2f37d8b18..99cc9cc33f 100644
--- a/quickstarts/okhttp/config.yml
+++ b/quickstarts/okhttp/config.yml
@@ -24,5 +24,3 @@ documentation:
 keywords:
   - mobile
   - android
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/oma-bofu/config.yml b/quickstarts/oma-bofu/config.yml
index fc3c5ea060..711f4bb0f9 100644
--- a/quickstarts/oma-bofu/config.yml
+++ b/quickstarts/oma-bofu/config.yml
@@ -21,8 +21,6 @@ keywords:
   - conversion rate
   - conversions
   - synthetics
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Install README
     description: |
diff --git a/quickstarts/oma-data-gov/config.yml b/quickstarts/oma-data-gov/config.yml
index 328f61b331..6114b2b229 100644
--- a/quickstarts/oma-data-gov/config.yml
+++ b/quickstarts/oma-data-gov/config.yml
@@ -14,8 +14,6 @@ keywords:
   - Data Governance
   - Data Consumption
   - Manage Data Ingest
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - solutions-hub-dashboards
 dataSourceIds:
diff --git a/quickstarts/oma-qf/config.yml b/quickstarts/oma-qf/config.yml
index 42a499021e..f1a2a2fde4 100644
--- a/quickstarts/oma-qf/config.yml
+++ b/quickstarts/oma-qf/config.yml
@@ -17,8 +17,6 @@ keywords:
   - browser
   - synthetics
   - ajax
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Install README
     description: |
diff --git a/quickstarts/onepane/config.yml b/quickstarts/onepane/config.yml
index b0ba5aac23..a1d3a8cb0c 100644
--- a/quickstarts/onepane/config.yml
+++ b/quickstarts/onepane/config.yml
@@ -2,47 +2,41 @@ id: e9b4adc3-a2e0-4177-b1f2-6b73254aa960
 
 slug: onepane
 
-title: Onepane
+title: OnePane
 
 description: |
   
-  ## Onepane
+  ## OnePane
 
-  Onepane acts as a central hub, bringing together information from various systems like Cloud, DevOps and Monitoring tools.
+  OnePane acts as a central hub, bringing together information from various systems like Cloud, DevOps tools and Monitoring. 
   This unified view lets you see how changes and events from these systems correlate with incidents, significantly speeding up the process of identifying the root cause (RCA).
 
-  ### Why Onepane?
+  ### Why OnePane?
+
+  By correlating updates in code, configurations, and deployments from various systems with New Relic incidents and entities, you can efficiently and quickly identify the exact root cause of an error. This way, you can see precisely which change triggered the problem, saving you a considerable amount of time in troubleshooting.
 
-  Onepane is a powerful addition to your existing New Relic, Cloud, and DevOps tools, providing seamless out-of-the-box integrations. It adopts an agentless approach and features automatic asset discovery, allowing you to get value in a matter of hours, not days or weeks. Onepane comprehends your unique landscape, generating a dynamic service map of your operational environment by harnessing data from various systems. This map assists your teams in swiftly resolving incidents and streamlines the audit process. Opt for Onepane to leverage additional ROI on your existing investments. 
 
   - Show changes and infrastructure events alongside errors to pinpoint potential root causes.
   - Enable root cause investigation by correlating incidents with change data and infrastructure data.
 
   ### Get started!
 
-  - To get started with Onepane, you can sign up for a [free SaaS account](https://console.onepane.ai/).
-  - You can access additional document on [Onepane documentation](https://www.onepane.ai/docs/en/articles/8999270-adding-onepane-change-tracking-to-your-new-relic-deployment).
-  - To know more about Onepane hosted plans or live demo book a meeting on [Onepane website](https://www.onepane.ai/about).
+  - To get started with OnePane, you can sign up for a [free cloud account](https://console.onepane.ai/).
+  - Integrate OnePane with New Relic to analyse deployment, change, and infrastructure event data to identify possible root causes. You can also review [additional documentation at OnePane](https://www.onepane.ai/docs/en/articles/8999270-adding-onepane-change-tracking-to-your-new-relic-deployment).
 
-summary: Onepane is an GenAI tool that helps you faster incident resolution with automated Root Cause Analysis. 
+summary: By correlating deployment change and infrastructure change from OnePane with New Relic, you can enable faster root cause identification for the incidents.
 
 level: Verified
 
 authors:
-  - Onepane
-dashboards:
-  - onepane
+  - OnePane
 
-website: https://www.onepane.ai
 keywords:
   - devops
-  - newrelic partner
   - change tracking
   - incident correlation
   - root cause analysis
   - llm
-  - NR1_addData
-  - NR1_sys
 
 documentation:
   - name: Installation docs
@@ -52,4 +46,4 @@ documentation:
 icon: logo.png
 
 dataSourceIds:
-  - onepane
+  - onepane
\ No newline at end of file
diff --git a/quickstarts/opencensus/config.yml b/quickstarts/opencensus/config.yml
index 45903f7810..4c2faffc25 100644
--- a/quickstarts/opencensus/config.yml
+++ b/quickstarts/opencensus/config.yml
@@ -33,5 +33,3 @@ documentation:
 keywords:
   - tracing
   - open source monitoring
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/openstack-controller/config.yml b/quickstarts/openstack-controller/config.yml
index ebd0882fcf..5e5807f55b 100644
--- a/quickstarts/openstack-controller/config.yml
+++ b/quickstarts/openstack-controller/config.yml
@@ -35,8 +35,6 @@ keywords:
   - neutron controller
   - cinder controller
   - Keystone controller
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - openstack-controller
 dashboards:
diff --git a/quickstarts/opslevel/config.yml b/quickstarts/opslevel/config.yml
index 51e4b7b4c7..803b928bed 100644
--- a/quickstarts/opslevel/config.yml
+++ b/quickstarts/opslevel/config.yml
@@ -44,8 +44,6 @@ keywords:
   - newrelic partner
   - messaging
   - opslevel
-  - NR1_addData
-  - NR1_sys
 
 # Relevant documentation for this quickstart
 documentation:
diff --git a/quickstarts/pagerduty/pagerduty/config.yml b/quickstarts/pagerduty/pagerduty/config.yml
index a7047f5342..e65c329a2a 100644
--- a/quickstarts/pagerduty/pagerduty/config.yml
+++ b/quickstarts/pagerduty/pagerduty/config.yml
@@ -33,5 +33,3 @@ keywords:
   - support
   - site reliability
   - SRE
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/php/cakephp/config.yml b/quickstarts/php/cakephp/config.yml
index 8df5bf76d9..9f9908b026 100644
--- a/quickstarts/php/cakephp/config.yml
+++ b/quickstarts/php/cakephp/config.yml
@@ -31,8 +31,6 @@ keywords:
   - apm
   - php
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - php-agent
 dataSourceIds:
diff --git a/quickstarts/php/codeigniter/config.yml b/quickstarts/php/codeigniter/config.yml
index c1ad4fc83e..ca0848b356 100644
--- a/quickstarts/php/codeigniter/config.yml
+++ b/quickstarts/php/codeigniter/config.yml
@@ -26,8 +26,6 @@ keywords:
   - apm
   - php
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - php-targeted-install
 dataSourceIds:
diff --git a/quickstarts/php/pdo/config.yml b/quickstarts/php/pdo/config.yml
index 2601592250..ffd7841a1c 100644
--- a/quickstarts/php/pdo/config.yml
+++ b/quickstarts/php/pdo/config.yml
@@ -27,8 +27,6 @@ keywords:
   - php
   - database
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - php-agent
 dataSourceIds:
diff --git a/quickstarts/php/phpunit/config.yml b/quickstarts/php/phpunit/config.yml
index 602353c543..0ec3cfa03a 100644
--- a/quickstarts/php/phpunit/config.yml
+++ b/quickstarts/php/phpunit/config.yml
@@ -27,8 +27,6 @@ keywords:
   - php
   - testing
   - language agent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - php-agent
 dataSourceIds:
diff --git a/quickstarts/php/predis/config.yml b/quickstarts/php/predis/config.yml
index 217def252c..5e2d6c823f 100644
--- a/quickstarts/php/predis/config.yml
+++ b/quickstarts/php/predis/config.yml
@@ -30,8 +30,6 @@ keywords:
   - apm
   - php
   - language agent
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - php
 alertPolicies:
diff --git a/quickstarts/pihole/config.yml b/quickstarts/pihole/config.yml
index 514d1f2ef5..6ba6ecbcb8 100644
--- a/quickstarts/pihole/config.yml
+++ b/quickstarts/pihole/config.yml
@@ -26,8 +26,6 @@ keywords:
   - dns
   - flex
   - api
-  - NR1_addData
-  - NR1_sys
 
 # Reference to dashboards to be included in this quickstart
 dashboards:
diff --git a/quickstarts/pinecone-prometheus/config.yml b/quickstarts/pinecone-prometheus/config.yml
index f684557bd7..5a1d9f8bcf 100644
--- a/quickstarts/pinecone-prometheus/config.yml
+++ b/quickstarts/pinecone-prometheus/config.yml
@@ -41,8 +41,6 @@ keywords:
   - ai search
   - machine learning
   - deep learning
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - prometheus
 dashboards:
diff --git a/quickstarts/port-monitoring/config.yml b/quickstarts/port-monitoring/config.yml
index 1278928703..988c843403 100644
--- a/quickstarts/port-monitoring/config.yml
+++ b/quickstarts/port-monitoring/config.yml
@@ -34,7 +34,5 @@ dataSourceIds:
 keywords:
   - infrastructure
   - networking
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - port-monitoring
diff --git a/quickstarts/postfix/config.yml b/quickstarts/postfix/config.yml
index 14dfde6c1b..04c1d0af95 100644
--- a/quickstarts/postfix/config.yml
+++ b/quickstarts/postfix/config.yml
@@ -38,6 +38,4 @@ keywords:
   - postfix
   - mail server
   - infrastructure
-  - NR1_addData
-  - NR1_sys
   
\ No newline at end of file
diff --git a/quickstarts/python/bottle/config.yml b/quickstarts/python/bottle/config.yml
index 6a14496a6c..079524edd1 100644
--- a/quickstarts/python/bottle/config.yml
+++ b/quickstarts/python/bottle/config.yml
@@ -30,8 +30,6 @@ keywords:
   - apm
   - python
   - bottle
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/celery/config.yml b/quickstarts/python/celery/config.yml
index 1ae4e3328f..e34653aec8 100644
--- a/quickstarts/python/celery/config.yml
+++ b/quickstarts/python/celery/config.yml
@@ -27,8 +27,6 @@ keywords:
   - apm
   - python
   - celery
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/cherrypy/config.yml b/quickstarts/python/cherrypy/config.yml
index 443d39318e..8fc15c9848 100644
--- a/quickstarts/python/cherrypy/config.yml
+++ b/quickstarts/python/cherrypy/config.yml
@@ -33,8 +33,6 @@ documentation:
 keywords:
   - apm
   - python
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/django/config.yml b/quickstarts/python/django/config.yml
index 60a23e016d..e23d5f6bae 100644
--- a/quickstarts/python/django/config.yml
+++ b/quickstarts/python/django/config.yml
@@ -37,8 +37,6 @@ keywords:
   - python
   - django
   - most popular
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/facepy/config.yml b/quickstarts/python/facepy/config.yml
index 6cd3b0dcee..dbd44eb7d1 100644
--- a/quickstarts/python/facepy/config.yml
+++ b/quickstarts/python/facepy/config.yml
@@ -28,8 +28,6 @@ keywords:
   - apm
   - python
   - facepy
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/falcon/config.yml b/quickstarts/python/falcon/config.yml
index 6d3b259944..2ef8ebee70 100644
--- a/quickstarts/python/falcon/config.yml
+++ b/quickstarts/python/falcon/config.yml
@@ -30,8 +30,6 @@ documentation:
 keywords:
   - apm
   - python
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/fastapi/config.yml b/quickstarts/python/fastapi/config.yml
index c1e64ce1d7..2e7b224e33 100644
--- a/quickstarts/python/fastapi/config.yml
+++ b/quickstarts/python/fastapi/config.yml
@@ -31,8 +31,6 @@ keywords:
   - python
   - language agent
   - fastapi
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/feedparser/config.yml b/quickstarts/python/feedparser/config.yml
index fce8fef45e..c9f3e899e3 100644
--- a/quickstarts/python/feedparser/config.yml
+++ b/quickstarts/python/feedparser/config.yml
@@ -39,8 +39,6 @@ keywords:
   - apm
   - python
   - feedparser
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/flask/config.yml b/quickstarts/python/flask/config.yml
index 905eaad1ff..9565e9987b 100644
--- a/quickstarts/python/flask/config.yml
+++ b/quickstarts/python/flask/config.yml
@@ -48,8 +48,6 @@ keywords:
   - apm
   - python
   - flask
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/gearman/config.yml b/quickstarts/python/gearman/config.yml
index f2106f2c1f..bf263e0106 100644
--- a/quickstarts/python/gearman/config.yml
+++ b/quickstarts/python/gearman/config.yml
@@ -25,8 +25,6 @@ documentation:
 keywords:
   - apm
   - python
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/gevent/config.yml b/quickstarts/python/gevent/config.yml
index e062d4c52d..9f33009e16 100644
--- a/quickstarts/python/gevent/config.yml
+++ b/quickstarts/python/gevent/config.yml
@@ -30,8 +30,6 @@ keywords:
   - apm
   - python
   - gevent
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/oursql/config.yml b/quickstarts/python/oursql/config.yml
index 14acefb65f..599246baa8 100644
--- a/quickstarts/python/oursql/config.yml
+++ b/quickstarts/python/oursql/config.yml
@@ -31,8 +31,6 @@ keywords:
   - apm
   - python
   - database
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/web2py/config.yml b/quickstarts/python/web2py/config.yml
index b985c17d7d..89504a5a71 100644
--- a/quickstarts/python/web2py/config.yml
+++ b/quickstarts/python/web2py/config.yml
@@ -28,8 +28,6 @@ keywords:
   - apm
   - python
   - web2py
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/python/webpy/config.yml b/quickstarts/python/webpy/config.yml
index 746693f81a..6ef4c0471d 100644
--- a/quickstarts/python/webpy/config.yml
+++ b/quickstarts/python/webpy/config.yml
@@ -35,8 +35,6 @@ keywords:
   - apm
   - python
   - webpy
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-python-agent
 dataSourceIds:
diff --git a/quickstarts/ruby/bunny/config.yml b/quickstarts/ruby/bunny/config.yml
index 5be2a7b675..516562f52f 100644
--- a/quickstarts/ruby/bunny/config.yml
+++ b/quickstarts/ruby/bunny/config.yml
@@ -31,8 +31,6 @@ documentation:
 keywords:
   - apm
   - ruby
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-ruby-agent
 dataSourceIds:
diff --git a/quickstarts/ruby/curb/config.yml b/quickstarts/ruby/curb/config.yml
index 35963834df..e1ebb087f6 100644
--- a/quickstarts/ruby/curb/config.yml
+++ b/quickstarts/ruby/curb/config.yml
@@ -33,8 +33,6 @@ documentation:
 keywords:
   - apm
   - ruby
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-ruby-agent
 dataSourceIds:
diff --git a/quickstarts/ruby/dalli/config.yml b/quickstarts/ruby/dalli/config.yml
index 46bc63fc0e..04bcb9d36f 100644
--- a/quickstarts/ruby/dalli/config.yml
+++ b/quickstarts/ruby/dalli/config.yml
@@ -26,8 +26,6 @@ documentation:
 keywords:
   - apm
   - ruby
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-ruby-agent
 dataSourceIds:
diff --git a/quickstarts/ruby/delayed-job/config.yml b/quickstarts/ruby/delayed-job/config.yml
index 85d0c698fa..56304cdf46 100644
--- a/quickstarts/ruby/delayed-job/config.yml
+++ b/quickstarts/ruby/delayed-job/config.yml
@@ -30,8 +30,6 @@ dataSourceIds:
 keywords:
   - apm
   - ruby
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - delayed-job
 alertPolicies:
diff --git a/quickstarts/ruby/excon/config.yml b/quickstarts/ruby/excon/config.yml
index 9913790c10..a236617f62 100644
--- a/quickstarts/ruby/excon/config.yml
+++ b/quickstarts/ruby/excon/config.yml
@@ -26,8 +26,6 @@ documentation:
 keywords:
   - apm
   - ruby
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-ruby-agent
 dataSourceIds:
diff --git a/quickstarts/signl4/config.yml b/quickstarts/signl4/config.yml
index c7d91d6d97..b0ca1ac3e6 100644
--- a/quickstarts/signl4/config.yml
+++ b/quickstarts/signl4/config.yml
@@ -26,5 +26,3 @@ keywords:
   - signl4
   - SRE
   - site reliability
-  - NR1_addData
-  - NR1_sys
diff --git a/quickstarts/skykit/config.yml b/quickstarts/skykit/config.yml
index 31b6356953..4db95197e8 100644
--- a/quickstarts/skykit/config.yml
+++ b/quickstarts/skykit/config.yml
@@ -33,8 +33,6 @@ keywords:
   - cms
   - content management system 
   - newrelic partner
-  - NR1_addData
-  - NR1_sys
 
 # Documentation references
 documentation:
diff --git a/quickstarts/sonarqube/config.yml b/quickstarts/sonarqube/config.yml
index 4af15eca5f..051fec10f2 100644
--- a/quickstarts/sonarqube/config.yml
+++ b/quickstarts/sonarqube/config.yml
@@ -38,8 +38,6 @@ keywords:
   - sonarqube
   - sonar
   - sonarqube jmx
-  - NR1_addData
-  - NR1_sys
 dashboards:
   - sonarqube
 alertPolicies:
diff --git a/quickstarts/squid-prometheus/config.yml b/quickstarts/squid-prometheus/config.yml
index e6d551dbe1..d93cdf7ff3 100644
--- a/quickstarts/squid-prometheus/config.yml
+++ b/quickstarts/squid-prometheus/config.yml
@@ -48,8 +48,6 @@ keywords:
   - infrastructure
   - cache
   - prometheus
-  - NR1_addData
-  - NR1_sys
 
 dashboards:
   - squid-prometheus
diff --git a/quickstarts/stripe/config.yml b/quickstarts/stripe/config.yml
index 1fa53e45b2..37bd23d8b5 100644
--- a/quickstarts/stripe/config.yml
+++ b/quickstarts/stripe/config.yml
@@ -29,8 +29,6 @@ keywords:
   - node.js
   - stripe payment
   - stripe checkout
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - stripe
 dashboards:
diff --git a/quickstarts/suse-linux-enterprise-server/config.yml b/quickstarts/suse-linux-enterprise-server/config.yml
index 3f5116222b..c37449240d 100644
--- a/quickstarts/suse-linux-enterprise-server/config.yml
+++ b/quickstarts/suse-linux-enterprise-server/config.yml
@@ -24,8 +24,6 @@ documentation:
 keywords:
   - os
   - operating system
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - guided-install
 dataSourceIds:
diff --git a/quickstarts/sybase/config.yml b/quickstarts/sybase/config.yml
index 78ea0bd9f9..3cf1da3c2b 100644
--- a/quickstarts/sybase/config.yml
+++ b/quickstarts/sybase/config.yml
@@ -24,8 +24,6 @@ keywords:
   - sap
   - ase
   - adaptive server enterprise
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - sybase-integration
 dataSourceIds:
diff --git a/quickstarts/synthetics-optimization/config.yml b/quickstarts/synthetics-optimization/config.yml
index 42ad1147ce..7cad530d1a 100644
--- a/quickstarts/synthetics-optimization/config.yml
+++ b/quickstarts/synthetics-optimization/config.yml
@@ -18,8 +18,6 @@ keywords:
   - monitor
   - availability
   - simple browser
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Synthetics Usage Queries
     url: https://docs.newrelic.com/docs/accounts/accounts-billing/new-relic-one-pricing-billing/usage-queries-alerts/#synthetics-usage
diff --git a/quickstarts/synthetics/availability/config.yml b/quickstarts/synthetics/availability/config.yml
index 78a6f99fa6..e3bbc26112 100644
--- a/quickstarts/synthetics/availability/config.yml
+++ b/quickstarts/synthetics/availability/config.yml
@@ -23,8 +23,6 @@ keywords:
   - url
   - www
   - synthetics
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-synthetics-availability
 dataSourceIds:
diff --git a/quickstarts/synthetics/endpoint-availability/config.yml b/quickstarts/synthetics/endpoint-availability/config.yml
index 3b7dd073a9..297c15c962 100644
--- a/quickstarts/synthetics/endpoint-availability/config.yml
+++ b/quickstarts/synthetics/endpoint-availability/config.yml
@@ -20,8 +20,6 @@ keywords:
   - url
   - www
   - synthetics
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-synthetics-endpoint-availability
 dataSourceIds:
diff --git a/quickstarts/synthetics/page-link-crawler/config.yml b/quickstarts/synthetics/page-link-crawler/config.yml
index b791301d22..5bdac41246 100644
--- a/quickstarts/synthetics/page-link-crawler/config.yml
+++ b/quickstarts/synthetics/page-link-crawler/config.yml
@@ -30,8 +30,6 @@ keywords:
   - url
   - www
   - synthetics
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-synthetics-page-link-crawler
 dataSourceIds:
diff --git a/quickstarts/synthetics/page-load-performance/config.yml b/quickstarts/synthetics/page-load-performance/config.yml
index 2ffe78b0f2..a5795c3541 100644
--- a/quickstarts/synthetics/page-load-performance/config.yml
+++ b/quickstarts/synthetics/page-load-performance/config.yml
@@ -23,8 +23,6 @@ keywords:
   - url
   - www
   - synthetics
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-synthetics-page-load-performance
 dataSourceIds:
diff --git a/quickstarts/synthetics/private-locations/config.yml b/quickstarts/synthetics/private-locations/config.yml
index c41896db63..87798cbe0c 100644
--- a/quickstarts/synthetics/private-locations/config.yml
+++ b/quickstarts/synthetics/private-locations/config.yml
@@ -36,8 +36,6 @@ keywords:
   - minion
   - minion dashboard
   - synthetics
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - synthetics-private-locations
 dataSourceIds:
diff --git a/quickstarts/synthetics/ssl-certification-check/config.yml b/quickstarts/synthetics/ssl-certification-check/config.yml
index 096592db27..e233d94420 100644
--- a/quickstarts/synthetics/ssl-certification-check/config.yml
+++ b/quickstarts/synthetics/ssl-certification-check/config.yml
@@ -20,8 +20,6 @@ keywords:
   - url
   - www
   - synthetics
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-synthetics-ssl-certification-check
 dataSourceIds:
diff --git a/quickstarts/synthetics/user-flow/config.yml b/quickstarts/synthetics/user-flow/config.yml
index d9c53486cb..db1dbc420d 100644
--- a/quickstarts/synthetics/user-flow/config.yml
+++ b/quickstarts/synthetics/user-flow/config.yml
@@ -22,8 +22,6 @@ keywords:
   - url
   - www
   - synthetics
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Getting started
     url: https://docs.newrelic.com/docs/synthetics/synthetic-monitoring/getting-started/get-started-synthetic-monitoring/
diff --git a/quickstarts/synthetics/user-step-execution/config.yml b/quickstarts/synthetics/user-step-execution/config.yml
index cc65c6dd73..6de5f097c6 100644
--- a/quickstarts/synthetics/user-step-execution/config.yml
+++ b/quickstarts/synthetics/user-step-execution/config.yml
@@ -34,8 +34,6 @@ keywords:
   - url
   - www
   - synthetics
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Getting started
     url: https://docs.newrelic.com/docs/synthetics/synthetic-monitoring/getting-started/get-started-synthetic-monitoring/
diff --git a/quickstarts/tidbcloud/config.yml b/quickstarts/tidbcloud/config.yml
index e6daf690d3..6c202300cb 100644
--- a/quickstarts/tidbcloud/config.yml
+++ b/quickstarts/tidbcloud/config.yml
@@ -33,8 +33,6 @@ authors:
 # Keywords for filtering / searching criteria in the UI
 keywords:
   - database
-  - NR1_addData
-  - NR1_sys
 
 dashboards:
   - tidbcloud
diff --git a/quickstarts/traefik/config.yml b/quickstarts/traefik/config.yml
index 42e8389153..054c90ca9e 100644
--- a/quickstarts/traefik/config.yml
+++ b/quickstarts/traefik/config.yml
@@ -16,8 +16,6 @@ keywords:
   - remote_write
   - promql
   - grafana
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Prometheus installation docs
     description: |
diff --git a/quickstarts/velero-prometheus/config.yml b/quickstarts/velero-prometheus/config.yml
index 3eb34bc9bd..69bd8abb8c 100644
--- a/quickstarts/velero-prometheus/config.yml
+++ b/quickstarts/velero-prometheus/config.yml
@@ -36,8 +36,6 @@ keywords:
   - kubernetes
   - disaster recovery
   - featured
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - setup-prometheus
 dataSourceIds:
diff --git a/quickstarts/video/video-android/config.yml b/quickstarts/video/video-android/config.yml
index 98fd62348d..3b4b449f75 100644
--- a/quickstarts/video/video-android/config.yml
+++ b/quickstarts/video/video-android/config.yml
@@ -12,8 +12,6 @@ keywords:
   - video
   - tracking
   - Android
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-video-android
 dataSourceIds:
diff --git a/quickstarts/video/video-chromecast/config.yml b/quickstarts/video/video-chromecast/config.yml
index 684a6611e8..51444a49a1 100644
--- a/quickstarts/video/video-chromecast/config.yml
+++ b/quickstarts/video/video-chromecast/config.yml
@@ -12,8 +12,6 @@ keywords:
   - video
   - tracking
   - Chromecast
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Video Chromecast Installation Docs
     url: https://github.com/newrelic/video-caf-js
diff --git a/quickstarts/video/video-ios-tvos/config.yml b/quickstarts/video/video-ios-tvos/config.yml
index ed6524d322..da3bc6271a 100644
--- a/quickstarts/video/video-ios-tvos/config.yml
+++ b/quickstarts/video/video-ios-tvos/config.yml
@@ -13,8 +13,6 @@ keywords:
   - tracking
   - iOS
   - tvOS
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Video iOS/tvOS Installation Docs
     url: https://github.com/newrelic/video-agent-iOS
diff --git a/quickstarts/video/video-web/video-web-akamai/config.yml b/quickstarts/video/video-web/video-web-akamai/config.yml
index e3116c344d..c7555c2939 100644
--- a/quickstarts/video/video-web/video-web-akamai/config.yml
+++ b/quickstarts/video/video-web/video-web-akamai/config.yml
@@ -30,8 +30,6 @@ keywords:
   - video
   - tracking
   - Akamai
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Video Akamai Installation Docs
     url: https://github.com/newrelic/video-akamai-js
diff --git a/quickstarts/video/video-web/video-web-html5/config.yml b/quickstarts/video/video-web/video-web-html5/config.yml
index 94358f501e..d06327f647 100644
--- a/quickstarts/video/video-web/video-web-html5/config.yml
+++ b/quickstarts/video/video-web/video-web-html5/config.yml
@@ -12,8 +12,6 @@ keywords:
   - video
   - tracking
   - HTML5
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Video HTML5 Installation Docs
     url: https://github.com/newrelic/video-html5-js
diff --git a/quickstarts/video/video-web/video-web-jwplayer/config.yml b/quickstarts/video/video-web/video-web-jwplayer/config.yml
index 3f691bcbdb..6527ce6470 100644
--- a/quickstarts/video/video-web/video-web-jwplayer/config.yml
+++ b/quickstarts/video/video-web/video-web-jwplayer/config.yml
@@ -12,8 +12,6 @@ keywords:
   - video
   - tracking
   - JWPlayer
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Video JWPlayer Installation Docs
     url: https://github.com/newrelic/video-jwplayer-js
diff --git a/quickstarts/video/video-web/video-web-theplatform/config.yml b/quickstarts/video/video-web/video-web-theplatform/config.yml
index d77c426d9d..f07472ee9e 100644
--- a/quickstarts/video/video-web/video-web-theplatform/config.yml
+++ b/quickstarts/video/video-web/video-web-theplatform/config.yml
@@ -12,8 +12,6 @@ keywords:
   - video
   - tracking
   - ThePlatform
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Video The Platform Installation Docs
     url: https://github.com/newrelic/video-theplatform-js
diff --git a/quickstarts/video/video-web/video-web-videojs/config.yml b/quickstarts/video/video-web/video-web-videojs/config.yml
index e22a69c3bc..539adc69e0 100644
--- a/quickstarts/video/video-web/video-web-videojs/config.yml
+++ b/quickstarts/video/video-web/video-web-videojs/config.yml
@@ -12,8 +12,6 @@ keywords:
   - video
   - tracking
   - VideoJS
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Video VideoJS Installation Docs
     url: https://github.com/newrelic/video-videojs-js
diff --git a/quickstarts/windows/windows-certs/config.yml b/quickstarts/windows/windows-certs/config.yml
index c41f08dbc2..1c7749230b 100644
--- a/quickstarts/windows/windows-certs/config.yml
+++ b/quickstarts/windows/windows-certs/config.yml
@@ -31,8 +31,6 @@ keywords:
   - operating system
   - certificates
   - powershell
-  - NR1_addData
-  - NR1_sys
 
 # Reference to install plans located under /install directory
 # Allows us to construct reusable "install plans" and just use their ID in the quickstart config
diff --git a/quickstarts/wordpress-fullstack/config.yml b/quickstarts/wordpress-fullstack/config.yml
index 2f8f597a76..5ca5bf74b4 100644
--- a/quickstarts/wordpress-fullstack/config.yml
+++ b/quickstarts/wordpress-fullstack/config.yml
@@ -39,8 +39,6 @@ keywords:
   - browser
   - full stack
   - word press
-  - NR1_addData
-  - NR1_sys
 dataSourceIds:
   - new-relic-infrastructure-agent
   - php
diff --git a/quickstarts/xmatters/config.yml b/quickstarts/xmatters/config.yml
index 18233a2d40..680e459f01 100644
--- a/quickstarts/xmatters/config.yml
+++ b/quickstarts/xmatters/config.yml
@@ -27,8 +27,6 @@ documentation:
 keywords:
   - xmatters
   - alerts
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-xmatters
 dataSourceIds:
diff --git a/quickstarts/zenduty/config.yml b/quickstarts/zenduty/config.yml
index 5225c601c5..77ecf69929 100644
--- a/quickstarts/zenduty/config.yml
+++ b/quickstarts/zenduty/config.yml
@@ -28,8 +28,6 @@ keywords:
   - site reliability
   - SRE
   - alerts
-  - NR1_addData
-  - NR1_sys
 documentation:
   - name: Zenduty Installation docs
     url: https://docs.zenduty.com/docs/newrelic
diff --git a/quickstarts/zipkin/config.yml b/quickstarts/zipkin/config.yml
index 33db8896e1..a7be8929cd 100644
--- a/quickstarts/zipkin/config.yml
+++ b/quickstarts/zipkin/config.yml
@@ -23,8 +23,6 @@ documentation:
 keywords:
   - tracing
   - apm
-  - NR1_addData
-  - NR1_sys
 installPlans:
   - third-party-zipkin
 dataSourceIds: