diff --git a/mfwd/pom.xml b/mfwd/pom.xml
index 755b776..11adb86 100644
--- a/mfwd/pom.xml
+++ b/mfwd/pom.xml
@@ -36,11 +36,11 @@
     </properties>
 
     <dependencies>
-      <dependency>
-        <groupId>org.onosproject</groupId>
-        <artifactId>onos-cli</artifactId>
-        <version>${project.version}</version>
-      </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-cli</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
@@ -103,18 +103,9 @@
     <build>
         <plugins>
             <plugin>
-		<groupId>org.onosproject</groupId>
-                <artifactId>onos-maven-plugin</artifactId>
-                <version>1.4</version>
-                <executions>
-                   <execution>
-                      <id>app</id>
-                      <phase>package</phase>
-                      <goals>
-                         <goal>app</goal>
-                      </goals>
-                  </execution>
-                </executions>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <_wab>src/main/webapp/</_wab>
diff --git a/pom.xml b/pom.xml
index 837539f..8e28d73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,14 @@
         </repository>
     </repositories>
 
+    <!--- FIXME Needed for onos-maven-plugin. Remove before official release -->
+    <pluginRepositories>
+        <pluginRepository>
+            <id>snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <modules>
         <module>oneping</module>
         <module>ifwd</module>