diff --git a/neutron/control/opencontrail/cluster.yml b/neutron/control/opencontrail/cluster.yml
index 4bc0e71..a33c273 100644
--- a/neutron/control/opencontrail/cluster.yml
+++ b/neutron/control/opencontrail/cluster.yml
@@ -16,7 +16,7 @@
         engine: contrail
         host: ${_param:opencontrail_control_address}
         port: 8082
-        user: admin
-        password: ${_param:keystone_admin_password}
+        user: ${_param:opencontrail_admin_user}
+        password: ${_param:opencontrail_admin_password}
         tenant: admin
         token: ${_param:keystone_service_token}
diff --git a/neutron/control/opencontrail/single.yml b/neutron/control/opencontrail/single.yml
index e47aa2c..00fa23c 100644
--- a/neutron/control/opencontrail/single.yml
+++ b/neutron/control/opencontrail/single.yml
@@ -19,7 +19,7 @@
         engine: contrail
         host: ${_param:opencontrail_control_address}
         port: 8082
-        user: admin
-        password: ${_param:keystone_admin_password}
+        user: ${_param:opencontrail_admin_user}
+        password: ${_param:opencontrail_admin_password}
         tenant: admin
         token: ${_param:keystone_service_token}
diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 21d27f7..95b0d90 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -151,6 +151,7 @@
               container_name: ${_param:opencontrail_controller_container_name}
               volumes:
                 - /etc/contrail:/etc/contrail
+                - /etc/redis/redis_webui.conf:/etc/redis/redis.conf
                 - /var/lib/configdb:/var/lib/cassandra
                 - /var/lib/config_zookeeper_data:/var/lib/zookeeper
                 - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 8a02847..ba47959 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -109,6 +109,7 @@
               container_name: ${_param:opencontrail_controller_container_name}
               volumes:
                 - /etc/contrail:/etc/contrail
+                - /etc/redis/redis_webui.conf:/etc/redis/redis.conf
                 - /var/lib/configdb:/var/lib/cassandra
                 - /var/lib/config_zookeeper_data:/var/lib/zookeeper
                 - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 726fa8f..9c11443 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -164,6 +164,7 @@
               container_name: ${_param:opencontrail_controller_container_name}
               volumes:
                 - /etc/contrail:/etc/contrail
+                - /etc/redis/redis_webui.conf:/etc/redis/redis.conf
                 - /var/lib/configdb:/var/lib/cassandra
                 - /var/lib/config_zookeeper_data:/var/lib/zookeeper
                 - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid