diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index cb96d358dd..7f80160fc3 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -46,50 +46,49 @@
             <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>license-maven-plugin</artifactId>
-               <version>2.0.1.alfresco-1</version>
-               <configuration>
-                  <verbose>${license.verbose}</verbose>
-                  <addSvnKeyWords>false</addSvnKeyWords>
-                  <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-
-                  <!-- header configuration -->
-                  <organizationName>Alfresco Software Limited</organizationName>
-                  <descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate>
-                  <canUpdateCopyright>true</canUpdateCopyright>
-                  <canUpdateDescription>true</canUpdateDescription>
-
-                  <!-- licence configuration -->
-                  <licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
-
-                  <!-- dry run options -->
-                  <dryRun>${license.update.dryrun}</dryRun>
-                  <failOnMissingHeader>true</failOnMissingHeader>
-                  <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
-
-                  <!-- default root -->
-                  <roots>
-                     <root>src</root>
-                  </roots>
-
-                  <!-- exculsions -->
-                  <excludes>
-                     <exclude>**/package-info.java</exclude>
-                     <exclude>**/*.properties</exclude>
-                     <exclude>**/*.css</exclude>
-                     <exclude>**/*.xml</exclude>
-                     <exclude>**/*.json</exclude>
-                     <exclude>**/*.txt</exclude>
-                     <exclude>**/*.html</exclude>
-                  </excludes>
-
-               </configuration>
                <executions>
                   <execution>
                      <id>first</id>
                      <goals>
                         <goal>update-file-header</goal>
                      </goals>
-                     <phase>process-sources</phase>
+                     <phase>none</phase>
+                     <configuration>
+                        <verbose>${license.verbose}</verbose>
+                        <addSvnKeyWords>false</addSvnKeyWords>
+                        <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+
+                        <!-- header configuration -->
+                        <organizationName>Alfresco Software Limited</organizationName>
+                        <descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate>
+                        <canUpdateCopyright>true</canUpdateCopyright>
+                        <canUpdateDescription>true</canUpdateDescription>
+
+                        <!-- license configuration -->
+                        <licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
+
+                        <!-- dry run options -->
+                        <dryRun>${license.update.dryrun}</dryRun>
+                        <failOnMissingHeader>true</failOnMissingHeader>
+                        <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
+
+                        <!-- default root -->
+                        <roots>
+                            <root>src</root>
+                        </roots>
+
+                        <!-- exclusions -->
+                        <excludes>
+                           <exclude>**/package-info.java</exclude>
+                           <exclude>**/*.properties</exclude>
+                           <exclude>**/*.css</exclude>
+                           <exclude>**/*.xml</exclude>
+                           <exclude>**/*.json</exclude>
+                           <exclude>**/*.txt</exclude>
+                           <exclude>**/*.html</exclude>
+                        </excludes>
+
+                     </configuration>
                   </execution>
                </executions>
             </plugin>
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index 83956d23da..3b81472dc0 100644
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -37,6 +37,16 @@
                <skipTests>${skip.automationtests}</skipTests>
             </configuration>
          </plugin>
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>license-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>third-party-licenses</id>
+                  <phase>none</phase>
+               </execution>
+            </executions>
+         </plugin>
       </plugins>
    </build>
 </project>
diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
index 9fbc211835..a2e022f60f 100644
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -10,17 +10,22 @@
       <version>14.73-SNAPSHOT</version>
    </parent>
 
-
    <build>
       <plugins>
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>license-maven-plugin</artifactId>
-            <configuration>
-               <licenseName>alfresco_community</licenseName>
-               <licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
-               <descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate>
-            </configuration>
+            <executions>
+                <execution>
+                    <id>first</id>
+                    <phase>process-sources</phase>
+                    <configuration>
+                       <licenseName>alfresco_community</licenseName>
+                       <licenseResolver>file:${project.parent.parent.basedir}/license</licenseResolver>
+                       <descriptionTemplate>${project.parent.parent.basedir}/license/description.ftl</descriptionTemplate>
+                    </configuration>
+                </execution>
+            </executions>
          </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index f1b8866c30..849d4534bb 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -320,17 +320,23 @@
          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>license-maven-plugin</artifactId>
-            <configuration>
-               <licenseName>alfresco_community</licenseName>
-               <roots>
-                  <root>source/java</root>
-                  <root>unit-test/java</root>
-                  <root>source/compatibility</root>
-                  <root>config</root>
-                  <root>test/java</root>
-                  <root>test/resources</root>
-               </roots>
-            </configuration>
+            <executions>
+               <execution>
+                  <id>first</id>
+                  <phase>process-sources</phase>
+                  <configuration>
+                     <licenseName>alfresco_community</licenseName>
+                     <roots>
+                        <root>source/java</root>
+                        <root>unit-test/java</root>
+                        <root>source/compatibility</root>
+                        <root>config</root>
+                        <root>test/java</root>
+                        <root>test/resources</root>
+                     </roots>
+                  </configuration>
+               </execution>
+            </executions>
          </plugin>
       </plugins>
    </build>
diff --git a/pom.xml b/pom.xml
index e33c35b108..86927164a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -925,7 +925,7 @@
                             <configuration>
                                 <failOnMissing>true</failOnMissing>
                                 <excludedScopes>provided,test</excludedScopes>
-                                <excludedGroups>org.alfresco</excludedGroups>
+                                <excludedGroups>^(org\.alfresco|com\.alfresco|org\.activiti).*</excludedGroups>
                                 <failIfWarning>false</failIfWarning>
                                 <includedLicenses>
                                     https://raw.githubusercontent.com/Alfresco/third-party-license-overrides/master/includedLicenses.txt
@@ -949,5 +949,11 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index 0762c8e3f0..7db8177124 100644
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -176,15 +176,6 @@
         </dependency>
     </dependencies>
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>license-maven-plugin</artifactId>
-                    <version>2.0.1.alfresco-1</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
             <!-- Create a jar of test classes -->
             <plugin>
@@ -271,21 +262,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                    <organizationName>Alfresco Software Limited</organizationName>
-                    <failOnMissingHeader>true</failOnMissingHeader>
-                    <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
-                    <licenseResolver>classpath://alfresco</licenseResolver>
-                    <licenseName>${licenseName}</licenseName>
-                    <roots>
-                        <root>src</root>
-                    </roots>
-                    <includes>
-                        <include>**/*.java</include>
-                        <include>**/*.jsp</include>
-                    </includes>
-                </configuration>
                 <executions>
                     <execution>
                         <id>check-licenses</id>
@@ -293,6 +269,21 @@
                         <goals>
                             <goal>check-file-header</goal>
                         </goals>
+                        <configuration>
+                            <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+                            <organizationName>Alfresco Software Limited</organizationName>
+                            <failOnMissingHeader>true</failOnMissingHeader>
+                            <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
+                            <licenseResolver>classpath://alfresco</licenseResolver>
+                            <licenseName>${licenseName}</licenseName>
+                            <roots>
+                                <root>src</root>
+                            </roots>
+                            <includes>
+                                <include>**/*.java</include>
+                                <include>**/*.jsp</include>
+                            </includes>
+                        </configuration>
                     </execution>
                 </executions>
                 <dependencies>
diff --git a/repository/pom.xml b/repository/pom.xml
index 507f22a3b4..3c20546954 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -988,21 +988,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-                    <organizationName>Alfresco Software Limited</organizationName>
-                    <failOnMissingHeader>true</failOnMissingHeader>
-                    <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
-                    <licenseResolver>classpath://alfresco</licenseResolver>
-                    <licenseName>${licenseName}</licenseName>
-                    <roots>
-                        <root>src</root>
-                    </roots>
-                    <includes>
-                        <include>**/*.java</include>
-                        <include>**/*.jsp</include>
-                    </includes>
-                </configuration>
                 <executions>
                     <execution>
                         <id>check-licenses</id>
@@ -1010,6 +995,21 @@
                         <goals>
                             <goal>check-file-header</goal>
                         </goals>
+                        <configuration>
+                            <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+                            <organizationName>Alfresco Software Limited</organizationName>
+                            <failOnMissingHeader>true</failOnMissingHeader>
+                            <failOnNotUptodateHeader>true</failOnNotUptodateHeader>
+                            <licenseResolver>classpath://alfresco</licenseResolver>
+                            <licenseName>${licenseName}</licenseName>
+                            <roots>
+                                <root>src</root>
+                            </roots>
+                            <includes>
+                                <include>**/*.java</include>
+                                <include>**/*.jsp</include>
+                            </includes>
+                        </configuration>
                     </execution>
                 </executions>
                 <dependencies>