diff --git a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java
index b856582ac11..8a8754d7b3e 100644
--- a/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java
+++ b/framework/security/src/org/apache/cloudstack/framework/security/keystore/KeystoreDaoImpl.java
@@ -25,6 +25,7 @@ import javax.ejb.Local;
 
 import org.springframework.stereotype.Component;
 
+import com.cloud.utils.crypt.DBEncryptionUtil;
 import com.cloud.utils.db.DB;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.SearchBuilder;
@@ -104,10 +105,10 @@ public class KeystoreDaoImpl extends GenericDaoBase<KeystoreVO, Long> implements
             PreparedStatement pstmt = txn.prepareAutoCloseStatement(sql);
             pstmt.setString(1, name);
             pstmt.setString(2, certificate);
-            pstmt.setString(3, key);
+            pstmt.setString(3, DBEncryptionUtil.encrypt(key));
             pstmt.setString(4, domainSuffix);
             pstmt.setString(5, certificate);
-            pstmt.setString(6, key);
+            pstmt.setString(6, DBEncryptionUtil.encrypt(key));
             pstmt.setString(7, domainSuffix);
 
             pstmt.executeUpdate();