diff --git a/codegen-web/src/main/resources/config/server.yml b/codegen-web/src/main/resources/config/server.yml
index 3cafaab2f..5910eaf70 100644
--- a/codegen-web/src/main/resources/config/server.yml
+++ b/codegen-web/src/main/resources/config/server.yml
@@ -22,12 +22,21 @@ enableHttp2: true
 # Keystore file name in config folder. KeystorePass is in secret.yml to access it.
 keystoreName: server.keystore
 
+# Keystore password
+keystorePass: ${server.keystorePass:password}
+
+# Private key password
+keyPass: ${server.keyPass:password}
+
 # Flag that indicate if two way TLS is enabled. Not recommended in docker container.
 enableTwoWayTls: false
 
 # Truststore file name in config folder. TruststorePass is in secret.yml to access it.
 truststoreName: server.truststore
 
+# Truststore password
+truststorePass: ${server.truststorePass:password}
+
 # Unique service identifier. Used in service registration and discovery etc.
 serviceId: com.networknt.codegen-web-2.0.0
 
diff --git a/codegen-web/src/test/resources/config/server.yml b/codegen-web/src/test/resources/config/server.yml
index db9e3854f..edd4dd44f 100644
--- a/codegen-web/src/test/resources/config/server.yml
+++ b/codegen-web/src/test/resources/config/server.yml
@@ -21,12 +21,21 @@ enableHttp2: false
 # Keystore file name in config folder. KeystorePass is in secret.yml to access it.
 keystoreName: server.keystore
 
+# Keystore password
+keystorePass: ${server.keystorePass:password}
+
+# Private key password
+keyPass: ${server.keyPass:password}
+
 # Flag that indicate if two way TLS is enabled. Not recommended in docker container.
 enableTwoWayTls: false
 
 # Truststore file name in config folder. TruststorePass is in secret.yml to access it.
 truststoreName: server.truststore
 
+# Truststore password
+truststorePass: ${server.truststorePass:password}
+
 # Unique service identifier. Used in service registration and discovery etc.
 serviceId: io.swagger.swagger-light-4j-1.0.0