diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
index 969433ca26..c9bf92d680 100644
--- a/distribution/src/assembly/full-distribution.xml
+++ b/distribution/src/assembly/full-distribution.xml
@@ -40,16 +40,10 @@
             <outputDirectory/>
             <includes>
                 <include>web-server/**</include>
-                <include>modules/**</include>
+		<include>modules/**</include>
+		<include>amps/**</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</directory>
-            <includes>
-                <include>*.amp</include>
-            </includes>
-            <outputDirectory>amps</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
             <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml
index 662599563a..10c9b9ded0 100644
--- a/enterprise-installer/pom.xml
+++ b/enterprise-installer/pom.xml
@@ -23,6 +23,7 @@
            project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12 
            project.windowsSigningPkcs12Password=${p12Password} 
            alfresco_edition=enterprise 
+           alfresco_package='${alfresco.package.name}' 
            alfrescogoogledocs_component_enabled=1 
            alfrescosharepoint_component_enabled=0 
            alfrescosolr_component_enabled=1 
diff --git a/installer/pom.xml b/installer/pom.xml
index 453099d564..f2ccefd836 100644
--- a/installer/pom.xml
+++ b/installer/pom.xml
@@ -23,6 +23,7 @@
            project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12 
            project.windowsSigningPkcs12Password=${p12Password} 
            alfresco_edition=community 
+           alfresco_package='${alfresco.package.name}' 
            project.outputDirectory=${project.build.directory} 
         </bitrock.arguments>
     </properties>
diff --git a/pom.xml b/pom.xml
index d8cefe97a4..ceba55e424 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,9 +42,9 @@
 
         <!-- 
             Build number (Default value is used unless overridden by command line)
-            Default value: SNAPSHOT
+            Default value: SNAPSHOT-0
         -->
-        <installer.build.number>SNAPSHOT</installer.build.number>
+        <installer.build.number>SNAPSHOT-0</installer.build.number>
 
         <!-- 
             Installer version that will be used in the final name.