diff --git a/releng/mvn-jwt-builder/pom.xml b/releng/mvn-jwt-builder/pom.xml
index 4cef092..ad28e12 100644
--- a/releng/mvn-jwt-builder/pom.xml
+++ b/releng/mvn-jwt-builder/pom.xml
@@ -37,14 +37,14 @@
   </modules>
 
   <properties>
-    <tycho-version>0.16.0</tycho-version>
+    <tycho-version>0.18.0</tycho-version>
   </properties>
 
   <repositories>
     <repository>
       <id>kepler</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/luna</url>
+      <url>http://download.eclipse.org/releases/luna/</url>
     </repository>
   </repositories>
 
diff --git a/releng/org.eclipse.jwt.p2updatesite/pom.xml b/releng/org.eclipse.jwt.p2updatesite/pom.xml
index 158021f..81ab5e7 100644
--- a/releng/org.eclipse.jwt.p2updatesite/pom.xml
+++ b/releng/org.eclipse.jwt.p2updatesite/pom.xml
@@ -60,13 +60,10 @@
             <executions>
               <execution>
                 <id>pack200-normalize</id>
-                <configuration>
-                  <inputFile>${project.build.directory}/org.eclipse.jwt.p2updatesite-1.3.0.qualifier.zip</inputFile>
-                </configuration>
                 <goals>
                   <goal>normalize</goal>
                 </goals>
-                <phase>package</phase>
+                <phase>verify</phase>
               </execution>
             </executions>
           </plugin>
@@ -79,14 +76,10 @@
             <executions>
               <execution>
                 <id>sign</id>
-                <configuration>
-                  <inputFile>${project.build.directory}/org.eclipse.jwt.p2updatesite-1.3.0.qualifier.zip</inputFile>
-                  <signerInputDirectory>/home/data/httpd/download-staging.priv/technology/jwt</signerInputDirectory>
-                </configuration>
-                <phase>package</phase>
                 <goals>
                   <goal>sign</goal>
                 </goals>
+                <phase>verify</phase>
               </execution>
              </executions>
           </plugin>
@@ -99,17 +92,32 @@
             <executions>
               <execution>
                 <id>pack200-pack</id>
-                <configuration>
-                  <inputFile>${project.build.directory}/org.eclipse.jwt.p2updatesite-1.3.0.qualifier.zip</inputFile>
-                </configuration>
-                <phase>package</phase>
                 <goals>
                   <goal>pack</goal>
                 </goals>
+                <phase>verify</phase>
               </execution>
             </executions>
           </plugin>
 
+		  <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-p2-plugin</artifactId>
+            <version>0.18.0</version>
+            <executions>
+              <execution>
+                <id>p2-metadata</id>
+                <goals>
+                  <goal>p2-metadata</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <defaultP2Metadata>false</defaultP2Metadata>
+            </configuration>
+          </plugin>
+
           <!--
           This is what I use to deploy a p2 repository someplace to test from before manually making active.             
           <plugin>