diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
index 2593add406..0137887aaf 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
@@ -133,7 +133,7 @@ public class CertPemCredentials implements ClientCredentials {
         KeyStore clientKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         clientKeyStore.load(null, null);
         for (X509Certificate certHolder : certHolders) {
-            clientKeyStore.setCertificateEntry(createCertEntryAlias("cert-", certHolder), certHolder);
+            clientKeyStore.setCertificateEntry("cert-" + certHolder.getSubjectDN().getName(), certHolder);
         }
         clientKeyStore.setKeyEntry("private-key",
                 privateKey,
@@ -150,7 +150,7 @@ public class CertPemCredentials implements ClientCredentials {
         KeyStore caKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         caKeyStore.load(null, null);
         for (X509Certificate caCertHolder : caCertHolders) {
-            caKeyStore.setCertificateEntry(createCertEntryAlias("caCert-cert-", caCertHolder), caCertHolder);
+            caKeyStore.setCertificateEntry("caCert-cert-" + caCertHolder.getSubjectDN().getName(), caCertHolder);
         }
 
         TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
@@ -158,10 +158,6 @@ public class CertPemCredentials implements ClientCredentials {
         return trustManagerFactory;
     }
 
-    private String createCertEntryAlias(String prefix, X509Certificate certificate) {
-        return prefix + "-" + certificate.getSubjectDN().getName();
-    }
-
     List<X509Certificate> readCertFile(String fileContent) throws Exception {
         if (fileContent == null || fileContent.trim().isEmpty()) {
             return Collections.emptyList();