diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml
index 708d1607..db17368a 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.0</version>
+		<version>1.0.1-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 c9508c68..fcdbf5d0 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
@@ -83,10 +83,11 @@
 	-->
 	<dependencies>
 		<dependency>
-			<groupId>alfresco.community</groupId>
+			<groupId>org.alfresco</groupId>
 			<artifactId>alfresco-repository</artifactId>
-			<version>2.1.0</version>
+			<version>3.0Stable</version>
 			<scope>provided</scope>
+			<classifier>labs</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -103,7 +104,7 @@
 		-->
 		<!-- Example AMP dependency:  will be properly overlayed in the  WAR produced by the integration-test phase in profile 'webapp'
 		<dependency>
-			<groupId>org.alfresco.community</groupId>
+			<groupId>org.alfresco</groupId>
 			<artifactId>recordsmanagement</artifactId>
 			<version>2.1.0</version>
 			<type>amp</type>
@@ -163,7 +164,7 @@
 					<overlays>
 						<!-- This sample adds records management module in the finally built AMP
 						<overlay>
-							<groupId>org.alfresco.community</groupId>
+							<groupId>org.org.alfresco</groupId>
 							<artifactId>recordsmanagement</artifactId>
 							<version>2.1.0</version>
 							<type>amp</type>
@@ -350,10 +351,11 @@
 			<dependencies>
 				<!-- This is the alfresco version you're testing the AMP against. Don't remove if you want jetty to be able to deploy a WAR :) -->
 				<dependency>
-					<groupId>alfresco.community</groupId>
+					<groupId>org.alfresco</groupId>
 					<artifactId>alfresco</artifactId>
-					<version>2.1.0</version>
+					<version>3.0Stable</version>
 					<type>war</type>
+					<classifier>labs</classifier>
 				</dependency>
 			</dependencies>
 		</profile>
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm
index 5d22d94d..c18c859b 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/site/apt/index.apt.vm
@@ -23,9 +23,7 @@ Quick Start (maven2)
  For a quick start you can a maven alfresco AMP project created by just running  <<(maven 2.0.6+ required)>>:
 
 --------------------------------------------
-mvn  org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha-7:create  -DarchetypeGroupId=${site_pom_groupId} -DarchetypeVersion=${site_pom_version} \
-			-DarchetypeArtifactId=${site_pom_artifactId} \
-			-DgroupId=mycompany.com  -DartifactId=mymodule -Dversion=0.1-SNAPSHOT \
-			-DremoteRepositories=http://repository.sourcesense.com/maven2 \
-			-DpomRemoteRepositories=http://repository.sourcesense.com/maven2
+mvn archetype:generate -DarchetypeCatalog=http://repository.sourcesense.com/maven2/archetype-catalog.xml
 --------------------------------------------
+
+and then choose the option 'maven-alfresco-amp-archetype'
diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml
index b333edb0..985a272b 100644
--- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>com.sourcesense.alfresco</groupId>
 		<artifactId>maven-alfresco-archetypes</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1-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/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
index d5e02e1b..006afd79 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
@@ -68,7 +68,7 @@
 		<alfresco.db.name>alf_jetty</alfresco.db.name>
 		<alfresco.db.username>alfresco</alfresco.db.username>
 		<alfresco.db.password>alfresco</alfresco.db.password>
-		<alfresco.version>2.1.0</alfresco.version>
+		<alfresco.version>3.0Stable</alfresco.version>
 		<!-- Used for 2.1.0 -->
 		<desktop.action.package>org.alfresco.filesys.smb.server.repo.desk</desktop.action.package>
 		<!-- Used for 2.9.0+ -->
@@ -130,35 +130,40 @@
 			| Jboss alfresco build (e.g. no log4j.properties and fix for myFaces) 
 		-->
 		<dependency>
-			<groupId>alfresco.community</groupId>
+			<groupId>org.alfresco</groupId>
 			<artifactId>alfresco</artifactId>
 			<version>${alfresco.version}</version>
 			<type>war</type>
+			<classifier>labs</classifier>
 		</dependency>
 		<!-- All provided libs (as contained in the war dependency) but useful for development (e.g. IDE configuration) -->
 		<dependency>
-			<groupId>alfresco.community</groupId>
+			<groupId>org.alfresco</groupId>
 			<artifactId>alfresco-web-client</artifactId>
 			<version>${alfresco.version}</version>
 			<scope>provided</scope>
+			<classifier>labs</classifier>
 		</dependency>
 		<dependency>
-			<groupId>alfresco.community</groupId>
+			<groupId>org.alfresco</groupId>
 			<artifactId>alfresco-core</artifactId>
 			<version>${alfresco.version}</version>
 			<scope>provided</scope>
+			<classifier>labs</classifier>
 		</dependency>
 		<dependency>
-			<groupId>alfresco.community</groupId>
+			<groupId>org.alfresco</groupId>
 			<artifactId>alfresco-repository</artifactId>
 			<version>${alfresco.version}</version>
 			<scope>provided</scope>
+			<classifier>labs</classifier>
 		</dependency>
 		<dependency>
-			<groupId>alfresco.community</groupId>
+			<groupId>org.alfresco</groupId>
 			<artifactId>alfresco-remote-api</artifactId>
 			<version>${alfresco.version}</version>
 			<scope>provided</scope>
+			<classifier>labs</classifier>
 		</dependency>
 
 		<!-- Sample of AMP dependency that will be properly uncompressed in the Alfresco WAR (no more need for AMP): 
@@ -170,7 +175,7 @@
 			<type>amp</type>
 			<artifactId>recordsmanagement</artifactId>
 			<version>${alfresco.version}</version>
-			<groupId>org.alfresco.community</groupId>
+			<groupId>org.alfresco</groupId>
 			</dependency>
 		-->
 
@@ -192,13 +197,6 @@
 		<!-- Customize here your webapp name - default: alfresco.war -->
 		<finalName>${webapp.name}</finalName>
 		<!-- Used to access Sourcesense repository for writing. Public version not available, see README.txt -->
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-webdav</artifactId>
-				<version>1.0-beta-3</version>
-			</extension>
-		</extensions>
 		<!-- In certain cases we do build time filtering with the single sourcing application.properties -->
 		<filters>
 			<filter>src/main/properties/${env}/application.properties</filter>
diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm
index 39214041..39852b06 100644
--- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm
+++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/site/apt/index.apt.vm
@@ -23,13 +23,11 @@ Quick Start (maven2)
  For a quick start you can a maven alfresco extension project created by just running  <<(maven 2.0.6+ required)>>:
 
 --------------------------------------------
-mvn  org.apache.maven.plugins:maven-archetype-plugin:1.0-alpha-7:create  -DarchetypeGroupId=${site_pom_groupId} -DarchetypeVersion=${site_pom_version} \
-			-DarchetypeArtifactId=${site_pom_artifactId} \
-			-DgroupId=mycompany.com  -DartifactId=my-alfresco-customization -Dversion=0.1-SNAPSHOT \
-			-DremoteRepositories=http://repository.sourcesense.com/maven2 \
-			-DpomRemoteRepositories=http://repository.sourcesense.com/maven2
+mvn archetype:generate -DarchetypeCatalog=http://repository.sourcesense.com/maven2/archetype-catalog.xml
 --------------------------------------------
 
+and then choose the option 'maven-alfresco-extension-archetype'
+
 Quick Start (Ant)
 
  For a quick start you can a ant alfresco extension project created by running <<(Default target : package)>> :
@@ -40,4 +38,4 @@ Unzip maven-alfresco-extension-archetype-1.0.0.jar
 Rename mv archetype-resources folder into your desired project name - (On unix like you could : mv archetype-resources my-alfresco-customization)
 Enter my-alfresco-customization folder
 ant 
--------------------------------------------
\ No newline at end of file
+-------------------------------------------
diff --git a/maven-alfresco-archetypes/pom.xml b/maven-alfresco-archetypes/pom.xml
index 083fece6..8aaf6f24 100644
--- a/maven-alfresco-archetypes/pom.xml
+++ b/maven-alfresco-archetypes/pom.xml
@@ -130,6 +130,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
+				<version>2.0-beta-9</version>
 				<configuration>
 					<!-- useEditMode>true</useEditMode>-->
 					<preparationGoals>clean package</preparationGoals>