diff --git a/developer/pom.xml b/developer/pom.xml
index b0ae356625c..dba7b383d69 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -179,8 +179,8 @@
               </arguments>
               <systemProperties>
                 <systemProperty>
-                  <key>CATALINA_HOME</key>
-                  <value>${project.parent.basedir}/utils/</value>
+                  <key>catalina.home</key>
+                  <value>${project.parent.basedir}/utils</value>
                 </systemProperty>
               </systemProperties>
             </configuration>
@@ -287,6 +287,12 @@
                 <argument>--rootpassword=${db.root.password}</argument>
                 <!-- enable verbosity by -v or dash-dash-verbose -->
               </arguments>
+              <systemProperties>
+                <systemProperty>
+                  <key>catalina.home</key>
+                  <value>${project.parent.basedir}/utils</value>
+                </systemProperty>
+              </systemProperties>
             </configuration>
           </plugin>
         </plugins>
diff --git a/utils/src/com/cloud/utils/PropertiesUtil.java b/utils/src/com/cloud/utils/PropertiesUtil.java
index 90f8af8b33f..e256fce9440 100755
--- a/utils/src/com/cloud/utils/PropertiesUtil.java
+++ b/utils/src/com/cloud/utils/PropertiesUtil.java
@@ -70,14 +70,14 @@ public class PropertiesUtil {
         if (file.exists()) {
             return file;
         }
-        
-        newPath = System.getenv("CATALINA_HOME");
+
+        newPath = System.getProperty("catalina.home");
         if (newPath == null) {
-        	newPath = System.getenv("CATALINA_BASE");
+            newPath = System.getenv("CATALINA_HOME");
         }
         
         if (newPath == null) {
-        	newPath = System.getProperty("catalina.home");
+            newPath = System.getenv("CATALINA_BASE");
         }
         
         if (newPath == null) {