diff --git a/entity-types/media_streaming-video/golden_metrics.yml b/entity-types/media_streaming-video/golden_metrics.yml
new file mode 100644
index 000000000..ab24b4709
--- /dev/null
+++ b/entity-types/media_streaming-video/golden_metrics.yml
@@ -0,0 +1,61 @@
+rebufferingRatio:
+  title: Video Rebuffering Ratio (%)
+  unit: PERCENTAGE
+  query:
+    select: (sum(timeSinceBufferBegin)*100) / (sum(timeSinceLastHeartbeat) - filter(sum(timeSincePaused), where actionName = 'CONTENT_RESUME') - filter(sum(timeSinceSeekBegin), where actionName = 'CONTENT_SEEK_END'))
+    from: VideoAction
+adRebufferingRatio:
+  title: Ad Rebuffering Ratio (%)
+  unit: PERCENTAGE
+  query:
+    select: (sum(timeSinceAdBufferBegin)*100) / (sum(timeSinceLastAdHeartbeat) - filter(sum(timeSinceAdPaused), where actionName = 'AD_RESUME') - filter(sum(timeSinceAdSeekBegin), where actionName = 'AD_SEEK_END'))
+    from: VideoAdAction
+averageBitrate:
+  title: Average Bitrate (B/s)
+  unit: BYTES_PER_SECOND
+  query:
+    select: average(contentBitrate / 16) + average(contentRenditionBitrate / 16)
+    from: VideoAction
+adAverageBitrate:
+  title: Ad Average Bitrate (B/s)
+  unit: BYTES_PER_SECOND
+  query:
+    select: average(adBitrate / 16)
+    from: VideoAdAction
+averageStartTimeS:
+  title: Average Start Time (s)
+  unit: SECONDS
+  query:
+    select: average(timeSinceRequested)
+    from: VideoAction
+    where: actionName = 'CONTENT_START'
+adAverageStartTimeS:
+  title: Ad Average Start Time (s)
+  unit: SECONDS
+  query:
+    select: average(timeSinceAdRequested)
+    from: VideoAdAction
+videoStartFailures:
+  title: Video Start Failures
+  unit: PERCENTAGE
+  query:
+    select: (filter(count(*), WHERE actionName = 'CONENT_ERROR' and contentPlayhead = 0) * 100) / (FROM VideoAction SELECT count(*) WHERE actionName = 'CONENT_START' and contentPlayhead=0)
+    from: VideoErrorAction
+adStartFailures:
+  title: Ad Start Failures
+  unit: PERCENTAGE
+  query:
+    select: (filter(count(*), WHERE actionName = 'AD_ERROR' and adPlayhead = 0 ) * 100) / (FROM VideoAdAction SELECT count(*) WHERE actionName = 'AD_START' and adPlayhead = 0)
+    from: VideoErrorAction
+videoPlaybackFailures:
+  title: Video Playback Failures
+  unit: PERCENTAGE
+  query:
+    select: count(*) * 100 / (FROM VideoAction SELECT count(*) WHERE actionName = 'CONENT_REQUEST') WHERE actionName = 'CONTENT_ERROR' and contentPlayhead > 0
+    from: VideoErrorAction
+adPlaybackFailures:
+  title: Ad Playback Failures
+  unit: PERCENTAGE
+  query:
+    select: count(*) * 100 / (FROM VideoAdAction SELECT count(*) WHERE actionName = 'AD_REQUEST') WHERE actionName = 'AD_ERROR' and adPlayhead > 0
+    from: VideoErrorAction
diff --git a/entity-types/media_streaming-video/summary_metrics.yml b/entity-types/media_streaming-video/summary_metrics.yml
new file mode 100644
index 000000000..bc85a9ce9
--- /dev/null
+++ b/entity-types/media_streaming-video/summary_metrics.yml
@@ -0,0 +1,40 @@
+rebufferingRatio:
+  goldenMetric: rebufferingRatio
+  unit: PERCENTAGE
+  title: Video Rebuffering Ratio (%)
+adRebufferingRation:
+  goldenMetric: adRebufferingRatio
+  unit: PERCENTAGE
+  title: Ad Rebuffering Ratio (%)
+averageBitrate:
+  goldenMetric: averageBitrate
+  unit: BYTES_PER_SECOND
+  title: Average Bitrate (B/s)
+adAverageBitrate:
+  goldenMetric: adAverageBitrate
+  unit: BYTES_PER_SECOND
+  title: Ad Average Bitrate (B/s)
+averageStartTimeS:
+  goldenMetric: averageStartTimeS
+  unit: SECONDS
+  title: Average Start Time (s)
+adAverageStartTimeS:
+  goldenMetric: adAverageStartTimeS
+  unit: SECONDS
+  title: Ad Average Start Time (s)
+videoStartFailures:
+  goldenMetric: videoStartFailures
+  unit: PERCENTAGE
+  title: Video Start Failures
+adStartFailures:
+  goldenMetric: adStartFailures
+  unit: PERCENTAGE
+  title: Ad Start Failures
+videoPlaybackFailures:
+  goldenMetric: videoPlaybackFailures
+  unit: PERCENTAGE
+  title: Video Playback Failures
+adPlaybackFailures:
+  goldenMetric: adPlaybackFailures
+  unit: PERCENTAGE
+  title: Ad Playback Failures