diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index e2f1a80d42..18565f463e 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -642,7 +642,7 @@ redis:
   # ssl config
   ssl:
     # Enable/disable secure connection
-    enabled: "${REDIS_SSL_ENABLED:false}"
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
     # Server SSL credentials
     credentials:
       # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@@ -651,9 +651,9 @@ redis:
       pem:
         # Path redis server (CA) certificate
         cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
-        # Path to user certificate file (optional)
+        # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
         user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
-        # Path to user private key file (optional)
+        # Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
         user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
       # Keystore server credentials
       keystore:
diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java
index f0f250bbaa..d4235e3662 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/TBRedisStandaloneConfiguration.java
@@ -89,4 +89,4 @@ public class TBRedisStandaloneConfiguration extends TBRedisCacheConfiguration {
         }
         return jedisClientConfigurationBuilder.build();
     }
-}
\ No newline at end of file
+}
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
index 6df75fdac4..bbaeabe907 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
@@ -108,7 +108,7 @@ public class ContainerTestSuite {
 
             if (IS_REDIS_SSL) {
                 addToFile(targetDir, "cache-redis.env",
-                        Map.of("REDIS_SSL_ENABLED", "true",
+                        Map.of("TB_REDIS_SSL_ENABLED", "true",
                                 "TB_REDIS_SSL_PEM_CERT", "/redis/certs/redisCA.crt"));
             }
 
diff --git a/transport/coap/src/main/resources/tb-coap-transport.yml b/transport/coap/src/main/resources/tb-coap-transport.yml
index 87e3cf870d..43a84b3d5a 100644
--- a/transport/coap/src/main/resources/tb-coap-transport.yml
+++ b/transport/coap/src/main/resources/tb-coap-transport.yml
@@ -96,7 +96,7 @@ redis:
   password: "${REDIS_PASSWORD:}"
   ssl:
     # Enable/disable secure connection
-    enabled: "${REDIS_SSL_ENABLED:false}"
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
     # Server SSL credentials
     credentials:
       # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@@ -105,9 +105,9 @@ redis:
       pem:
         # Path redis server (CA) certificate
         cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
-        # Path to user certificate file
+        # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
         user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
-        # Path to user private key file
+        # Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
         user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
       # Keystore server credentials
       keystore:
diff --git a/transport/http/src/main/resources/tb-http-transport.yml b/transport/http/src/main/resources/tb-http-transport.yml
index 3f8af8bb91..e226319c20 100644
--- a/transport/http/src/main/resources/tb-http-transport.yml
+++ b/transport/http/src/main/resources/tb-http-transport.yml
@@ -129,7 +129,7 @@ redis:
   password: "${REDIS_PASSWORD:}"
   ssl:
     # Enable/disable secure connection
-    enabled: "${REDIS_SSL_ENABLED:false}"
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
     # Server SSL credentials
     credentials:
       # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@@ -138,9 +138,9 @@ redis:
       pem:
         # Path redis server (CA) certificate
         cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
-        # Path to user certificate file
+        # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
         user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
-        # Path to user private key file
+        # Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
         user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
       # Keystore server credentials
       keystore:
diff --git a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
index 345f2eab5e..93a553eea5 100644
--- a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
+++ b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
@@ -96,7 +96,7 @@ redis:
   password: "${REDIS_PASSWORD:}"
   ssl:
     # Enable/disable secure connection
-    enabled: "${REDIS_SSL_ENABLED:false}"
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
     # Server SSL credentials
     credentials:
       # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@@ -105,9 +105,9 @@ redis:
       pem:
         # Path redis server (CA) certificate
         cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
-        # Path to user certificate file
+        # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
         user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
-        # Path to user private key file
+        # Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
         user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
       # Keystore server credentials
       keystore:
diff --git a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
index f04c06dc81..e2c65a4a63 100644
--- a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
+++ b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
@@ -97,7 +97,7 @@ redis:
   password: "${REDIS_PASSWORD:}"
   ssl:
     # Enable/disable secure connection
-    enabled: "${REDIS_SSL_ENABLED:false}"
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
     # Server SSL credentials
     credentials:
       # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@@ -106,9 +106,9 @@ redis:
       pem:
         # Path redis server (CA) certificate
         cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
-        # Path to user certificate file
+        # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
         user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
-        # Path to user private key file
+        # Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
         user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
       # Keystore server credentials
       keystore:
diff --git a/transport/snmp/src/main/resources/tb-snmp-transport.yml b/transport/snmp/src/main/resources/tb-snmp-transport.yml
index a4e65a67c3..db20b596f0 100644
--- a/transport/snmp/src/main/resources/tb-snmp-transport.yml
+++ b/transport/snmp/src/main/resources/tb-snmp-transport.yml
@@ -96,7 +96,7 @@ redis:
   password: "${REDIS_PASSWORD:}"
   ssl:
     # Enable/disable secure connection
-    enabled: "${REDIS_SSL_ENABLED:false}"
+    enabled: "${TB_REDIS_SSL_ENABLED:false}"
     # Server SSL credentials
     credentials:
       # Server credentials type (PEM - pem certificate file; KEYSTORE - java keystore)
@@ -105,9 +105,9 @@ redis:
       pem:
         # Path redis server (CA) certificate
         cert_file: "${TB_REDIS_SSL_PEM_CERT:}"
-        # Path to user certificate file
+        # Path to user certificate file. This is optional for the client and can be used for two-way authentication for the client
         user_cert_file: "${TB_REDIS_SSL_PEM_KEY:}"
-        # Path to user private key file
+        # Path to user private key file. This is optional for the client and only needed if ‘ssl.pem.user_cert_file’ is configured.
         user_key_file: "${TB_REDIS_SSL_PEM_KEY_PASSWORD:}"
       # Keystore server credentials
       keystore: