diff --git a/tools/org.apache.felix.scr.bnd/pom.xml b/tools/org.apache.felix.scr.bnd/pom.xml
index f0511f5..41cb293 100644
--- a/tools/org.apache.felix.scr.bnd/pom.xml
+++ b/tools/org.apache.felix.scr.bnd/pom.xml
@@ -27,7 +27,7 @@
         <relativePath>../../pom/pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.felix</groupId>
+    <groupId>org.onosproject</groupId>
     <artifactId>org.apache.felix.scr.bnd</artifactId>
 
     <version>1.4.1-SNAPSHOT</version>
@@ -46,13 +46,24 @@
         <url>http://svn.apache.org/repos/asf/felix/scrplugin/bnd-scr-plugin</url>
     </scm>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
     <properties>
         <felix.java.version>6</felix.java.version>
     </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.onosproject</groupId>
             <artifactId>org.apache.felix.scr.generator</artifactId>
             <version>1.13.1-SNAPSHOT</version>
             <scope>compile</scope>
@@ -60,7 +71,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <version>1.9.13-SNAPSHOT</version>
+            <version>1.9.12</version>
             <scope>compile</scope>
         </dependency>
         <!-- bndlib is provided at runtime (it neither needs to be considered by the maven-shade-plugin nor as transitive dependency by Maven) -->
diff --git a/tools/org.apache.felix.scr.generator/pom.xml b/tools/org.apache.felix.scr.generator/pom.xml
index 9656871..4b743f7 100644
--- a/tools/org.apache.felix.scr.generator/pom.xml
+++ b/tools/org.apache.felix.scr.generator/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../../pom/pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.felix</groupId>
+    <groupId>org.onosproject</groupId>
     <artifactId>org.apache.felix.scr.generator</artifactId>
 
     <version>1.13.1-SNAPSHOT</version>
@@ -47,7 +47,18 @@
     <properties>
         <felix.java.version>6</felix.java.version>
     </properties>
-    
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
     <dependencies>
         <!-- bind/unbind method generation -->
         <dependency>