diff --git a/gradle/tasks/tomcat.gradle b/gradle/tasks/tomcat.gradle
index e341123e94..86c495ed56 100644
--- a/gradle/tasks/tomcat.gradle
+++ b/gradle/tasks/tomcat.gradle
@@ -37,6 +37,7 @@ task tomcatInstall() {
     group 'Tomcat'
     description 'Downloads the Apache Tomcat servlet container and performs the necessary configuration steps'
     dependsOn ':portalProperties'
+    finalizedBy 'tomcatConfig'
 
     doLast {
         String serverHome = rootProject.ext['buildProperties'].getProperty('server.home')
@@ -69,6 +70,16 @@ task tomcatInstall() {
             from "${tomcatTmpDir}/apache-tomcat-${tomcatVersion}"
             into serverHome
         }
+    }
+}
+
+task tomcatConfig() {
+    group 'Tomcat'
+    description 'Configures Tomcat servlet container, used to update an existing Tomcat install'
+    dependsOn ':portalProperties'
+
+    doLast {
+        String serverHome = rootProject.ext['buildProperties'].getProperty('server.home')
 
         //  Configure our settings by overlaying etc/tomcat
         copy {