diff --git a/metadata/service/control/analytics.yml b/metadata/service/control/analytics.yml
index 8de6918..80046dc 100644
--- a/metadata/service/control/analytics.yml
+++ b/metadata/service/control/analytics.yml
@@ -5,7 +5,6 @@
 parameters:
   _param:
     opencontrail_version: 2.2
-    opencontrail_api_aaa_mode: no-auth
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
@@ -22,8 +21,7 @@
     collector:
       version: ${_param:opencontrail_version}
       enabled: true
-      api:
-        aaa_mode: ${_param:opencontrail_api_aaa_mode}
+      aaa_mode: no-auth
       bind:
         address: ${_param:cluster_local_address}
         port: 9081
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 8a20225..1c8b28b 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -83,6 +83,7 @@
     collector:
       version: ${_param:opencontrail_version}
       enabled: true
+      aaa_mode: no-auth
       bind:
         address: ${_param:cluster_local_address}
         port: 9081
@@ -143,6 +144,9 @@
         id: 2
       - host: ${_param:cluster_node03_address}
         id: 3
+      database:
+        engine: cassandra
+        port: 9160
       identity:
         engine: keystone
         version: '2.0'
diff --git a/metadata/service/control/control.yml b/metadata/service/control/control.yml
index 6ab199c..62f8831 100644
--- a/metadata/service/control/control.yml
+++ b/metadata/service/control/control.yml
@@ -124,6 +124,9 @@
         id: 2
       - host: ${_param:cluster_node03_address}
         id: 3
+      database:
+        engine: cassandra
+        port: 9160
       identity:
         engine: keystone
         version: '2.0'
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index fe4bca8..8903522 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -74,6 +74,7 @@
     collector:
       version: ${_param:opencontrail_version}
       enabled: true
+      aaa_mode: no-auth
       bind:
         address: ${_param:single_address}
         port: 9081
@@ -122,6 +123,9 @@
       members:
       - host: ${_param:single_address}
         id: 1
+      database:
+        engine: cassandra
+        port: 9160      
       identity:
         engine: keystone
         version: '2.0'