diff --git a/core/src/main/groovy/noe/server/Tomcat.groovy b/core/src/main/groovy/noe/server/Tomcat.groovy
index afee4a27..c79c18d4 100644
--- a/core/src/main/groovy/noe/server/Tomcat.groovy
+++ b/core/src/main/groovy/noe/server/Tomcat.groovy
@@ -647,7 +647,7 @@ class Tomcat extends ServerAbstract implements WorkerServer {
     def aprListener = '<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />'
     def commentAprListener = '<!-- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> -->'
     def dummyComment = '<!-- Define an AJP 1.3 Connector on port 8009 -->'
-    def enableJavaSsl = '<Connector port="' + this.mainHttpsPort.toString() + '" protocol="HTTP/1.1" SSLEnabled="true"' + nl +
+    def enableJavaSsl = dummyComment + nl + '<Connector port="' + this.mainHttpsPort.toString() + '" protocol="HTTP/1.1" SSLEnabled="true"' + nl +
         'maxThreads="150" scheme="https" secure="true"' + nl +
         'keystoreFile="' + this.keystorePath + '" keystoreType="' + this.keystoreType + '" keystorePass="' + this.sslKeystorePassword + '"' + nl +
         'clientAuth="false" sslProtocol="TLS" />'
@@ -667,7 +667,7 @@ class Tomcat extends ServerAbstract implements WorkerServer {
   void enableSslOpenSsl() {
     def nl = platform.nl
     def dummyComment = '<!-- Define an AJP 1.3 Connector on port 8009 -->'
-    def enableOpenSsl = '<Connector port="' + this.mainHttpsPort.toString() + '" SSLEnabled="true"' + nl +
+    def enableOpenSsl = dummyComment + nl + '<Connector port="' + this.mainHttpsPort.toString() + '" SSLEnabled="true"' + nl +
         'maxThreads="200" scheme="https" secure="true"' + nl +
         'SSLCertificateFile="' + this.sslCertificate + '"' + nl +
         'SSLCertificateKeyFile="' + this.sslKey + '"' + nl +
diff --git a/core/src/main/resources/ssl/self_signed/README.txt b/core/src/main/resources/ssl/self_signed/README.txt
index b7ce2d8c..5d00beec 100644
--- a/core/src/main/resources/ssl/self_signed/README.txt
+++ b/core/src/main/resources/ssl/self_signed/README.txt
@@ -1,14 +1,15 @@
 // key generation
-openssl genrsa -des3 -out server.key 4096
-passwd: changeit
+openssl genpkey -algorithm rsa -pkeyopt rsa_keygen_bits:4096 -out server.key
 
 // certificate generation
-openssl req -new -x509 -key server.key -out server.crt -days 10950
+openssl req -new -x509 -key server.key -out server.crt -days 10950 \
+-subj "/C=CZ/ST=Czech Republic/L=Brno/O=Corleone Family/OU=Michael Corleone/CN=localhost/emailAddress=noreplay@corleone.gf"
 
 // keystore in pkcs12 format
-openssl pkcs12 -export -in server.crt -inkey server.key  -out server.p12
-passwd: changeit
+openssl pkcs12 -export -in server.crt -passin pass:changeit -inkey server.key  -out server.p12 -passout pass:changeit
 
 // transform keystore into jks format
-keytool -importkeystore -srckeystore server.p12 -destkeystore server.jks -srcstoretype pkcs12
-passwd: changeit
+keytool -importkeystore -srckeystore server.p12 -srcstorepass changeit -srcstoretype pkcs12 -destkeystore server.jks -deststorepass changeit
+
+// list contents
+keytool -list -v -keystore server.jks | less
diff --git a/core/src/main/resources/ssl/self_signed/server.crt b/core/src/main/resources/ssl/self_signed/server.crt
index dc8f8664..eade095c 100644
--- a/core/src/main/resources/ssl/self_signed/server.crt
+++ b/core/src/main/resources/ssl/self_signed/server.crt
@@ -1,35 +1,35 @@
 -----BEGIN CERTIFICATE-----
-MIIGKTCCBBGgAwIBAgIUUEht2Dt/kHdWN8w8jSbUtQLQ17swDQYJKoZIhvcNAQEL
+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
-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
+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
 -----END CERTIFICATE-----
diff --git a/core/src/main/resources/ssl/self_signed/server.jks b/core/src/main/resources/ssl/self_signed/server.jks
index 6e045c7e..31e0af7f 100644
Binary files a/core/src/main/resources/ssl/self_signed/server.jks and b/core/src/main/resources/ssl/self_signed/server.jks differ
diff --git a/core/src/main/resources/ssl/self_signed/server.key b/core/src/main/resources/ssl/self_signed/server.key
index 6a756be7..944383c8 100644
--- a/core/src/main/resources/ssl/self_signed/server.key
+++ b/core/src/main/resources/ssl/self_signed/server.key
@@ -1,54 +1,52 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,EC242062A0B24387
-
-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
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+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
+DFMgpvlbWAcj6AYUrOdzyGDLiZfkVQ==
+-----END PRIVATE KEY-----
diff --git a/core/src/main/resources/ssl/self_signed/server.p12 b/core/src/main/resources/ssl/self_signed/server.p12
index b49c0003..6e190cc0 100644
Binary files a/core/src/main/resources/ssl/self_signed/server.p12 and b/core/src/main/resources/ssl/self_signed/server.p12 differ