diff --git a/ansible/roles/stv3-common/files/distiller.conf b/ansible/roles/stv3-common/files/distiller.conf
index 24055e6..92dec52 100644
--- a/ansible/roles/stv3-common/files/distiller.conf
+++ b/ansible/roles/stv3-common/files/distiller.conf
@@ -32,10 +32,10 @@
         - payload.instance_type
         - payload.image_meta.instance_type_name
         - payload.image_meta.instance_type_flavorid
+        - payload.instance_flavor_id
     instance_flavor_id:
       type: int
       fields: 
-        - payload.instance_flavor_id
         - payload.image_meta.instance_type_flavor_id
         - payload.instance_type_id
     memory_mb:
diff --git a/ansible/roles/stv3-common/files/event_definitions.yaml b/ansible/roles/stv3-common/files/event_definitions.yaml
index 7d2efd1..92dec52 100644
--- a/ansible/roles/stv3-common/files/event_definitions.yaml
+++ b/ansible/roles/stv3-common/files/event_definitions.yaml
@@ -1,3 +1,4 @@
+---
 - event_type: compute.instance.*
   traits: &instance_traits
     tenant_id:
@@ -31,10 +32,10 @@
         - payload.instance_type
         - payload.image_meta.instance_type_name
         - payload.image_meta.instance_type_flavorid
+        - payload.instance_flavor_id
     instance_flavor_id:
       type: int
       fields: 
-        - payload.instance_flavor_id
         - payload.image_meta.instance_type_flavor_id
         - payload.instance_type_id
     memory_mb:
diff --git a/winchester/event_definitions.yaml b/winchester/event_definitions.yaml
index 7d2efd1..8ac7306 100644
--- a/winchester/event_definitions.yaml
+++ b/winchester/event_definitions.yaml
@@ -31,10 +31,10 @@
         - payload.instance_type
         - payload.image_meta.instance_type_name
         - payload.image_meta.instance_type_flavorid
+        - payload.instance_flavor_id
     instance_flavor_id:
       type: int
       fields: 
-        - payload.instance_flavor_id
         - payload.image_meta.instance_type_flavor_id
         - payload.instance_type_id
     memory_mb: