diff --git a/defaults/main.yml b/defaults/main.yml
index 42ac57d9..bdd7ad8a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -22,6 +22,8 @@ nova_designate_enabled: False
 nova_notifications_designate: notifications_designate
 # Enable/Disable ceilometer configurations
 nova_ceilometer_enabled: False
+# Enable/Disable nova versioned notification
+nova_versioned_notification_enabled: False
 
 ## Verbosity Options
 debug: False
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 3e653a33..d8e48c69 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -71,7 +71,6 @@ force_config_drive = {{ nova_force_config_drive }}
 {% if nova_ceilometer_enabled %}
 instance_usage_audit = True
 instance_usage_audit_period = hour
-notify_on_state_change = vm_and_task_state
 {% endif %}
 
 # Notifications
@@ -162,6 +161,13 @@ service_metadata_proxy = {{ nova_metadata_proxy_enabled }}
 ovs_bridge = {{ nova_network_services[nova_network_type]['ovs_bridge'] }}
 {% endif %}
 
+{% if nova_ceilometer_enabled %}
+[notifications]
+notify_on_state_change = vm_and_task_state
+notification_format = {% if nova_versioned_notification_enabled %}both{% else %}unversioned{% endif %}
+{% endif %}
+
+
 {% if nova_placement_service_enabled | bool %}
 # Placement
 [placement]