diff --git a/README.md b/README.md
index ad0eb2b..45c8eab 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ mvn jetty:run
 
 Then, browse to the following link to use the server:
 
-[http://localhost:8080/hapi-fhir-jpaserver/](http://localhost:8080/hapi-fhir-jpaserver/)
+[http://localhost:8080/](http://localhost:8080/)
 
 # Deploying to a Container
 
@@ -40,7 +40,7 @@ This will create a file called `hapi-fhir-jpaserver.war` in your `target` direct
 
 Again, browse to the following link to use the server (note that the port 8080 may not be correct depending on how your server is configured).
 
-[http://localhost:8080/hapi-fhir-jpaserver/](http://localhost:8080/hapi-fhir-jpaserver/)
+[http://localhost:8080/](http://localhost:8080/)
 
 # Customizing The Web Testpage UI
 
@@ -62,4 +62,4 @@ To configure the starter app to use MySQL, instead of the default Derby, update
 * datasource.url=jdbc:mysql://localhost:3306/hapi_dstu3
 * hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
 
-It is important to use MySQL5Dialect when using MySQL version 5+.
\ No newline at end of file
+It is important to use MySQL5Dialect when using MySQL version 5+.
diff --git a/pom.xml b/pom.xml
index 3bf5549..8a42a4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
                     <version>9.4.8.v20180619</version>
                     <configuration>
                         <webApp>
-                            <contextPath>/hapi-fhir-jpaserver</contextPath>
+                            <contextPath>/</contextPath>
                             <allowDuplicateFragmentNames>true</allowDuplicateFragmentNames>
                         </webApp>
                     </configuration>
diff --git a/src/main/resources/hapi.properties b/src/main/resources/hapi.properties
index 332825e..277618d 100644
--- a/src/main/resources/hapi.properties
+++ b/src/main/resources/hapi.properties
@@ -6,7 +6,7 @@ fhir_version=DSTU3
 # This is the address that the FHIR server will report as its own address.
 # If this server will be deployed (for example) to an internet accessible
 # server, put the DNS name of that server here.
-server_address=http://localhost/fhir/
+server_address=http://localhost:8080/fhir/
 
 # This is the context path for the FHIR endpoint. If this is changed, the
 # setting above should also be changed.
@@ -46,4 +46,4 @@ hibernate.cache.use_structured_entries=false
 hibernate.cache.use_minimal_puts=false
 hibernate.search.default.directory_provider=filesystem
 hibernate.search.default.indexBase=target/lucenefiles
-hibernate.search.lucene_version=LUCENE_CURRENT
\ No newline at end of file
+hibernate.search.lucene_version=LUCENE_CURRENT