diff --git a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java
index fc05e3b38f..25cbb9bc9b 100644
--- a/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java
+++ b/cas/cas-secured-app/src/main/java/com/baeldung/cassecuredapp/CasSecuredAppApplication.java
@@ -40,14 +40,14 @@ public class CasSecuredAppApplication {
 	@Primary
 	public AuthenticationEntryPoint authenticationEntryPoint(ServiceProperties sP) {
 	  CasAuthenticationEntryPoint entryPoint = new CasAuthenticationEntryPoint();
-	  entryPoint.setLoginUrl("https://localhost:8443/cas/login");
+	  entryPoint.setLoginUrl("https://localhost:6443/cas/login");
 	  entryPoint.setServiceProperties(sP);
 	  return entryPoint;
 	}
 
 	@Bean
 	public TicketValidator ticketValidator() {
-	  return new Cas30ServiceTicketValidator("https://localhost:8443/cas");
+	  return new Cas30ServiceTicketValidator("https://localhost:6443/cas");
 	}
 
 	@Bean
@@ -71,7 +71,7 @@ public class CasSecuredAppApplication {
 	@Bean
 	public LogoutFilter logoutFilter() {
 	  LogoutFilter logoutFilter = new LogoutFilter(
-	    "https://localhost:8443/cas/logout", securityContextLogoutHandler());
+	    "https://localhost:6443/cas/logout", securityContextLogoutHandler());
 	  logoutFilter.setFilterProcessesUrl("/logout/cas");
 	  return logoutFilter;
 	}
@@ -79,7 +79,7 @@ public class CasSecuredAppApplication {
 	@Bean
 	public SingleSignOutFilter singleSignOutFilter() {
 	  SingleSignOutFilter singleSignOutFilter = new SingleSignOutFilter();
-	  singleSignOutFilter.setCasServerUrlPrefix("https://localhost:8443/cas");
+	  singleSignOutFilter.setCasServerUrlPrefix("https://localhost:6443/cas");
 	  singleSignOutFilter.setIgnoreInitConfiguration(true);
 	  return singleSignOutFilter;
 	}
diff --git a/cas/cas-server/etc/cas/thekeystore b/cas/cas-server/etc/cas/thekeystore
deleted file mode 100644
index 15f9af2dae..0000000000
Binary files a/cas/cas-server/etc/cas/thekeystore and /dev/null differ
diff --git a/cas/cas-server/etc/cas/thekeystore.crt b/cas/cas-server/etc/cas/thekeystore.crt
deleted file mode 100644
index 5c7543f0c6..0000000000
Binary files a/cas/cas-server/etc/cas/thekeystore.crt and /dev/null differ
diff --git a/cas/cas-server/src/main/resources/application.properties b/cas/cas-server/src/main/resources/application.properties
index 2d5e9a7277..afacd4cbc1 100644
--- a/cas/cas-server/src/main/resources/application.properties
+++ b/cas/cas-server/src/main/resources/application.properties
@@ -2,9 +2,9 @@
 # CAS Server Context Configuration
 #
 server.context-path=/cas
-server.port=8443
+server.port=6443
 
-server.ssl.key-store=file:/etc/cas/thekeystore
+server.ssl.key-store=classpath:/etc/cas/thekeystore
 server.ssl.key-store-password=changeit
 server.ssl.key-password=changeit
 # server.ssl.ciphers=
@@ -40,6 +40,12 @@ spring.http.encoding.charset=UTF-8
 spring.http.encoding.enabled=true
 spring.http.encoding.force=true
 
+##
+#CAS CONFIG LOCATION
+#
+cas.standalone.config=classpath:/etc/cas/config
+
+
 ##
 # CAS Cloud Bus Configuration
 #
@@ -82,6 +88,7 @@ spring.thymeleaf.mode=HTML
 # CAS Log4j Configuration
 #
 # logging.config=file:/etc/cas/log4j2.xml
+
 server.context-parameters.isLog4jAutoInitializationDisabled=true
 
 ##
@@ -104,9 +111,10 @@ cas.authn.jdbc.query[0].dialect=org.hibernate.dialect.MySQLDialect
 cas.authn.jdbc.query[0].user=root
 cas.authn.jdbc.query[0].password=
 cas.authn.jdbc.query[0].ddlAuto=none
-cas.authn.jdbc.query[0].driverClass=com.mysql.jdbc.Driver
+#cas.authn.jdbc.query[0].driverClass=com.mysql.jdbc.Driver
+cas.authn.jdbc.query[0].driverClass=com.mysql.cj.jdbc.Driver
 cas.authn.jdbc.query[0].fieldPassword=password
-cas.authn.jdbc.query[0].passwordEncoder.type=BCRYPT
+cas.authn.jdbc.query[0].passwordEncoder.type=NONE
 
 
 ##
diff --git a/cas/cas-server/src/main/resources/cas.properties b/cas/cas-server/src/main/resources/cas.properties
index be2babcd14..f80f22fc11 100644
--- a/cas/cas-server/src/main/resources/cas.properties
+++ b/cas/cas-server/src/main/resources/cas.properties
@@ -1,16 +1,15 @@
-cas.server.name: https://localhost:8443
-cas.server.prefix: https://localhost:8443/cas
+cas.server.name: https://localhost:6443
+cas.server.prefix: https://localhost:643/cas
 
 cas.adminPagesSecurity.ip=127\.0\.0\.1
 
-logging.config: file:/etc/cas/config/log4j2.xml
-
 cas.serviceRegistry.initFromJson=true
 cas.serviceRegistry.config.location=classpath:/services
 
 cas.authn.accept.users=
 cas.authn.accept.name=
 
+
 #CAS Database Authentication Property
 
 # cas.authn.jdbc.query[0].healthQuery=
diff --git a/cas/cas-server/src/main/resources/etc/cas/config/application.yml b/cas/cas-server/src/main/resources/etc/cas/config/application.yml
new file mode 100644
index 0000000000..be1f7c3edd
--- /dev/null
+++ b/cas/cas-server/src/main/resources/etc/cas/config/application.yml
@@ -0,0 +1,2 @@
+info:
+  description: CAS Configuration
\ No newline at end of file
diff --git a/cas/cas-server/src/main/resources/etc/cas/config/cas.properties b/cas/cas-server/src/main/resources/etc/cas/config/cas.properties
new file mode 100644
index 0000000000..47a1477308
--- /dev/null
+++ b/cas/cas-server/src/main/resources/etc/cas/config/cas.properties
@@ -0,0 +1,7 @@
+cas.server.name: https://cas.example.org:8443
+cas.server.prefix: https://cas.example.org:8443/cas
+
+cas.adminPagesSecurity.ip=127\.0\.0\.1
+
+logging.config: file:/etc/cas/config/log4j2.xml
+# cas.serviceRegistry.config.location: classpath:/services
diff --git a/cas/cas-server/src/main/resources/etc/cas/config/log4j2.xml b/cas/cas-server/src/main/resources/etc/cas/config/log4j2.xml
new file mode 100644
index 0000000000..53b30b4228
--- /dev/null
+++ b/cas/cas-server/src/main/resources/etc/cas/config/log4j2.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Specify the refresh internal in seconds. -->
+<Configuration monitorInterval="5" packages="org.apereo.cas.logging">
+    <Properties>
+        <!-- 
+        Default log directory is the current directory but that can be overridden with -Dcas.log.dir=<logdir>
+        Or you can change this property to a new default
+        -->
+        <Property name="cas.log.dir" >.</Property>
+        <!-- To see more CAS specific logging, adjust this property to info or debug or run server with -Dcas.log.leve=debug -->
+        <Property name="cas.log.level" >warn</Property>
+    </Properties>
+    <Appenders>
+        <Console name="console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d %p [%c] - &lt;%m&gt;%n"/>
+        </Console>
+        <RollingFile name="file" fileName="${sys:cas.log.dir}/cas.log" append="true"
+                     filePattern="${sys:cas.log.dir}/cas-%d{yyyy-MM-dd-HH}-%i.log">
+            <PatternLayout pattern="%d %p [%c] - &lt;%m&gt;%n"/>
+            <Policies>
+                <OnStartupTriggeringPolicy />
+                <SizeBasedTriggeringPolicy size="10 MB"/>
+                <TimeBasedTriggeringPolicy />
+            </Policies>
+        </RollingFile>
+        <RollingFile name="auditlogfile" fileName="${sys:cas.log.dir}/cas_audit.log" append="true"
+                     filePattern="${sys:cas.log.dir}/cas_audit-%d{yyyy-MM-dd-HH}-%i.log">
+            <PatternLayout pattern="%d %p [%c] - %m%n"/>
+            <Policies>
+                <OnStartupTriggeringPolicy />
+                <SizeBasedTriggeringPolicy size="10 MB"/>
+                <TimeBasedTriggeringPolicy />
+            </Policies>
+        </RollingFile>
+
+        <RollingFile name="perfFileAppender" fileName="${sys:cas.log.dir}/perfStats.log" append="true"
+                     filePattern="${sys:cas.log.dir}/perfStats-%d{yyyy-MM-dd-HH}-%i.log">
+            <PatternLayout pattern="%m%n"/>
+            <Policies>
+                <OnStartupTriggeringPolicy />
+                <SizeBasedTriggeringPolicy size="10 MB"/>
+                <TimeBasedTriggeringPolicy />
+            </Policies>
+        </RollingFile>
+
+        <CasAppender name="casAudit">
+            <AppenderRef ref="auditlogfile" />
+        </CasAppender>
+        <CasAppender name="casFile">
+            <AppenderRef ref="file" />
+        </CasAppender>
+        <CasAppender name="casConsole">
+            <AppenderRef ref="console" />
+        </CasAppender>
+        <CasAppender name="casPerf">
+            <AppenderRef ref="perfFileAppender" />
+        </CasAppender>
+    </Appenders>
+    <Loggers>
+        <!-- If adding a Logger with level set higher than warn, make category as selective as possible -->
+        <!-- Loggers inherit appenders from Root Logger unless additivity is false -->
+        <AsyncLogger name="org.apereo" level="${sys:cas.log.level}" includeLocation="true"/>
+        <AsyncLogger name="org.apereo.services.persondir" level="${sys:cas.log.level}" includeLocation="true"/>
+        <AsyncLogger name="org.apereo.cas.web.flow" level="info" includeLocation="true"/>
+        <AsyncLogger name="org.apache" level="warn" />
+        <AsyncLogger name="org.apache.http" level="error" />
+        <AsyncLogger name="org.springframework" level="warn" />
+        <AsyncLogger name="org.springframework.cloud.server" level="warn" />
+        <AsyncLogger name="org.springframework.cloud.client" level="warn" />
+        <AsyncLogger name="org.springframework.cloud.bus" level="warn" />
+        <AsyncLogger name="org.springframework.aop" level="warn" />
+        <AsyncLogger name="org.springframework.boot" level="warn" />
+        <AsyncLogger name="org.springframework.boot.actuate.autoconfigure" level="warn" />
+        <AsyncLogger name="org.springframework.webflow" level="warn" />
+        <AsyncLogger name="org.springframework.session" level="warn" />
+        <AsyncLogger name="org.springframework.amqp" level="error" />
+        <AsyncLogger name="org.springframework.integration" level="warn" />
+        <AsyncLogger name="org.springframework.messaging" level="warn" />
+        <AsyncLogger name="org.springframework.web" level="warn" />
+        <AsyncLogger name="org.springframework.orm.jpa" level="warn" />
+        <AsyncLogger name="org.springframework.scheduling" level="warn" />
+        <AsyncLogger name="org.springframework.context.annotation" level="error" />
+        <AsyncLogger name="org.springframework.boot.devtools" level="error" />
+        <AsyncLogger name="org.springframework.web.socket" level="warn" />
+        <AsyncLogger name="org.thymeleaf" level="warn" />
+        <AsyncLogger name="org.pac4j" level="warn" />
+        <AsyncLogger name="org.opensaml" level="warn"/>
+        <AsyncLogger name="net.sf.ehcache" level="warn" />
+        <AsyncLogger name="com.couchbase" level="warn" includeLocation="true"/>
+        <AsyncLogger name="com.ryantenney.metrics" level="warn" />
+        <AsyncLogger name="net.jradius" level="warn" />
+        <AsyncLogger name="org.openid4java" level="warn" />
+        <AsyncLogger name="org.ldaptive" level="warn" />
+        <AsyncLogger name="com.hazelcast" level="warn" />
+        <AsyncLogger name="org.jasig.spring" level="warn" />
+
+        <!-- Log perf stats only to perfStats.log -->
+        <AsyncLogger name="perfStatsLogger" level="info" additivity="false" includeLocation="true">
+            <AppenderRef ref="casPerf"/>
+        </AsyncLogger>
+
+        <!-- Log audit to all root appenders, and also to audit log (additivity is not false) -->
+        <AsyncLogger name="org.apereo.inspektr.audit.support" level="info" includeLocation="true" >
+            <AppenderRef ref="casAudit"/>
+        </AsyncLogger>
+
+        <!-- All Loggers inherit appenders specified here, unless additivity="false" on the Logger -->
+        <AsyncRoot level="warn">
+            <AppenderRef ref="casFile"/>
+            <!-- 
+                 For deployment to an application server running as service, 
+                 delete the casConsole appender below
+            -->
+            <AppenderRef ref="casConsole"/>
+        </AsyncRoot>
+    </Loggers>
+</Configuration>
diff --git a/cas/cas-server/src/main/resources/etc/cas/thekeystore b/cas/cas-server/src/main/resources/etc/cas/thekeystore
new file mode 100644
index 0000000000..86170dff16
Binary files /dev/null and b/cas/cas-server/src/main/resources/etc/cas/thekeystore differ
diff --git a/cas/cas-server/src/main/resources/etc/cas/thekeystore.crt b/cas/cas-server/src/main/resources/etc/cas/thekeystore.crt
new file mode 100644
index 0000000000..5bd9d5baba
Binary files /dev/null and b/cas/cas-server/src/main/resources/etc/cas/thekeystore.crt differ