diff --git a/lib/BUCK b/lib/BUCK
index 574a041..4d53ed0 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Thu, 14 Dec 2017 00:27:54 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Mon, 18 Dec 2017 23:41:30 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -1161,8 +1161,9 @@
 remote_jar (
   name = 'bndexe',
   out = 'biz.aQute.bnd-3.1.0.jar',
-  url = 'http://onlab.vicci.org/onos/third-party/biz.aQute.bnd-3.1.0.jar',
+  url = 'mvn:biz.aQute.bnd:biz.aQute.bnd:jar:3.1.0',
   sha1 = 'ebd6c2af025b66ea94a9fcb217c2699ba23d3ca2',
+  maven_coords = 'biz.aQute.bnd:biz.aQute.bnd:3.1.0',
   visibility = [ 'PUBLIC' ],
 )
 
@@ -1186,10 +1187,10 @@
 
 remote_jar (
   name = 'org.apache.felix.scr.bnd',
-  out = 'org.apache.felix.scr.bnd-1.4.1-20160328.235003-2.jar',
-  url = 'https://oss.sonatype.org/content/repositories/snapshots/org/onosproject/org.apache.felix.scr.bnd/1.4.1-SNAPSHOT/org.apache.felix.scr.bnd-1.4.1-20160328.235003-2.jar',
-  sha1 = '607cac6eaba5b0eb0787a343b83fe535c42c09aa',
-  maven_coords = 'org.onosproject:org.apache.felix.scr.bnd:1.4.1-SNAPSHOT',
+  out = 'org.apache.felix.scr.bnd-1.8.0.jar',
+  url = 'mvn:org.apache.felix:org.apache.felix.scr.bnd:jar:1.8.0',
+  sha1 = '2a35f0992bc55cab7ef818114147267ced0ade6d',
+  maven_coords = 'org.apache.felix:org.apache.felix.scr.bnd:jar:NON-OSGI:1.8.0',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index 057e7ba..aa46009 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -222,13 +222,10 @@
     "checkstyle": "mvn:com.puppycrawl.tools:checkstyle:6.19",
     "apache-karaf": "http://onlab.vicci.org/onos/third-party/apache-karaf-3.0.8-offline-20170825.tar.gz",
     "bndlib": "mvn:biz.aQute.bnd:biz.aQute.bndlib:jar:3.1.0",
-    "bndexe": "http://onlab.vicci.org/onos/third-party/biz.aQute.bnd-3.1.0.jar",
+    "bndexe": "mvn:biz.aQute.bnd:biz.aQute.bnd:3.1.0",
     "libthrift": "mvn:org.apache.thrift:libthrift:0.9.3",
     "qdox": "mvn:com.thoughtworks.qdox:qdox:2.0-M3",
-    "org.apache.felix.scr.bnd": {
-      "uri": "mvn:org.onosproject:org.apache.felix.scr.bnd:1.4.1-SNAPSHOT",
-      "repo": "https://oss.sonatype.org/content/repositories/snapshots"
-    },
+    "org.apache.felix.scr.bnd": "mvn:org.apache.felix:org.apache.felix.scr.bnd:1.8.0",
     "snmp-core": "mvn:org.onosproject:snmp-core:1.3-20161021.1",
     "bti7000": "mvn:org.onosproject:mibbler-mibs-bti7000:1.0-20151221.1",
     "mibs-net-snmp": "mvn:org.onosproject:mibbler-mibs-net-snmp:1.0-20151221.1",
diff --git a/utils/osgiwrap/pom.xml b/utils/osgiwrap/pom.xml
index 26ef8b0..f999b82 100644
--- a/utils/osgiwrap/pom.xml
+++ b/utils/osgiwrap/pom.xml
@@ -27,24 +27,11 @@
     <artifactId>osgiwrap</artifactId>
     <version>0.9-SNAPSHOT</version>
 
-    <repositories>
-        <repository>
-            <id>snapshots</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>fail</checksumPolicy>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencies>
-        <!-- TODO update this to org.apache.felix when changes are merged upstream -->
         <dependency>
-            <groupId>org.onosproject</groupId>
+            <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.bnd</artifactId>
-            <version>1.4.1-SNAPSHOT</version>
+            <version>1.8.0</version>
         </dependency>
 
         <dependency>
@@ -57,4 +44,4 @@
             <artifactId>guava</artifactId>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>