6 files changed, 16 insertions, 21 deletions
diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store
index 1515c79e..a5ad9e92 100644
--- a/vnfs/.DS_Store
+++ b/vnfs/.DS_Store
diff --git a/vnfs/honeycomb_plugin/.DS_Store b/vnfs/honeycomb_plugin/.DS_Store
index 8ab6e0a2..102e7ce1 100644
--- a/vnfs/honeycomb_plugin/.DS_Store
+++ b/vnfs/honeycomb_plugin/.DS_Store
diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index 7d99deb3..b80f8ef3 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -26,7 +26,7 @@
 </parent>
 
     <properties>
-        <!--nexusproxy>http://nexus.fd.io/content</nexusproxy-->
+        <nexusproxy>http://nexus.fd.io/content</nexusproxy>
         <start.script.template>
 #!/bin/sh -
 STATUS=100
@@ -58,10 +58,12 @@ done
         <osgi.core.version>5.0.0</osgi.core.version>
     </properties>
 
+    <!--groupId>io.fd.honeycomb.common</groupId-->
+    <!--artifactId>minimal-distribution-parent</artifactId-->
+    <!--version>1.16.9</version-->
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>minimal-distribution-parent</artifactId>
-    <version>1.16.9</version>
+    <artifactId>hc-openecomp</artifactId>
     <packaging>pom</packaging>
 
     <!-- Generate executable shell script -->
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index b37a19dd..492afbc3 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-<parent>
+<!--parent>
 <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>minimal-distribution-parent</artifactId>
     <version>1.16.9</version>
+</parent-->
+
+<parent>
+    <groupId>org.openecomp.demo.vnf</groupId>
+    <artifactId>hc-openecomp</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../parent-pom/pom.xml</relativePath>
 </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -16,7 +23,6 @@
     <lisp.version>1.16.9</lisp.version>
     <vpp.common.min.distro.version>1.16.9</vpp.common.min.distro.version>
     <vppnsh.version>1.16.9</vppnsh.version>
-    <honeycomb.infra.version>1.16.9</honeycomb.infra.version>
   </properties>
 
   <build>
@@ -81,23 +87,10 @@
       <version>${vppnsh.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.fd.honeycomb.common</groupId>
+      <groupId>org.openecomp.demo.vnf</groupId>
       <artifactId>sample-plugin-impl</artifactId>
-      <version>${honeycomb.infra.version}</version>
+      <version>latest</version>
     </dependency>
   </dependencies>
 
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>Demo Release Repository</name>
-            <url> https://nexus.openecomp.org/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>Demo Snapshot Repository</name>
-            <url> https://nexus.openecomp.org/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
 </project>
diff --git a/vnfs/vFW/.DS_Store b/vnfs/vFW/.DS_Store
index bd8024d5..d5659b63 100644
--- a/vnfs/vFW/.DS_Store
+++ b/vnfs/vFW/.DS_Store
diff --git a/vnfs/vLB/.DS_Store b/vnfs/vLB/.DS_Store
index ea2e0531..0c093730 100644
--- a/vnfs/vLB/.DS_Store
+++ b/vnfs/vLB/.DS_Store