diff --git a/deployment/undercloud/minion-rabbitmq-puppet.yaml b/deployment/undercloud/minion-rabbitmq-puppet.yaml
index 1e8e6ebe6b..d88db0e85e 100644
--- a/deployment/undercloud/minion-rabbitmq-puppet.yaml
+++ b/deployment/undercloud/minion-rabbitmq-puppet.yaml
@@ -30,23 +30,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  NotifyPort:
-    default: 5672
-    description: The network port for messaging Notify backend
-    type: number
-  NotifyUserName:
-    default: guest
-    description: The username for messaging Notifications
-    type: string
-  NotifyPassword:
-    description: The password for messaging Notifications
-    type: string
-    hidden: true
-  NotifyUseSSL:
-    default: false
-    description: Messaging Notification client subscriber parameter to specify
-                 an SSL connection to the messaging host.
-    type: string
   RpcPort:
     default: 5672
     description: The network port for messaging backend
@@ -73,10 +56,10 @@ outputs:
       service_name: oslo_messaging_minion
       global_config_settings:
         oslo_messaging_notify_scheme: rabbit
-        oslo_messaging_notify_user_name: {get_param: NotifyUserName}
-        oslo_messaging_notify_password: {get_param: NotifyPassword}
-        oslo_messaging_notify_use_ssl: {get_param: NotifyUseSSL}
-        oslo_messaging_notify_port: {get_param: NotifyPort}
+        oslo_messaging_notify_user_name: {get_param: RpcUserName}
+        oslo_messaging_notify_password: {get_param: RpcPassword}
+        oslo_messaging_notify_use_ssl: {get_param: RpcUseSSL}
+        oslo_messaging_notify_port: {get_param: RpcPort}
         oslo_messaging_rpc_scheme: rabbit
         oslo_messaging_rpc_user_name: {get_param: RpcUserName}
         oslo_messaging_rpc_password: {get_param: RpcPassword}