diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml
index 92560ace..eaafec1a 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml
@@ -28,6 +28,7 @@
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>${alfresco.repo.artifactId}</artifactId>
+            <version>${alfresco.version}</version>
             <type>war</type>
         </dependency>
         <!-- Demonstrating the dependency / installation of the repo AMP developed in the 'repo-amp' module -->
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
index 498075fe..fe03221d 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml
@@ -17,6 +17,7 @@
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>${alfresco.share.artifactId}</artifactId>
+            <version>${alfresco.version}</version>
             <type>war</type>
         </dependency>
         <!-- Demonstrating the dependency / installation of the share AMP developed in the 'share-amp' module -->
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties
new file mode 100644
index 00000000..3c68568c
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties
@@ -0,0 +1,6 @@
+package=it.pkg
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=allInOneTest
+alfresco_target_groupId=org.alfresco
+alfresco_target_version=5.0.0-SNAPSHOT
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt
new file mode 100644
index 00000000..707e42e0
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt
@@ -0,0 +1 @@
+verify -Prun -Penterprise -Dmaven.tomcat.fork=true
diff --git a/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-enterprise/archetype.properties b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-enterprise/archetype.properties
new file mode 100644
index 00000000..fa8e0359
--- /dev/null
+++ b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-enterprise/archetype.properties
@@ -0,0 +1,8 @@
+#Tue Oct 30 14:23:01 CET 2012
+groupId=archetype.it
+artifactId=enterprise
+version=0.1-SNAPSHOT
+package=it.pkg
+$=cat archetype.properties
+alfresco_target_groupId=org.alfresco
+alfresco_target_version=5.0.0-SNAPSHOT
diff --git a/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-enterprise/goal.txt b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-enterprise/goal.txt
new file mode 100644
index 00000000..60b24860
--- /dev/null
+++ b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-enterprise/goal.txt
@@ -0,0 +1 @@
+verify -Pamp-to-war -Penterprise -Dmaven.tomcat.fork=true
diff --git a/archetypes/share-amp-archetype/src/test/resources/projects/run-enterprise/archetype.properties b/archetypes/share-amp-archetype/src/test/resources/projects/run-enterprise/archetype.properties
new file mode 100644
index 00000000..96efa39c
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/test/resources/projects/run-enterprise/archetype.properties
@@ -0,0 +1,8 @@
+#Tue Oct 30 14:23:01 CET 2012
+groupId=archetype.it
+artifactId=basic
+version=0.1-SNAPSHOT
+$=cat archetype.properties
+package=it.pkg
+alfresco_target_groupId=org.alfresco
+alfresco_target_version=5.0.0-SNAPSHOT
diff --git a/archetypes/share-amp-archetype/src/test/resources/projects/run-enterprise/goal.txt b/archetypes/share-amp-archetype/src/test/resources/projects/run-enterprise/goal.txt
new file mode 100644
index 00000000..60b24860
--- /dev/null
+++ b/archetypes/share-amp-archetype/src/test/resources/projects/run-enterprise/goal.txt
@@ -0,0 +1 @@
+verify -Pamp-to-war -Penterprise -Dmaven.tomcat.fork=true
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 54048a83..4c93c62c 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -786,7 +786,7 @@
     <profile>
         <id>enterprise</id>
         <properties>
-            <alfresco.version>5.0-BF-SNAPSHOT</alfresco.version>
+            <alfresco.version>5.0.0-SNAPSHOT</alfresco.version>
             <alfresco.repo.artifactId>alfresco-enterprise</alfresco.repo.artifactId>
             <alfresco.share.artifactId>share-enterprise</alfresco.share.artifactId>
             <!-- Not needed in the webapp for enterprise -->