diff --git a/docker-compose.yml b/docker-compose.yml
index b502884..68bb3d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,10 +21,16 @@
       context: hv-collector-main
       dockerfile: Dockerfile
     ports:
-      - "8081:8081/tcp"
+      - "6061:6061/tcp"
     depends_on:
       - kafka
+    volumes:
+      - /etc/ves-hv/:/etc/ves-hv/
   xnf-simulator:
     build:
       context: hv-collector-client-simulator
-      dockerfile: Dockerfile
\ No newline at end of file
+      dockerfile: Dockerfile
+    depends_on:
+      - hv-collector
+    volumes:
+      - /etc/ves-hv/:/etc/ves-hv/
\ No newline at end of file
diff --git a/hv-collector-client-simulator/Dockerfile b/hv-collector-client-simulator/Dockerfile
index b2d0a0f..159f900 100644
--- a/hv-collector-client-simulator/Dockerfile
+++ b/hv-collector-client-simulator/Dockerfile
@@ -4,3 +4,10 @@
 LABEL license.name="The Apache Software License, Version 2.0"
 LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
 LABEL maintainer="Nokia Wroclaw ONAP Team"
+
+WORKDIR /opt/ves-hv-client-simulator
+ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"]
+CMD ["--ves-host", "hv-collector", "--ves-port", "6061"]
+COPY target/libs/external/* ./
+COPY target/libs/internal/* ./
+COPY target/hv-collector-client-simulator-*.jar ./
\ No newline at end of file
diff --git a/hv-collector-client-simulator/pom.xml b/hv-collector-client-simulator/pom.xml
index 869d17d..0d0db3f 100644
--- a/hv-collector-client-simulator/pom.xml
+++ b/hv-collector-client-simulator/pom.xml
@@ -42,6 +42,7 @@
 
     <properties>
         <skipAnalysis>false</skipAnalysis>
+        <docker-image.name>ves-hv-collector-client-simulator</docker-image.name>
     </properties>
 
     <build>
@@ -56,6 +57,56 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <activation>
+                <property>
+                    <name>!skipDocker</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-internal-deps</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/libs/internal</outputDirectory>
+                                    <includeGroupIds>${project.parent.groupId}</includeGroupIds>
+                                    <includeScope>runtime</includeScope>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>copy-external-deps</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/libs/external</outputDirectory>
+                                    <excludeGroupIds>${project.parent.groupId}</excludeGroupIds>
+                                    <includeScope>runtime</includeScope>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <!--
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                    </plugin>
+                    -->
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
     <dependencies>
         <dependency>
diff --git a/hv-collector-client-simulator/src/main/kotlin/org.onap.dcae.collectors.veshv.main/config/ArgBasedClientConfiguration.kt b/hv-collector-client-simulator/src/main/kotlin/org.onap.dcae.collectors.veshv.main/config/ArgBasedClientConfiguration.kt
index decf325..1bf9046 100644
--- a/hv-collector-client-simulator/src/main/kotlin/org.onap.dcae.collectors.veshv.main/config/ArgBasedClientConfiguration.kt
+++ b/hv-collector-client-simulator/src/main/kotlin/org.onap.dcae.collectors.veshv.main/config/ArgBasedClientConfiguration.kt
@@ -37,14 +37,14 @@
 internal object ArgBasedClientConfiguration {
 
     private val OPT_VES_PORT = Option.builder("p")
-            .longOpt("port")
+            .longOpt("ves-port")
             .required()
             .hasArg()
             .desc("VesHvCollector port")
             .build()
 
     private val OPT_VES_HOST = Option.builder("h")
-            .longOpt("host")
+            .longOpt("ves-host")
             .required()
             .hasArg()
             .desc("VesHvCollector host")
diff --git a/hv-collector-main/Dockerfile b/hv-collector-main/Dockerfile
index ee7805b..ceb45ea 100644
--- a/hv-collector-main/Dockerfile
+++ b/hv-collector-main/Dockerfile
@@ -8,7 +8,6 @@
 EXPOSE 6061
 
 WORKDIR /opt/ves-hv-collector
-VOLUME /etc/ves-hv/
 ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"]
 CMD ["--listen-port", "6061"]
 COPY target/libs/external/* ./
diff --git a/ssl/Makefile b/ssl/Makefile
index d9d1027..2832650 100644
--- a/ssl/Makefile
+++ b/ssl/Makefile
@@ -1,7 +1,7 @@
 FILE=sample
 CA_PASSWD=onap
 SUBJ=/C=PL/ST=DL/L=Wroclaw/O=Nokia/OU=MANO
-CA=onap
+CA=trust
 
 sign: $(FILE).crt