diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index c20f81f9e1..0c1a5b15c7 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -18,6 +18,10 @@ Parameters:
     Default: default
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     Type: String
+  NeutronPassword:
+    Default: unset
+    Description: The password for the neutron service account, used by neutron agents.
+    Type: String
   NovaComputeDriver:
     Default: libvirt.LibvirtDriver
     Type: String
@@ -195,6 +199,8 @@ Resources:
           physical_bridge: br-ex
           tenant_network_type: gre
         ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
+        service-password:
+          Ref: NeutronPassword
       rabbit:
         host:
           Fn::GetAtt:
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index d2b4a4e4c3..e9f9b35633 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -20,6 +20,10 @@ Parameters:
   Image:
     Default: undercloud
     Type: String
+  NeutronPassword:
+    Default: unset
+    Description: The password for the neutron service account, used by neutron agents.
+    Type: String
   PowerUserName:
     Default: stack
     Description: What username to ssh to the virtual power host with.
@@ -135,6 +139,8 @@ Resources:
           bridge_mappings: ctlplane:br-ctlplane
           tenant_network_type: vlan
           enable_tunneling: 'False'
+        service-password:
+          Ref: NeutronPassword
       rabbit:
         host: 127.0.0.1
         password: guest