diff --git a/.gitignore b/.gitignore
index 39e0c15d2a..ff04b28cf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 *.class
 
-# VSCode
-.vscode/
-
 # Eclipse
 .classpath
 .settings
diff --git a/src/main/resources/alfresco/encryption-context.xml b/src/main/resources/alfresco/encryption-context.xml
index fecdbf42e6..d1048874b5 100644
--- a/src/main/resources/alfresco/encryption-context.xml
+++ b/src/main/resources/alfresco/encryption-context.xml
@@ -50,6 +50,20 @@
         <property name="trustStoreParameters" ref="sslTrustStoreParameters"/>
     </bean>
 
+    <bean id="ssl.keyStore" class="org.alfresco.encryption.AlfrescoKeyStoreImpl" init-method="init">
+       <property name="keyStoreParameters" ref="sslKeyStoreParameters"/>
+       <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
+       <property name="validateKeyChanges" value="false"/>
+       <property name="encryptionKeysRegistry" ref="encryptionKeysRegistry"/>
+    </bean>
+
+    <bean id="ssl.trustStore" class="org.alfresco.encryption.AlfrescoKeyStoreImpl" init-method="init">
+       <property name="keyStoreParameters" ref="sslTrustStoreParameters"/>
+       <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
+       <property name="validateKeyChanges" value="false"/>
+       <property name="encryptionKeysRegistry" ref="encryptionKeysRegistry"/>
+    </bean>
+
     <bean id="md5EncryptionParameters" class="org.alfresco.httpclient.MD5EncryptionParameters">
         <property name="cipherAlgorithm" value="${encryption.cipherAlgorithm}"/>
         <property name="messageTimeout" value="${encryption.mac.messageTimeout}"/>
diff --git a/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties b/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties
new file mode 100644
index 0000000000..3a32c534d6
--- /dev/null
+++ b/src/main/resources/alfresco/keystore/ssl-keystore-passwords.properties
@@ -0,0 +1,7 @@
+aliases=ssl.alfresco.ca,ssl.repo
+# The ssl keystore password
+keystore.password=kT9X6oe68t
+# The password protecting the ssl repository key
+ssl.repo.password=kT9X6oe68t
+# The password protecting the ssl Alfresco CA key
+ssl.alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
diff --git a/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties b/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties
new file mode 100644
index 0000000000..e5510fb03c
--- /dev/null
+++ b/src/main/resources/alfresco/keystore/ssl-truststore-passwords.properties
@@ -0,0 +1,5 @@
+aliases=alfresco.ca
+# The ssl truststore password
+keystore.password=kT9X6oe68t
+# The password protecting the ssl Alfresco CA strust certificate
+alfresco.ca.password=kT9X6oe68t
\ No newline at end of file
diff --git a/src/main/resources/alfresco/keystore/ssl.keystore b/src/main/resources/alfresco/keystore/ssl.keystore
new file mode 100644
index 0000000000..3491f92e3b
Binary files /dev/null and b/src/main/resources/alfresco/keystore/ssl.keystore differ
diff --git a/src/main/resources/alfresco/keystore/ssl.truststore b/src/main/resources/alfresco/keystore/ssl.truststore
new file mode 100644
index 0000000000..67273aff4f
Binary files /dev/null and b/src/main/resources/alfresco/keystore/ssl.truststore differ