diff --git a/pom.xml b/pom.xml
index 5551265..76a5e11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos</artifactId>
-        <version>1.7.1</version>
+        <artifactId>onos-dependencies</artifactId>
+        <version>1.8.0</version>
         <relativePath></relativePath>
     </parent>
 
@@ -35,7 +35,7 @@
 
     <properties>
         <onos.app.name>org.opencord.igmp</onos.app.name>
-        <onos.version>1.7.1</onos.version>
+        <onos.version>1.8.0</onos.version>
         <onos.app.title>IGMP App</onos.app.title>
         <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://opencord.org</onos.app.url>
@@ -61,12 +61,6 @@
             <artifactId>onlab-osgi</artifactId>
             <version>${onos.version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>org.opencord</groupId>
-            <artifactId>cord-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
@@ -75,19 +69,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- This is needed by ComponentContext, used for tunable configuration -->
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    
-        <!-- TODO FIX ONOS ROOT POM to split thirdparty and onos dependencies -->
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onlab-misc</artifactId>
@@ -107,12 +88,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-common</artifactId>
-            <version>${onos.version}</version>
-        </dependency> 
-
-
+            <groupId>org.opencord</groupId>
+            <artifactId>cord-config</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -182,4 +161,30 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>http://repo.maven.apache.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </releases>
+        </repository>
+
+        <repository>
+            <id>snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </snapshots>
+        </repository>
+    </repositories>
 </project>
diff --git a/src/main/java/org/opencord/igmp/IgmpSnoop.java b/src/main/java/org/opencord/igmp/IgmpSnoop.java
index 4d840e8..6ce4b09 100644
--- a/src/main/java/org/opencord/igmp/IgmpSnoop.java
+++ b/src/main/java/org/opencord/igmp/IgmpSnoop.java
@@ -373,7 +373,7 @@
     }
 
     private ByteBuffer buildQueryPacket() {
-        IGMP igmp = new IGMP();
+        IGMP igmp = new IGMP.IGMPv3();
         igmp.setIgmpType(IGMP.TYPE_IGMPV3_MEMBERSHIP_QUERY);
         igmp.setMaxRespCode(maxRespCode);