diff --git a/overcloud.yaml b/overcloud.yaml
index 0e986dabad..5ad68913dd 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -278,13 +278,11 @@ parameters:
     type: string
     default: unset
     description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
-  # FIXME: 'guest' is provisioned in RabbitMQ by default, we should create a user if these are changed
   RabbitUserName:
     default: guest
     description: The username for RabbitMQ
     type: string
   RabbitPassword:
-    default: guest
     description: The password for RabbitMQ
     type: string
     hidden: true
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 888f3cf890..878b31c212 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -51,7 +51,6 @@ parameters:
     description: Name of an existing Nova key pair to enable SSH access to the instances
     type: string
   RabbitPassword:
-    default: 'guest'
     type: string
     hidden: true
   RabbitUserName:
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index ee5bced633..f5c848c8cf 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -251,7 +251,6 @@ parameters:
     type: string
     default: ''  # Has to be here because of the ignored empty value bug
   RabbitPassword:
-    default: guest
     description: The password for RabbitMQ
     type: string
     hidden: true
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 6a9e8720ea..14b704841c 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -595,7 +595,6 @@ parameters:
     default: ''  # Has to be here because of the ignored empty value bug
     hidden: true
   RabbitPassword:
-    default: guest
     description: The password for RabbitMQ
     type: string
     hidden: true