diff --git a/definitions/infra-azurestorageaccount/definition.yml b/definitions/infra-azurestorageaccount/definition.yml
index b481b823b..df351cb2f 100644
--- a/definitions/infra-azurestorageaccount/definition.yml
+++ b/definitions/infra-azurestorageaccount/definition.yml
@@ -1,5 +1,14 @@
 domain: INFRA
 type: AZURESTORAGEACCOUNT
+goldenTags:
+- azure.regionName
+- azure.subscriptionId
+- azure.type
+- azure.resourceGroupName
+- azure.hasSecondary
+- azure.provisioningState
 compositeMetrics:
+  goldenMetrics:
+  - golden_metrics.yml
   summaryMetrics:
   - summary_metrics.yml
diff --git a/definitions/infra-azurestorageaccount/golden_metrics.yml b/definitions/infra-azurestorageaccount/golden_metrics.yml
new file mode 100644
index 000000000..93aa60675
--- /dev/null
+++ b/definitions/infra-azurestorageaccount/golden_metrics.yml
@@ -0,0 +1,21 @@
+transactions:
+  title: Transactions
+  query:
+    select: sum(transactions.Total)
+    from: AzureStorageAccountSample
+    facet: entityName
+    eventId: entityGuid
+availabilityPercent:
+  title: Availability
+  query:
+    select: average(availabilityPercent.Average)
+    from: AzureStorageAccountSample
+    facet: entityName
+    eventId: entityGuid
+successE2ELatencyMilliseconds:
+  title: Success E2E Latency (ms)
+  query:
+    select: average(successE2ELatencyMilliseconds.Average)
+    from: AzureStorageAccountSample
+    facet: entityName
+    eventId: entityGuid
diff --git a/definitions/infra-azurevirtualmachinescaleset/definition.yml b/definitions/infra-azurevirtualmachinescaleset/definition.yml
index 1f7f55705..42b97f89d 100644
--- a/definitions/infra-azurevirtualmachinescaleset/definition.yml
+++ b/definitions/infra-azurevirtualmachinescaleset/definition.yml
@@ -1,2 +1,12 @@
 domain: INFRA
 type: AZUREVIRTUALMACHINESCALESET
+goldenTags:
+- azure.regionName
+- azure.subscriptionId
+- azure.type
+- azure.resourceGroupName
+compositeMetrics:
+  goldenMetrics:
+  - golden_metrics.yml
+  summaryMetrics:
+  - summary_metrics.yml
diff --git a/definitions/infra-azurevirtualmachinescaleset/golden_metrics.yml b/definitions/infra-azurevirtualmachinescaleset/golden_metrics.yml
new file mode 100644
index 000000000..f02fb6e9d
--- /dev/null
+++ b/definitions/infra-azurevirtualmachinescaleset/golden_metrics.yml
@@ -0,0 +1,21 @@
+cpuPercent: 
+  title: CPU
+  query:
+    select: average(cpuPercent.Average)
+    from: AzureVirtualMachineScaleSetSample
+    facet: entityName
+    eventId: entityGuid
+networkInTotal:
+  title: Incoming traffic (bytes)
+  query:
+    select: average(networkInTotalBytes.Average)
+    from: AzureVirtualMachineScaleSetSample
+    facet: entityName
+    eventId: entityGuid
+networkOutTotal:
+  title: Outgoing traffic (bytes)
+  query:
+    select: average(networkOutTotalBytes.Average)
+    from: AzureVirtualMachineScaleSetSample
+    facet: entityName
+    eventId: entityGuid
diff --git a/definitions/infra-azurevirtualmachinescaleset/summary_metrics.yml b/definitions/infra-azurevirtualmachinescaleset/summary_metrics.yml
new file mode 100644
index 000000000..b2a1ff702
--- /dev/null
+++ b/definitions/infra-azurevirtualmachinescaleset/summary_metrics.yml
@@ -0,0 +1,26 @@
+providerAccountName:
+  tag:
+    key: providerAccountName
+  title: Azure Account
+  unit: STRING
+cpuPercent:
+  query:
+    eventId: entityGuid
+    select: average(cpuPercent.Average)
+    from: AzureVirtualMachineScaleSetSample
+  unit: PERCENTAGE
+  title: CPU
+networkInTotal:
+  query:
+    eventId: entityGuid
+    select: average(networkInTotalBytes.Average)
+    from: AzureVirtualMachineScaleSetSample
+  unit: BYTES
+  title: Incoming
+networkOutTotal:
+  query:
+    eventId: entityGuid
+    select: average(networkOutTotalBytes.Average)
+    from: AzureVirtualMachineScaleSetSample
+  unit: BYTES
+  title: Outgoing
diff --git a/definitions/infra-rabbitmqnode/definition.yml b/definitions/infra-rabbitmqnode/definition.yml
index ebd5056f5..a057dc912 100644
--- a/definitions/infra-rabbitmqnode/definition.yml
+++ b/definitions/infra-rabbitmqnode/definition.yml
@@ -5,5 +5,3 @@ goldenTags:
 compositeMetrics:
   goldenMetrics:
   - golden_metrics.yml
-  summaryMetrics:
-  - summary_metrics.yml