diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml
index 9c6b5971..59a007fb 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml
@@ -41,7 +41,7 @@
 	<parent>
 		<groupId>com.sourcesense.alfresco</groupId>
 		<artifactId>maven-alfresco-archetypes</artifactId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<build>
 		<extensions>
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index 3a0ef240..c3655411 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,12 @@
 	remove the filtering and maintaining versions (pom and module.properties) aligned manually
 	 -->
 	<version>${version}</version>
-	<description>Test AMP project</description>
+	<description>Test AMP project</description>
+	<parent>
+		<groupId>com.sourcesense.alfresco</groupId>
+		<artifactId>maven-alfresco-archetypes-base</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
 	<properties>
 		<!--Default for which src/main/properties/<env>/application.properties is loaded. NB: 
 			used only for the 'test' profile (e.g. '-P test' on the mvn commandline)
@@ -200,7 +205,7 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-war-plugin</artifactId>
 						<executions>
-							<!-- Runs jetty when 'integration-test' phase is called -->
+							<!-- Runs war packaging when 'integration-test' phase is called -->
 							<execution>
 								<id>it</id>
 								<phase>package</phase>
diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml
index 96e075f5..d5d90ae5 100644
--- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml
@@ -28,7 +28,7 @@
 	<parent>
 		<groupId>com.sourcesense.alfresco</groupId>
 		<artifactId>maven-alfresco-archetypes</artifactId>
-		<version>1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<description>
 		This archetype developed aims to provide a standardized approach to development, release and deployment of Alfresco extensions (as opposed to
diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-m2.txt b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-m2.txt
index 5e151479..844c169f 100644
--- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-m2.txt
+++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/README-m2.txt
@@ -65,7 +65,7 @@ Lifecycle HOWTO - Usage
 
 --- Fast one shot build and embedded jetty run-war|run-exploded  [and restore bootstrap] [and customize webappName] [and integrate LDAP]:
 
-' MAVEN_OPTS="-Xms256m -Xmx512m -XX:PermSize=128m mvn jetty:run-war|jetty:run-exploded [-Denv=yourEnv] [-DrestoreVersion=versionToRestore] [-DwebappName=yourCustomWebappName] [-Denterprise] ' 
+' MAVEN_OPTS="-Xms256m -Xmx512m -XX:PermSize=128m mvn integration-test [-Denv=yourEnv] [-DrestoreVersion=versionToRestore] [-DwebappName=yourCustomWebappName] [-Denterprise] ' 
 
 (default env=src/main/properties/local/application.properties)
 
diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
index 5a2b5dcd..efc568df 100644
--- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
@@ -25,7 +25,12 @@
 	<name>Alfresco extension</name>
 	<packaging>war</packaging>
 	<url></url>
-	<description>Alfresco extension</description>
+	<description>Alfresco extension</description>
+	<parent>
+		<groupId>com.sourcesense.alfresco</groupId>
+		<artifactId>maven-alfresco-archetypes-base</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
 	<!--
 		|
 		| By default the project is overlayed to the alfresco war which depends upon and deployed as a WAR (local development and testing purposes)
@@ -149,9 +154,21 @@
 			<artifactId>alfresco-remote-api</artifactId>
 			<version>2.1.0</version>
 			<scope>provided</scope>
-		</dependency>
+		</dependency>
+		<!-- Sample of AMP dependency that will be properly uncompressed in the Alfresco WAR (no more need for AMP): 
+		this can be either an AMP built with maven-amp-plugin and deployed on an accessible
+		maven repo or a generally available AMP previously deployed to a repo using mvn deploy:deploy-file
+		
+		<dependency>
+			<scope>runtime</scope>
+			<type>amp</type>
+			<artifactId>recordsmanagement</artifactId>
+			<version>2.1.0</version>
+			<groupId>org.alfresco.community</groupId>
+		</dependency>
+		-->
 
-		<!-- Uncomment if you're using mysql -->
+		<!-- Comment if you're not using mysql -->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
@@ -257,10 +274,6 @@
 				<artifactId>wagon-webdav</artifactId>
 				<version>1.0-beta-3</version>
 			</extension>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-ssh</artifactId>
-			</extension>
 		</extensions>
 		<!-- In certain cases we do build time filtering with the single sourcing application.properties -->
 		<filters>
@@ -383,19 +396,30 @@
 					</webResources>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<configuration>
-					<contextPath>/${webapp.name}</contextPath>
-					<scanIntervalSeconds>10</scanIntervalSeconds>
-					<connectors>
-						<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-							<port>8080</port>
-							<maxIdleTime>60000</maxIdleTime>
-						</connector>
-					</connectors>
-				</configuration>
+			<plugin>
+				<groupId>org.mortbay.jetty</groupId>
+				<artifactId>maven-jetty-plugin</artifactId>
+				<executions>
+					<!-- Runs jetty when 'integration-test' phase is called -->
+					<execution>
+						<id>it</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>run-exploded</goal>
+						</goals>
+						<configuration>
+							<contextPath>/${webapp.name}</contextPath>
+							<webApp>${pom.build.directory}/${webapp.name}</webApp>
+							<scanIntervalSeconds>10</scanIntervalSeconds>
+							<connectors>
+								<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+									<port>8080</port>
+									<maxIdleTime>60000</maxIdleTime>
+								</connector>
+							</connectors>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.cargo</groupId>