diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 6acbb110..398024b8 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -15,6 +15,12 @@
     <requiredProperty key="alfresco_target_amp_client_war">
       <defaultValue>alfresco</defaultValue>
     </requiredProperty>
+    <requiredProperty key="alfresco_target_amp_client_war_groupId">
+      <defaultValue>org.alfresco</defaultValue>
+    </requiredProperty>
+    <requiredProperty key="alfresco_target_amp_client_war_version">
+      <defaultValue>4.2.c</defaultValue>
+    </requiredProperty>
     <requiredProperty key="package">
       <defaultValue>(not used)</defaultValue>
     </requiredProperty>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index 9b6f3182..d781a6be 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -28,6 +28,8 @@
         <!-- Defines the target WAR for this AMP. Allowed values: alfresco | share  -->
         <!-- Defaults to a repository AMP -->
         <alfresco.client.war>${alfresco_target_amp_client_war}</alfresco.client.war>
+        <alfresco.client.war.groupId>${alfresco_target_amp_client_war_groupId}</alfresco.client.war.groupId>
+        <alfresco.client.war.version>${alfresco_target_amp_client_war_version}</alfresco.client.war.version>
         <!-- This controls which properties will be picked in src/test/properties for embedded run -->
         <env>local</env>
     </properties>
diff --git a/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties b/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
index 59c3a9dd..0c739d61 100644
--- a/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties
@@ -2,8 +2,10 @@
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it
-alfresco_target_version=4.2.b
+alfresco_target_version=4.2.c
 $=cat archetype.properties
 alfresco_target_groupId=org.alfresco
 alfresco_target_amp_client_war=alfresco
+alfresco_target_amp_client_war_groupId=org.alfresco
+alfresco_target_amp_client_war_version=4.2.c
 artifactId=basic