diff --git a/jetty-features/org.eclipse.jetty.product/pom.xml b/jetty-features/org.eclipse.jetty.product/pom.xml
index 6a3d919..7b5c8e7 100644
--- a/jetty-features/org.eclipse.jetty.product/pom.xml
+++ b/jetty-features/org.eclipse.jetty.product/pom.xml
@@ -56,7 +56,7 @@
             <executions>
               <execution>
                 <id>zip-repository</id>
-                <phase>generate-test-sources</phase>
+                <phase>package</phase>
                 <goals>
                   <goal>run</goal>
                 </goals>
@@ -68,7 +68,7 @@
               </execution>
               <execution>
                  <id>replace-unsigned-repository-by-signed-one</id>
-                 <phase>prepare-package</phase>
+                 <phase>post-package</phase>
                  <goals>
                    <goal>run</goal>
                  </goals>
@@ -116,7 +116,7 @@
                <configuration>
                  <inputFile>${project.build.directory}/repository.zip</inputFile>
                </configuration>
-               <phase>generate-test-resources</phase>
+               <phase>package</phase>
                <goals>
                  <goal>pack</goal>
                </goals>
@@ -127,7 +127,7 @@
                  <inputFile>${project.build.directory}/packed/repository.zip</inputFile>
                  <signerInputDirectory>/home/data/httpd/download-staging.priv/rt/jetty/wksigning</signerInputDirectory>
                </configuration>
-               <phase>generate-test-resources</phase>
+               <phase>package</phase>
                <goals>
                  <goal>sign</goal>
                </goals>
@@ -137,18 +137,18 @@
                <configuration>
                  <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
                </configuration>
-               <phase>generate-test-resources</phase>
+               <phase>package</phase>
                <goals>
                  <goal>pack</goal>
                </goals>
              </execution>
-						<!-- signing and pack alters tycho checksums so fix them -->
+
              <execution>
                <id>fixCheckSums</id>
                <configuration>
                  <inputFile>${project.build.directory}/packed/site_assembly.zip</inputFile>
                </configuration>
-               <phase>generate-test-resources</phase>
+               <phase>package</phase>
                <goals>
                  <goal>fixCheckSums</goal>
                </goals>
diff --git a/pom.xml b/pom.xml
index b99e4db..327a275 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@
 	      </configuration>
 	</plugin>
         <plugin>
-          <groupId>org.sonatype.tycho</groupId>
+          <groupId>org.eclipse.tycho</groupId>
           <artifactId>tycho-compiler-plugin</artifactId>
           <version>${tycho-version}</version>
           <configuration>