diff --git a/pom.xml b/pom.xml
index d1c3524..77be41e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,11 +8,14 @@
 	<version>1.0.0-BUILD-SNAPSHOT</version>
 	<properties>
 		<java-version>1.6</java-version>
-		<org.springframework-version>3.2.3.RELEASE</org.springframework-version>
+		<org.springframework-version>4.3.23.RELEASE</org.springframework-version>
 		<org.aspectj-version>1.6.9</org.aspectj-version>
 		<org.slf4j-version>1.5.10</org.slf4j-version>
 		<spring.security.version>3.1.4.RELEASE</spring.security.version>
-		<mitreid-connect-version>1.1.12</mitreid-connect-version>
+		<mitreid-connect-version>1.1.19</mitreid-connect-version>
+		<webapp.home>${basedir}</webapp.home>
+		<debug.suspend>n</debug.suspend>
+		<webapp.jvmargs></webapp.jvmargs>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -31,7 +34,7 @@
 				<exclusion>
 					<groupId>commons-logging</groupId>
 					<artifactId>commons-logging</artifactId>
-				 </exclusion>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -39,14 +42,14 @@
 			<artifactId>spring-webmvc</artifactId>
 			<version>${org.springframework-version}</version>
 		</dependency>
-				
+
 		<!-- AspectJ -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
 			<version>${org.aspectj-version}</version>
-		</dependency>	
-		
+		</dependency>
+
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -96,7 +99,7 @@
 			<artifactId>javax.inject</artifactId>
 			<version>1</version>
 		</dependency>
-				
+
 		<!-- Servlet -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -115,7 +118,7 @@
 			<artifactId>jstl</artifactId>
 			<version>1.2</version>
 		</dependency>
-	
+
 		<!-- Test -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -123,17 +126,17 @@
 			<version>4.7</version>
 			<scope>test</scope>
 		</dependency>
-	        <dependency>
-        	    <groupId>org.springframework.security</groupId>
-	            <artifactId>spring-security-taglibs</artifactId>
-        	    <version>${spring.security.version}</version>
-	            <exclusions>
-        	    	<exclusion>
-            			<groupId>org.springframework</groupId>
-	            		<artifactId>*</artifactId>
-        	    	</exclusion>
-	            </exclusions>
-        	</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-taglibs</artifactId>
+			<version>${spring.security.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>*</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -185,25 +188,38 @@
 				</configuration>
 			</plugin>
 			<plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.3.6.v20151106</version>
-                <configuration>
-                	<jettyXml>${project.basedir}/etc/jetty/jetty.xml,${project.basedir}/etc/jetty/jetty-ssl.xml,${project.basedir}/etc/jetty/jetty-https.xml</jettyXml>
-                    <webApp>
-					     <contextPath>/simple-web-app</contextPath>
-					</webApp>	
-                    <systemProperties>
-                        <systemProperty>
-                            <name>org.eclipse.jetty.annotations.maxWait</name>
-                            <value>240</value>
-                        </systemProperty>
-                    </systemProperties>
-                    <!-- Works with remote debugging and mvn jetty:run-forked -->
-                    <jvmArgs>-Xdebug -Xrunjdwp:transport=dt_socket,address=5001,server=y,suspend=n</jvmArgs>
-                </configuration>
-            </plugin>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-maven-plugin</artifactId>
+				<version>9.3.6.v20151106</version>
+				<configuration>
+					<jettyXml>${project.basedir}/etc/jetty/jetty.xml,${project.basedir}/etc/jetty/jetty-ssl.xml,${project.basedir}/etc/jetty/jetty-https.xml</jettyXml>
+					<webApp>
+						<contextPath>/simple-web-app</contextPath>
+					</webApp>
+					<systemProperties>
+						<systemProperty>
+							<name>org.eclipse.jetty.annotations.maxWait</name>
+							<value>240</value>
+						</systemProperty>
+					</systemProperties>
+					<!-- Works with remote debugging and mvn jetty:run-forked -->
+					<jvmArgs>${webapp.jvmArgs} -Xdebug -Xrunjdwp:transport=dt_socket,address=5001,server=y,suspend=${debug.suspend} -Dwebapp.home=${webapp.home}</jvmArgs>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<name>simple-web-app</name>
+	<profiles>
+		<profile>
+			<id>windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<properties>
+				<webapp.home>/${basedir}</webapp.home>
+			</properties>
+		</profile>
+	</profiles>
 </project>
diff --git a/src/main/webapp/WEB-INF/servlet.properties b/src/main/webapp/WEB-INF/servlet.properties
index 0f1360f..d1ec1ee 100644
--- a/src/main/webapp/WEB-INF/servlet.properties
+++ b/src/main/webapp/WEB-INF/servlet.properties
@@ -1,3 +1,5 @@
+host=mmoayyed.unicon.net
+
 # server.url=https://mmoayyed.unicon.net:8443/idp/
 # server.authz.url=${server.url}profile/oidc/authorize
 # server.token.url=${server.url}profile/oidc/token
@@ -5,7 +7,7 @@
 # server.jwks.url=${server.url}profile/oidc/jwk
 # server.registration.url=${server.url}profile/oidc/register
 
-server.url=https://mmoayyed.unicon.net:8443/cas/oidc/
+server.url=https://${host}:8443/cas/oidc/
 # server.url=http://localhost:8080/openid-connect-server-webapp/
 
 # Only applies to static/hybrid server config
@@ -24,4 +26,7 @@ serverConfigurationService=staticServerConfigurationService
 # clientConfigurationService=dynamicClientConfigurationService
 clientConfigurationService=staticClientConfigurationService
 authRequestOptionsService=staticAuthRequestOptionsService
-authRequestUrlBuilder=plainAuthRequestUrlBuilder
\ No newline at end of file
+authRequestUrlBuilder=plainAuthRequestUrlBuilder
+
+webapp.url=https://${host}:9443/simple-web-app/
+webapp.login.url=${webapp.url}openid_connect_login
diff --git a/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
index 91f86d9..8832b47 100644
--- a/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
+++ b/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
@@ -29,13 +29,24 @@
     <mvc:resources mapping="/resources/**" location="/resources/" />
 
     <!--Add placeholder properties-->
-    <bean
-            class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="properties" ref="properties" />
+    <bean id="placeholderConfigurer" class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer">
+        <property name="propertiesArray">
+            <array>
+                <bean class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+                    <property name="location" value="WEB-INF/servlet.properties" />
+                </bean>
+                <bean class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+                    <property name="location" value="file://${webapp.home}/local-values.conf" />
+                    <property name="ignoreResourceNotFound" value="true" />
+                </bean>
+            </array>
+        </property>
     </bean>
 
-    <bean id="properties" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
-        <property name="location" value="WEB-INF/servlet.properties" />
+    <bean id="properties" class="org.springframework.core.env.PropertySourcesPropertyResolver">
+        <constructor-arg>
+            <bean factory-bean="placeholderConfigurer" factory-method="getAppliedPropertySources" />
+        </constructor-arg>
     </bean>
 
     <!-- Resolves views selected for rendering by @Controllers to .jsp resources
@@ -44,9 +55,6 @@
         class="org.springframework.web.servlet.view.InternalResourceViewResolver">
         <property name="prefix" value="/WEB-INF/views/" />
         <property name="suffix" value=".jsp" />
-        <property name="exposedContextBeanNames">
-            <list><value>properties</value></list>
-        </property>
     </bean>
 
     <context:component-scan base-package="org.mitre.web" />
@@ -239,12 +247,12 @@
                 <property name="tokenEndpointAuthMethod" value="SECRET_BASIC" />
                 <property name="redirectUris">
                     <set>
-                        <value>https://mmoayyed.unicon.net:9443/simple-web-app/openid_connect_login</value>
+                        <value>${webapp.login.url}</value>
                     </set>
                 </property>
                 <!-- for signed requests -->
                 <property name="requestObjectSigningAlg" value="RS256" />
-                <property name="jwksUri" value="https://mmoayyed.unicon.net:9443/simple-web-app/jwk" />
+                <property name="jwksUri" value="${webapp.url}jwk" />
             </bean>
         </property>
         <!--
@@ -285,7 +293,7 @@
                         <property name="tokenEndpointAuthMethod" value="SECRET_BASIC" />
                         <property name="redirectUris">
                             <set>
-                                <value>https://mmoayyed.unicon.net:9443/simple-web-app/openid_connect_login</value>
+                                <value>${webapp.login.url}</value>
                             </set>
                         </property>
                     </bean>
@@ -317,7 +325,7 @@
                         <property name="tokenEndpointAuthMethod" value="SECRET_BASIC" />
                         <property name="redirectUris">
                             <set>
-                                <value>https://mmoayyed.unicon.net:9443/simple-web-app/openid_connect_login</value>
+                                <value>${webapp.login.url}</value>
                             </set>
                         </property>
 
@@ -340,7 +348,7 @@
                 <property name="tokenEndpointAuthMethod" value="SECRET_BASIC" />
                 <property name="redirectUris">
                     <set>
-                        <value>https://mmoayyed.unicon.net:9443/simple-web-app/openid_connect_login</value>
+                        <value>${webapp.login.url}</value>
                     </set>
                 </property>
             </bean>
@@ -376,7 +384,7 @@
                 <entry key="prompt" value="none" />
                  -->
                 <entry key="acr_values" value="mfa-gauth,mfa-duo" />
-               
+
             </map>
         </property>
     </bean>
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
index 6145ff1..f6061a4 100644
--- a/src/main/webapp/WEB-INF/views/login.jsp
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -1,5 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
 <%@ taglib prefix="o" tagdir="/WEB-INF/tags"%>
 <o:header title="Login"/>
@@ -42,7 +43,7 @@
 
 <script type="text/javascript">
     $(document).ready(function () {
-        $('#identifier').val('${properties["server.url"]}');
+        $('#identifier').val('<spring:eval expression="@properties.getProperty('server.url')" />');
     });
 </script>
 <o:footer />