diff --git a/src/main/resources/alfresco/repository.properties b/src/main/resources/alfresco/repository.properties
index ede941f0b0..53e41fd25e 100644
--- a/src/main/resources/alfresco/repository.properties
+++ b/src/main/resources/alfresco/repository.properties
@@ -816,22 +816,22 @@ dir.keystore=classpath:alfresco/keystore
 
 # general encryption parameters
 encryption.keySpec.class=org.alfresco.encryption.DESEDEKeyGenerator
-encryption.keyAlgorithm=DESede
-encryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+encryption.keyAlgorithm=AES
+encryption.cipherAlgorithm=AES/CBC/PKCS5Padding
 
 # secret key keystore configuration
 encryption.keystore.location=${dir.keystore}/keystore
 # configuration via metadata is deprecated
 encryption.keystore.keyMetaData.location=
 encryption.keystore.provider=
-encryption.keystore.type=JCEKS
+encryption.keystore.type=pkcs12
 
 # backup secret key keystore configuration
 encryption.keystore.backup.location=${dir.keystore}/backup-keystore
 # configuration via metadata is deprecated
 encryption.keystore.backup.keyMetaData.location=
 encryption.keystore.backup.provider=
-encryption.keystore.backup.type=JCEKS
+encryption.keystore.backup.type=pkcs12
 
 # Should encryptable properties be re-encrypted with new encryption keys on botstrap?
 encryption.bootstrap.reencrypt=false
diff --git a/src/test/resources/alfresco-global.properties b/src/test/resources/alfresco-global.properties
index f7ed53f5a1..08a5956690 100644
--- a/src/test/resources/alfresco-global.properties
+++ b/src/test/resources/alfresco-global.properties
@@ -60,4 +60,8 @@ system.delete_not_exists.timeout_seconds=-1
 system.prop_table_cleaner.algorithm=V2
 
 # For testing only
-encryption.keystore.keyMetaData.location=${dir.keystore}/keystore-passwords.properties
\ No newline at end of file
+encryption.keystore.keyMetaData.location=${dir.keystore}/keystore-passwords.properties
+encryption.keyAlgorithm=DESede
+encryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+encryption.keystore.type=JCEKS
+encryption.keystore.backup.type=JCEKS
\ No newline at end of file