diff --git a/metadata/service/control/analytics.yml b/metadata/service/control/analytics.yml
index 77ad856..be71d6d 100644
--- a/metadata/service/control/analytics.yml
+++ b/metadata/service/control/analytics.yml
@@ -10,7 +10,7 @@
     opencontrail_admin_password: 'none'
     opencontrail_admin_user: 'contrail'
     keystone_service_token: 'none'
-    redis_password: 'none'
+    opencontrail_redis_password: 'none'
     openstack_region: RegionOne
   opencontrail:
     common:
@@ -38,7 +38,7 @@
         engine: redis
         host: ${_param:cluster_local_address}
         port: 6379
-        password: ${_param:redis_password}
+        password: ${_param:opencontrail_redis_password}
       discovery:
         host: ${_param:network_vip_address}
       data_ttl: 1
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 399d330..8b9eaf7 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -10,7 +10,7 @@
     opencontrail_admin_password: 'none'
     opencontrail_admin_user: 'contrail'
     keystone_service_token: 'none'
-    redis_password: 'none'
+    opencontrail_redis_password: 'none'
     openstack_region: RegionOne
   opencontrail:
     common:
@@ -107,7 +107,7 @@
         engine: redis
         host: ${_param:cluster_local_address}
         port: 6379
-        password: ${_param:redis_password}
+        password: ${_param:opencontrail_redis_password}
       discovery:
         host: ${_param:cluster_vip_address}
       data_ttl: 1
@@ -174,7 +174,7 @@
         engine: redis
         host: ${_param:cluster_local_address}
         port: 6379
-        password: ${_param:redis_password}
+        password: ${_param:opencontrail_redis_password}
       members:
       - host: ${_param:cluster_node01_address}
         id: 1
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index 58b33fe..728e53a 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -11,7 +11,7 @@
     opencontrail_admin_user: 'contrail'
     keystone_service_token: 'none'
     openstack_region: RegionOne
-    redis_password: 'none'
+    opencontrail_redis_password: 'none'
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
@@ -134,7 +134,7 @@
       cache:
         engine: redis
         host: ${_param:cluster_local_address}
-        password: ${_param:redis_password}
+        password: ${_param:opencontrail_redis_password}
         port: 6379
       members:
       - host: ${_param:cluster_node01_address}
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 5c922fe..73ce29b 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -11,7 +11,7 @@
     opencontrail_admin_user: 'contrail'
     keystone_service_token: 'none'
     openstack_region: RegionOne
-    redis_password: 'none'
+    opencontrail_redis_password: 'none'
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
@@ -91,7 +91,7 @@
         engine: redis
         host: ${_param:single_address}
         port: 6379
-        password: ${_param:redis_password}
+        password: ${_param:opencontrail_redis_password}
       discovery:
         host: ${_param:single_address}
       data_ttl: 1
@@ -148,7 +148,7 @@
         engine: redis
         host: ${_param:single_address}
         port: 6379
-        password: ${_param:redis_password}
+        password: ${_param:opencontrail_redis_password}
       members:
       - host: ${_param:single_address}
         id: 1