diff --git a/Jenkinsfile b/Jenkinsfile
index 567e27c..5f264a1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-asfStandardBuild cmdline:"clean deploy"
+asfStandardBuild()
diff --git a/spring-registry-api/pom.xml b/spring-registry-api/pom.xml
index c698d1b..1f6dbc4 100644
--- a/spring-registry-api/pom.xml
+++ b/spring-registry-api/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>spring-registry-api</artifactId>
-  <packaging>bundle</packaging>
   <name>Redback Spring Registry Api</name>
 
   <properties>
@@ -46,24 +45,4 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.components.registry;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/spring-registry-commons/pom.xml b/spring-registry-commons/pom.xml
index 75d6074..32bb697 100644
--- a/spring-registry-commons/pom.xml
+++ b/spring-registry-commons/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>spring-registry-commons</artifactId>
-  <packaging>bundle</packaging>
   <name>Redback Spring Registry commons-configuration</name>
   <properties>
     <site.staging.base>${project.parent.basedir}/../site</site.staging.base>
@@ -110,26 +109,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.components.registry.commons;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              org.apache.archiva.redback.components.registry;version=${project.version},
-              org.apache.commons.configuration*;version="[1.8,2)",,
-              org.apache.commons.lang;version="[2.6,3)",
-              org.codehaus.plexus.interpolation;version="[1.14,2)",
-              org.springframework*;version="[3,4)",
-              org.slf4j
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>