diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh
index 4bb649b74..e84118396 100644
--- a/devstack/gate_hook.sh
+++ b/devstack/gate_hook.sh
@@ -47,7 +47,7 @@ notification_driver = messagingv2
 [notifications]
 versioned_notifications_topics = versioned_notifications,vitrage_notifications
 notification_driver = messagingv2
-notification_format = both
+
 
 [[post-config|\$NEUTRON_CONF]]
 [DEFAULT]
diff --git a/devstack/override-defaults b/devstack/override-defaults
new file mode 100644
index 000000000..62d7bb2b4
--- /dev/null
+++ b/devstack/override-defaults
@@ -0,0 +1,6 @@
+
+# Plug-in overrides
+# https://docs.openstack.org/devstack/latest/plugins.html#plugin-interface
+
+# Enable both versioned and unversioned notifications.
+NOVA_NOTIFICATION_FORMAT=both
\ No newline at end of file