diff --git a/home/src/main/resources/config/example.applicationSetup.n3 b/home/src/main/resources/config/default.applicationSetup.n3
similarity index 100%
rename from home/src/main/resources/config/example.applicationSetup.n3
rename to home/src/main/resources/config/default.applicationSetup.n3
diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/default.runtime.properties
similarity index 93%
rename from home/src/main/resources/config/example.runtime.properties
rename to home/src/main/resources/config/default.runtime.properties
index b0fb959e..f55ffa9f 100644
--- a/home/src/main/resources/config/example.runtime.properties
+++ b/home/src/main/resources/config/default.runtime.properties
@@ -19,27 +19,6 @@
 # BASIC PROPERTIES
 # -----------------------------------------------------------------------------
 
-  #
-  # This namespace will be used when generating URIs for objects created in the
-  # editor. In order to serve linked data, the default namespace must be composed
-  # as follows (optional elements in parentheses):
-  #
-  # scheme + server_name (+ port) (+ servlet_context) + "/individual/"
-  #
-  # For example, Cornell's default namespace is:
-  #
-  # http://vivo.cornell.edu/individual/
-  #
-Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
-
-  #
-  # The email address of the root user for the VIVO application. The password
-  # for this user is initially set to "rootPassword", but you will be asked to
-  # change the password the first time you log in.
-  #
-rootUser.emailAddress = vivo_root@mydomain.edu
-
-
 #
 # Argon2 password hashing parameters for time, memory and parallelism required to
 # compute a hash.
@@ -79,13 +58,12 @@ email.replyTo = vivoAdmin@mydomain.edu
   #
   # URL of Solr context used in local VIVO search. This will usually consist of:
   #     scheme + server_name + port + vivo_webapp_name + "solr"
-  # In the standard installation, the Solr context will be on the same server as VIVO,
-  # and in the same Tomcat instance. The path will be the VIVO webapp.name (specified
-  # in build.properties) + "solr"
+  # In the standard installation, the Solr context will be on the same server as VIVO
+  # as a standalone service.
   #   Example:
-  #     vitro.local.solr.url = http://localhost:8080/vivosolr
+  #     vitro.local.solr.url = http://localhost:8983/solr/vivocore
   #
-vitro.local.solr.url = http://localhost:8080/vivosolr
+vitro.local.solr.url = http://localhost:8983/solr/vivocore
 
 
 # -----------------------------------------------------------------------------
diff --git a/installer/example-settings.xml b/installer/example-settings.xml
deleted file mode 100644
index 0007c79c..00000000
--- a/installer/example-settings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd">
-
-    <profiles>
-        <profile>
-            <id>defaults</id>
-            <properties>
-                <app-name>vivo</app-name>
-
-                <vivo-dir>/usr/local/vivo/home</vivo-dir>
-                <tomcat-dir>/usr/local/tomcat</tomcat-dir>
-
-                <default-theme>wilma</default-theme>
-            </properties>
-        </profile>
-    </profiles>
-
-    <activeProfiles>
-        <activeProfile>defaults</activeProfile>
-    </activeProfiles>
-</settings>
diff --git a/installer/home/pom.xml b/installer/home/pom.xml
index b0a9deee..19ffe5e5 100644
--- a/installer/home/pom.xml
+++ b/installer/home/pom.xml
@@ -23,80 +23,24 @@
         <default-theme>wilma</default-theme>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>install</id>
-            <activation>
-                <property><name>vivo-dir</name></property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/home.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>false</appendAssemblyId>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>remove-webapp</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <delete dir="${vivo-dir}/rdf" />
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>install</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>${vivo-dir}</outputDirectory>
-                                    <resources>
-                                        <resource>
-                                            <directory>${project.build.directory}/${project.build.finalName}</directory>
-                                        </resource>
-                                    </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-install-plugin</artifactId>
+                <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <skip>true</skip>
+                    <descriptors>
+                        <descriptor>src/main/assembly/home.xml</descriptor>
+                    </descriptors>
+                    <appendAssemblyId>false</appendAssemblyId>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/installer/home/src/main/assembly/home.xml b/installer/home/src/main/assembly/home.xml
index 6de97e21..34f447c0 100644
--- a/installer/home/src/main/assembly/home.xml
+++ b/installer/home/src/main/assembly/home.xml
@@ -4,6 +4,7 @@
     <id>home</id>
     <formats>
         <format>dir</format>
+        <format>tar</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
     <dependencySets>
diff --git a/installer/pom.xml b/installer/pom.xml
index ceb494bd..26535206 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -13,6 +13,7 @@
     <name>VIVO Installer</name>
 
     <properties>
+        <app-name>vivo</app-name>
         <vitro-version>${project.version}</vitro-version>
         <maven-site-plugin.skip>true</maven-site-plugin.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -28,12 +29,6 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
@@ -157,12 +152,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-resources-plugin</artifactId>
                         <version>2.6</version>
@@ -186,45 +175,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>default-war</id>
-                                <phase/>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>install</id>
-            <activation>
-                <property><name>vivo-dir</name></property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-enforcer-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>enforce-properties</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>enforce</goal>
-                                </goals>
-                                <configuration>
-                                    <rules>
-                                        <requireProperty>
-                                            <property>app-name</property>
-                                            <message>You must provide an application name (app-name)</message>
-                                        </requireProperty>
-                                    </rules>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml
index ca682a1d..49ea060b 100644
--- a/installer/webapp/pom.xml
+++ b/installer/webapp/pom.xml
@@ -19,116 +19,9 @@
 
     <name>VIVO Install Web App</name>
 
-    <profiles>
-        <profile>
-            <id>package</id>
-            <activation>
-                <property><name>app-name</name></property>
-            </activation>
-            <build>
-                <finalName>${app-name}</finalName>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <archive>
-                                <manifest>
-                                    <addClasspath>true</addClasspath>
-                                </manifest>
-                            </archive>
-                            <archiveClasses>false</archiveClasses>
-                            <overlays>
-                                <overlay>
-                                    <groupId>org.vivoweb</groupId>
-                                    <artifactId>vivo-webapp</artifactId>
-                                    <type>war</type>
-                                </overlay>
-                                <!-- Overlays for multilingual support -->
-                                <!-- overlay>
-                                    <groupId>org.vivoweb</groupId>
-                                    <artifactId>vitro-languages-webapp</artifactId>
-                                    <type>war</type>
-                                </overlay>
-                                <overlay>
-                                    <groupId>org.vivoweb</groupId>
-                                    <artifactId>vivo-languages-webapp</artifactId>
-                                    <type>war</type>
-                                </overlay -->
-                            </overlays>
-                            <webResources>
-                                <resource>
-                                    <directory>src/main/webResources</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </webResources>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>install</id>
-            <activation>
-                <property><name>tomcat-dir</name></property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>remove-webapp</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <delete dir="${tomcat-dir}/webapps/${project.build.finalName}" />
-                                    </target>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>install</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>${project.groupId}</groupId>
-                                            <artifactId>${project.artifactId}</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>war</type>
-                                            <overWrite>true</overWrite>
-                                            <outputDirectory>${tomcat-dir}/webapps/${project.build.finalName}</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
     <build>
+        <finalName>${app-name}</finalName>
         <plugins>
-            <plugin>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>
@@ -139,6 +32,75 @@
                     </filesets>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>include-home</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.vivoweb</groupId>
+                                    <artifactId>vivo-installer-home</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>tar</type>
+                                    <destFileName>vivo-home.tar</destFileName>
+                                    <outputDirectory>${project.build.directory}/home-files</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                    <archiveClasses>false</archiveClasses>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.vivoweb</groupId>
+                            <artifactId>vivo-webapp</artifactId>
+                            <type>war</type>
+                        </overlay>
+                        <!-- Overlays for multilingual support -->
+                        <!-- overlay>
+                            <groupId>org.vivoweb</groupId>
+                            <artifactId>vitro-languages-webapp</artifactId>
+                            <type>war</type>
+                        </overlay>
+                        <overlay>
+                            <groupId>org.vivoweb</groupId>
+                            <artifactId>vivo-languages-webapp</artifactId>
+                            <type>war</type>
+                        </overlay -->
+                    </overlays>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/webResources</directory>
+                            <filtering>true</filtering>
+                        </resource>
+                        <resource>
+                            <directory>${project.build.directory}/home-files/</directory>
+                            <targetPath>WEB-INF/resources/home-files/</targetPath>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/installer/webapp/src/main/webResources/META-INF/context.xml b/installer/webapp/src/main/webResources/META-INF/context.xml
index f4af100a..ea944913 100644
--- a/installer/webapp/src/main/webResources/META-INF/context.xml
+++ b/installer/webapp/src/main/webResources/META-INF/context.xml
@@ -1,9 +1,52 @@
 <Context> <!-- useHttpOnly="false" -->
+
+   <!--
+     # The 'home' property specifies the location of VIVO HOME.
+     # The system user used to run the VIVO web application must have write access
+     # to the parent directory of the directory defined in this property, if VIVO HOME
+     # does not already exist.
+     # If this directory already exists, the system user used to run the VIVO web application
+     # must have write access to this directory.
+   -->
    <Environment
         type="java.lang.String" 
         name="vitro/home"
         value="${vivo-dir}" override="true"/>
 
+   <!--
+     # The name of the application (possibly not used).
+   -->
+   <Environment
+           type="java.lang.String"
+           name="vitro/appName"
+           value="${app-name}" override="true"/>
+
+   <!--
+     # The email address of the root user for the VIVO application. The password
+     # for this user is initially set to "rootPassword", but you will be asked to
+     # change the password the first time you log in.
+   -->
+   <Environment
+           type="java.lang.String"
+           name="vitro/rootUserAddress"
+           value="vivo_root@mydomain.edu" override="true"/>
+
+   <!--
+     # This namespace will be used when generating URIs for objects created in the
+     # editor. In order to serve linked data, the default namespace must be composed
+     # as follows (optional elements in parentheses):
+     #
+     # scheme + server_name (+ port) (+ servlet_context) + "/individual/"
+     #
+     # For example, Cornell's default namespace is:
+     #
+     # http://vivo.cornell.edu/individual/
+   -->
+   <Environment
+           type="java.lang.String"
+           name="vitro/defaultNamespace"
+           value="http://vivo.mydomain.edu/individual/" override="true"/>
+
    <!-- Disable persist sessions on shut down.-->
    <Manager pathname="" />
 </Context>
diff --git a/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
index 7bd470d5..17c0c8ff 100644
--- a/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
+++ b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
@@ -24,7 +24,7 @@
 # debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion.
 
 log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender
-log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}.all.log
+log4j.appender.AllAppender.File= ${catalina.base}/logs/vivo.all.log
 log4j.appender.AllAppender.MaxFileSize=10MB
 log4j.appender.AllAppender.MaxBackupIndex=10
 log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout
diff --git a/pom.xml b/pom.xml
index 63dc7825..050bf25e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
     </scm>
 
     <properties>
+        <app-name>vivo</app-name>
         <vitro-version>${project.version}</vitro-version>
         <vivo-dir>${basedir}</vivo-dir>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>