diff --git a/opencontrail/compute/single.yml b/opencontrail/compute/single.yml
index 2211a69..c016479 100644
--- a/opencontrail/compute/single.yml
+++ b/opencontrail/compute/single.yml
@@ -27,7 +27,7 @@
       network:
         engine: keystone
         host: ${_param:control_address}
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         password: ${_param:keystone_neutron_password}
         tenant: service
   neutron:
@@ -37,7 +37,7 @@
         engine: keystone
         host: ${_param:control_address}
         port: 35357
-        user: neutron
+        user: ${_param:keystone_neutron_username}
         password: ${_param:keystone_neutron_password}
         tenant: service