diff --git a/webgoat-container/src/main/resources/application.properties b/webgoat-container/src/main/resources/application.properties
index ba8b75afc..281b53230 100644
--- a/webgoat-container/src/main/resources/application.properties
+++ b/webgoat-container/src/main/resources/application.properties
@@ -2,10 +2,17 @@ server.error.include-stacktrace=always
 server.error.path=/error.html
 server.session.timeout=600
 server.contextPath=/WebGoat
-server.port=8080
-server.address=127.0.0.1
+server.port=${WEBGOAT_PORT:8080}
+server.address=${WEBGOAT_HOST:127.0.0.1}
 
-spring.datasource.url=jdbc:hsqldb:hsql://localhost:9001/webgoat
+server.ssl.key-store-type=${WEBGOAT_KEYSTORE_TYPE:PKCS12}
+server.ssl.key-store=${WEBGOAT_KEYSTORE:classpath:goatkeystore.pkcs12}
+server.ssl.key-store-password=${WEBGOAT_KEYSTORE_PASSWORD:password}
+server.ssl.key-alias=${WEBGOAT_KEY_ALIAS:goat}
+server.ssl.enabled=${WEBGOAT_SSLENABLED:false}
+security.require-ssl=${WEBGOAT_SSLENABLED:false}
+
+spring.datasource.url=jdbc:hsqldb:hsql://${WEBGOAT_HOST:127.0.0.1}:${WEBGOAT_HSQLPORT:9001}/webgoat
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.HSQLDialect
 spring.datasource.driver-class-name=org.hsqldb.jdbc.JDBCDriver
@@ -36,7 +43,7 @@ webgoat.database.driver=org.hsqldb.jdbcDriver
 webgoat.database.connection.string=jdbc:hsqldb:mem:{USER}
 webgoat.default.language=en
 
-webwolf.host=${WEBWOLF_HOST:localhost}
+webwolf.host=${WEBWOLF_HOST:127.0.0.1}
 webwolf.port=${WEBWOLF_PORT:9090}
 webwolf.url=http://${webwolf.host}:${webwolf.port}/WebWolf
 webwolf.url.landingpage=http://${webwolf.host}:${webwolf.port}/landing
diff --git a/webgoat-container/src/main/resources/goatkeystore.pkcs12 b/webgoat-container/src/main/resources/goatkeystore.pkcs12
new file mode 100644
index 000000000..c7e335790
Binary files /dev/null and b/webgoat-container/src/main/resources/goatkeystore.pkcs12 differ
diff --git a/webwolf/src/main/resources/application.properties b/webwolf/src/main/resources/application.properties
index 25869712a..981ce87aa 100644
--- a/webwolf/src/main/resources/application.properties
+++ b/webwolf/src/main/resources/application.properties
@@ -2,11 +2,11 @@ server.error.include-stacktrace=always
 server.error.path=/error.html
 server.session.timeout=6000
 #server.contextPath=/WebWolf
-server.port=9090
-server.address=localhost
+server.port=${WEBWOLF_PORT:9090}
+server.address=${WEBWOLF_HOST:127.0.0.1}
 server.session.cookie.name = WEBWOLFSESSION
 
-spring.datasource.url=jdbc:hsqldb:hsql://${webgoat.server.address:localhost}:9001/webgoat
+spring.datasource.url=jdbc:hsqldb:hsql://${WEBGOAT_HOST:127.0.0.1}:${WEBGOAT_HSQLPORT:9001}/webgoat
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.HSQLDialect
 spring.jpa.hibernate.ddl-auto=update
 spring.messages.basename=i18n/messages