diff --git a/README.rst b/README.rst
index 574d476..9bd3116 100644
--- a/README.rst
+++ b/README.rst
@@ -651,7 +651,7 @@
       ...
 
 Cassandra listen interface
-------------------------------
+--------------------------
 
 .. code-block:: yaml
   
@@ -663,6 +663,21 @@
         rpc_port: 9160
       ....
 
+OpenContrail WebUI version >= 3.1.1
+-----------------------------------
+For OpenContrail version >= 3.1.1 and Cassandra >=2.1 we should override WebUI's cassandra port from 9160 to 9042.
+
+For appropriate node at class level:
+
+.. code-block:: yaml
+    opencontrail:
+      ....
+      web:
+        database:
+          port: 9042
+      ....
+
+
 RabbitMQ HA hosts
 ------------------
 
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'
diff --git a/opencontrail/files/3.0/config.global.js b/opencontrail/files/3.0/config.global.js
index 5b0f63d..178343a 100644
--- a/opencontrail/files/3.0/config.global.js
+++ b/opencontrail/files/3.0/config.global.js
@@ -187,7 +187,7 @@
 /* Cassandra Server */
 config.cassandra = {};
 config.cassandra.server_ips = [{%- for member in web.members %}'{{ member.host }}'{% if not loop.last %},{% endif %}{%- endfor %}];
-config.cassandra.server_port = '9160';
+config.cassandra.server_port = '{{ web.database.port }}';
 config.cassandra.enable_edit = false;
 
 /* KUE Job Scheduler */
diff --git a/opencontrail/files/3.0/contrail-analytics-api.conf b/opencontrail/files/3.0/contrail-analytics-api.conf
index eb58dad..14c261b 100644
--- a/opencontrail/files/3.0/contrail-analytics-api.conf
+++ b/opencontrail/files/3.0/contrail-analytics-api.conf
@@ -11,7 +11,7 @@
 log_category = 
 log_file = /var/log/contrail/contrail-analytics-api.log
 
-aaa_mode = {{ collector.api.get('aaa_mode', 'no-auth') }}
+aaa_mode = {{ collector.get('aaa_mode', 'no-auth') }}
 
 # Time-to-live in hours of the various data stored by collector into
 # cassandra