diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index f35df67265..242a996592 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -136,8 +136,8 @@ quota:
     # Array of blacklist hosts
     blacklist: "${QUOTA_HOST_BLACKLIST:}"
     log:
-      topSize: 10
-      intervalMin: 2
+      topSize: "${QUOTA_HOST_LOG_TOP_SIZE:10}"
+      intervalMin: "${QUOTA_HOST_LOG_INTERVAL_MIN:2}"
   rule:
     tenant:
       # Max allowed number of API requests in interval for single tenant
@@ -153,10 +153,10 @@ quota:
       # Array of whitelist tenants
       whitelist: "${QUOTA_TENANT_WHITELIST:}"
       # Array of blacklist tenants
-      blacklist: "${QUOTA_HOST_BLACKLIST:}"
+      blacklist: "${QUOTA_HOST_TENANT_BLACKLIST:}"
       log:
-        topSize: 10
-        intervalMin: 2
+        topSize: "${QUOTA_TENANT_LOG_TOP_SIZE:10}"
+        intervalMin: "${QUOTA_TENANT_LOG_INTERVAL_MIN:2}"
 
 database:
   entities:
@@ -185,7 +185,8 @@ cassandra:
   init_timeout_ms: "${CASSANDRA_CLUSTER_INIT_TIMEOUT_MS:300000}"
   # Specify cassandra claster initialization retry interval (if no hosts available during startup)
   init_retry_interval_ms: "${CASSANDRA_CLUSTER_INIT_RETRY_INTERVAL_MS:3000}"
-
+  max_requests_per_connection_local: "${CASSANDRA_MAX_REQUESTS_PER_CONNECTION_LOCAL:32768}"
+  max_requests_per_connection_remote: "${CASSANDRA_MAX_REQUESTS_PER_CONNECTION_REMOTE:32768}"
   # Credential parameters #
   credentials: "${CASSANDRA_USE_CREDENTIALS:false}"
   # Specify your username