diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 922849983..de48f2c30 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -405,7 +405,12 @@ panko::keystone::authtoken::project_name: 'service'
 # Nova
 nova::debug:  "%{hiera('debug')}"
 nova::default_transport_url: "rabbit://{{UNDERCLOUD_RABBIT_USERNAME}}:{{UNDERCLOUD_RABBIT_PASSWORD}}@{{LOCAL_IP_WRAPPED}}//"
+{{#ENABLE_NOVAJOIN}}
+nova::notification_driver: messagingv2
+{{/ENABLE_NOVAJOIN}}
+{{^ENABLE_NOVAJOIN}}
 nova::notification_driver: "%{hiera('notification_driver')}"
+{{/ENABLE_NOVAJOIN}}
 nova::rpc_response_timeout: '600'
 nova::keystone::authtoken::www_authenticate_uri: "%{hiera('keystone_auth_uri')}"
 nova::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"