diff --git a/core/store/dist/pom.xml b/core/store/dist/pom.xml
index 6eb1a5f7ed..2f0f977706 100644
--- a/core/store/dist/pom.xml
+++ b/core/store/dist/pom.xml
@@ -48,25 +48,6 @@
             <groupId>org.onosproject</groupId>
             <artifactId>onos-core-common</artifactId>
         </dependency>
-<!--
-       <dependency>
-            <groupId>net.kuujo.copycat</groupId>
-            <artifactId>copycat</artifactId>
-            <version>${copycat.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.kuujo.copycat</groupId>
-            <artifactId>copycat-chronicle</artifactId>
-            <version>${copycat.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.kuujo.copycat</groupId>
-            <artifactId>copycat-tcp</artifactId>
-            <version>${copycat.version}</version>
-        </dependency>
--->
 
         <dependency>
             <groupId>org.mapdb</groupId>
diff --git a/features/features.xml b/features/features.xml
index aec22d4272..3a227a6469 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -59,6 +59,7 @@
         <bundle>mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
         <bundle>mvn:org.codehaus.jackson/jackson-mapper-asl/1.9.13</bundle>
 
+        <bundle>mvn:com.typesafe/config/1.2.1</bundle>
         <bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle>
 
         <bundle>mvn:org.mapdb/mapdb/1.0.6</bundle>
diff --git a/pom.xml b/pom.xml
index 0f376cd584..5267aeb4a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,14 @@
         <maven>3.0.1</maven>
     </prerequisites>
 
+    <!--- Needed for copycat. Remove before official release -->
+    <repositories>
+        <repository>
+            <id>snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-base</artifactId>
diff --git a/utils/thirdparty/pom.xml b/utils/thirdparty/pom.xml
index eb77eca323..61adc1a3e5 100644
--- a/utils/thirdparty/pom.xml
+++ b/utils/thirdparty/pom.xml
@@ -31,14 +31,6 @@
 
   <description>ONLab third-party dependencies</description>
 
-  <!-- TODO: Needed for copycat snapshot. Remove before official release -->
-  <repositories>
-    <repository>
-      <id>snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>com.googlecode.concurrent-trees</groupId>
@@ -59,6 +51,13 @@
             <version>${copycat.version}</version>
         </dependency>
 
+        <dependency>
+          <!-- FIXME once fixes get merged to upstream -->
+          <groupId>org.onosproject</groupId>
+            <artifactId>copycat-core</artifactId>
+            <version>${copycat.version}</version>
+        </dependency>
+
         <dependency>
           <!-- FIXME once fixes get merged to upstream -->
           <groupId>org.onosproject</groupId>
@@ -99,7 +98,7 @@
             </filter>
 
             <filter>
-              <artifact>net.kuujo.copycat:*</artifact>
+              <artifact>org.onosproject:copycat*</artifact>
               <includes>
                 <include>net/kuujo/copycat/**</include>
               </includes>