diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
index 46ae7212..7d0730cf 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
@@ -1,19 +1,8 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::      Dev environment startup script for Alfresco Community     ::
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-@echo off
+@ECHO OFF
 
-set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\@@springloaded.version@@\springloaded-@@springloaded.version@@.jar
-
-if not exist %springloadedfile% (
-  mvn validate -Psetup
+IF "%MAVEN_OPTS%" == "" (
+    ECHO The environment variable 'MAVEN_OPTS' is not set, setting it for you
+    SET MAVEN_OPTS=-Xms256m -Xmx2G -XX:PermSize=300m
 )
-
-:: Use these settings if you're using JDK7
-:: set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G -XX:PermSize=300m
-
-:: Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart
-:: set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G
-set MAVEN_OPTS=-noverify -Xms256m -Xmx2G
-
-mvn clean install -Prun -nsu
+ECHO MAVEN_OPTS is set to '%MAVEN_OPTS%'
+mvn clean install -Prun
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
index a1208196..0b286573 100755
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh
@@ -1,15 +1,7 @@
 #!/bin/bash
-# Downloads the spring-loaded lib if not existing and runs the full all-in-one
-# (Alfresco + Share + Solr) using the runner project
-springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloaded.version@@/springloaded-@@springloaded.version@@.jar
-
-if [ ! -f $springloadedfile ]; then
-mvn validate -Psetup
+if [[ -z ${MAVEN_OPTS} ]]; then
+    echo "The environment variable 'MAVEN_OPTS' is not set, setting it for you";
+    MAVEN_OPTS="-Xms256m -Xmx1524m -XX:PermSize=300m"
 fi
-
-# Use these settings if you're using JDK7
-# MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn install -Prun
-
-# Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart
-#MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn clean install -Prun
-MAVEN_OPTS="-noverify -Xms256m -Xmx2G" mvn clean install -Prun
\ No newline at end of file
+echo "MAVEN_OPTS is set to '$MAVEN_OPTS'";
+mvn clean install -Prun
\ No newline at end of file
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat
index 12e2ab44..03523c16 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat
@@ -1,24 +1,8 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::      Dev environment startup script for Alfresco Community.    ::
-::                                                                ::
-::      Downloads the spring-loaded lib if not existing and       ::
-::      runs the Repo AMP applied to Alfresco WAR.                ::
-::      Note. the Share WAR is not deployed.                      ::
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-@echo off
+@ECHO OFF
 
-set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\@@springloaded.version@@\springloaded-@@springloaded.version@@.jar
-
-if not exist %springloadedfile% (
-  mvn validate -Psetup
+IF "%MAVEN_OPTS%" == "" (
+    ECHO The environment variable 'MAVEN_OPTS' is not set, setting it for you
+    SET MAVEN_OPTS=-Xms256m -Xmx2G -XX:PermSize=300m
 )
-
-:: Use these settings if you're using JDK7
-:: set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G -XX:PermSize=300m
-
-:: Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart
-::set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify -Xms256m -Xmx2G
-set MAVEN_OPTS=-noverify -Xms256m -Xmx2G
-
-mvn integration-test -Pamp-to-war -nsu
-
+ECHO MAVEN_OPTS is set to '%MAVEN_OPTS%'
+mvn clean install -Pamp-to-war
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh
index c6af523a..1df845e3 100755
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.sh
@@ -1,16 +1,7 @@
 #!/bin/bash
-# Downloads the spring-loaded lib if not existing and      
-# runs the Repo AMP applied to Alfresco WAR.           
-# Note. the Share WAR is not deployed.              
-springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloaded.version@@/springloaded-@@springloaded.version@@.jar
-
-if [ ! -f $springloadedfile ]; then
-mvn validate -Psetup
+if [[ -z ${MAVEN_OPTS} ]]; then
+    echo "The environment variable 'MAVEN_OPTS' is not set, setting it for you";
+    MAVEN_OPTS="-Xms256m -Xmx1524m -XX:PermSize=300m"
 fi
-
-# Use these settings if you're using JDK7
-# MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn install -Prun
-
-# Spring loaded does not work very well with 5.1 at the moment, breaks the H2 db after first run and then restart
-#MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G" mvn integration-test -Pamp-to-war
-MAVEN_OPTS="-noverify -Xms256m -Xmx2G" mvn integration-test -Pamp-to-war
\ No newline at end of file
+echo "MAVEN_OPTS is set to '$MAVEN_OPTS'";
+mvn clean install -Pamp-to-war
\ No newline at end of file
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat
index fddf454f..4aea3869 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat
@@ -1,20 +1,17 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-::      Dev environment startup script for Alfresco Community.    ::
-::                                                                ::
-::      Downloads the spring-loaded lib if not existing and       ::
-::      runs the Share AMP applied to Share WAR.                  ::
-::      Note. requires Alfresco.war to be running in another      ::
-::      Tomcat on port 8080.                                      ::
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-@echo off
+@ECHO OFF
 
-set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\@@springloaded.version@@\springloaded-@@springloaded.version@@.jar
+IF "%MAVEN_OPTS%" == "" (
+    ECHO The environment variable 'MAVEN_OPTS' is not set, setting it for you
 
-if not exist %springloadedfile% (
-  mvn validate -Psetup
+    SET springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\1.2.5.RELEASE\springloaded-1.2.5.RELEASE.jar
+
+    if not exist %springloadedfile% (
+      mvn validate -Psetup
+    )
+
+    # Spring loaded can be used with the Share AMP project in 5.1
+    # (i.e. it does not have the same problem as Repo AMP and AIO)
+    SET MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify
 )
-
-:: Spring loaded can be used with the Share AMP project
-set MAVEN_OPTS=-javaagent:"%springloadedfile%" -noverify
-
-mvn integration-test -Pamp-to-war -nsu
+ECHO MAVEN_OPTS is set to '%MAVEN_OPTS%'
+mvn clean install -Pamp-to-war
\ No newline at end of file
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh
index 8810f45f..1ea1f8af 100755
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.sh
@@ -1,11 +1,19 @@
 #!/bin/bash
-# Downloads the spring-loaded lib if not existing and runs the Share AMP applied to Share WAR
-# Note. requires Alfresco.war to be running in another Tomcat on port 8080
-springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloaded.version@@/springloaded-@@springloaded.version@@.jar
+# Note. This script requires Alfresco.war to be running in another Tomcat on port 8080
 
-if [ ! -f $springloadedfile ]; then
-mvn validate -Psetup
+if [[ -z ${MAVEN_OPTS} ]]; then
+    echo "The environment variable 'MAVEN_OPTS' is not set, setting it for you";
+
+    # Downloads the spring-loaded lib if not existing and runs the Share AMP applied to Share WAR
+    springloadedfile=~/.m2/repository/org/springframework/springloaded/@@springloaded.version@@/springloaded-@@springloaded.version@@.jar
+
+    if [ ! -f $springloadedfile ]; then
+        mvn validate -Psetup
+    fi
+
+    # Spring loaded can be used with the Share AMP project in 5.1
+    # (i.e. it does not have the same problem as Repo AMP and AIO)
+    MAVEN_OPTS="-javaagent:$springloadedfile -noverify"
 fi
-
-# Spring loaded can be used with the Share AMP project
-MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war
+echo "MAVEN_OPTS is set to '$MAVEN_OPTS'";
+mvn clean install -Pamp-to-war
\ No newline at end of file