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 86199361..6acbb110 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
@@ -12,6 +12,9 @@
     <requiredProperty key="alfresco_target_version">
       <defaultValue>4.2.c</defaultValue>
     </requiredProperty>
+    <requiredProperty key="alfresco_target_amp_client_war">
+      <defaultValue>alfresco</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 62ab7c11..9b6f3182 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
@@ -27,7 +27,7 @@
         <alfresco.data.location>alf_data_dev</alfresco.data.location>
         <!-- Defines the target WAR for this AMP. Allowed values: alfresco | share  -->
         <!-- Defaults to a repository AMP -->
-        <alfresco.client.war>alfresco</alfresco.client.war>
+        <alfresco.client.war>${alfresco_target_amp_client_war}</alfresco.client.war>
         <!-- 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 ca7ce9ef..59c3a9dd 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
@@ -5,4 +5,5 @@ groupId=archetype.it
 alfresco_target_version=4.2.b
 $=cat archetype.properties
 alfresco_target_groupId=org.alfresco
+alfresco_target_amp_client_war=alfresco
 artifactId=basic