diff --git a/robot/assets/cmpv2/k8s-mongo-ves-client.yaml b/robot/assets/cmpv2/k8s-mongo-ves-client.yaml
new file mode 100644
index 0000000..4252399
--- /dev/null
+++ b/robot/assets/cmpv2/k8s-mongo-ves-client.yaml
@@ -0,0 +1,37 @@
+tosca_definitions_version: cloudify_dsl_1_3
+imports:
+  - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml'
+  - 'plugin:k8splugin?version=>=3.4.2,<4.0.0'
+inputs:
+  tag_version:
+    type: string
+    description: Docker image to be used
+    default: 'mongo'
+  replicas:
+    type: integer
+    description: Number of instances
+    default: 1
+  service_component_type:
+    type: string
+    default: "mongo-ves-client"
+  service_component_name_override:
+    type: string
+    default: "mongo-ves-client"
+node_templates:
+  mongo:
+    type: dcae.nodes.ContainerizedServiceComponent
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        start:
+          inputs:
+            envs:
+              MONGO_INITDB_ROOT_USERNAME: root
+              MONGO_INITDB_ROOT_PASSWORD: zXcVbN123!
+              MONGO_INITDB_DATABASE: pnf_simulator
+            ports:
+              - '27017:0'
+    properties:
+      service_component_type: { get_input: service_component_type }
+      service_component_name_override: { get_input: service_component_name_override }
+      image: { get_input: tag_version }
+      replicas: { get_input: replicas }
diff --git a/robot/assets/cmpv2/k8s-mongo.yaml b/robot/assets/cmpv2/k8s-mongo.yaml
index 3823bff..010eb65 100644
--- a/robot/assets/cmpv2/k8s-mongo.yaml
+++ b/robot/assets/cmpv2/k8s-mongo.yaml
@@ -11,6 +11,12 @@
     type: integer
     description: Number of instances
     default: 1
+  service_component_type:
+    type: string
+    default: "mongo"
+  service_component_name_override:
+    type: string
+    default: "mongo"
 node_templates:
   mongo:
     type: dcae.nodes.ContainerizedServiceComponent
@@ -25,7 +31,7 @@
             ports:
               - '27017:0'
     properties:
-      service_component_type: mongo
-      service_component_name_override: mongo
+      service_component_type: { get_input: service_component_type }
+      service_component_name_override: { get_input: service_component_name_override }
       image: { get_input: tag_version }
       replicas: { get_input: replicas }
diff --git a/robot/assets/cmpv2/k8s-ves-client.yaml b/robot/assets/cmpv2/k8s-ves-client.yaml
new file mode 100644
index 0000000..cfb5fd5
--- /dev/null
+++ b/robot/assets/cmpv2/k8s-ves-client.yaml
@@ -0,0 +1,75 @@
+tosca_definitions_version: cloudify_dsl_1_3
+imports:
+  - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml'
+  - 'plugin:k8splugin?version=>=3.4.2,<4.0.0'
+inputs:
+  tag_version:
+    type: string
+    description: Docker image to be used
+    default: 'nexus3.onap.org:10001/onap/org.onap.integration.nfsimulator.vesclient:latest'
+  replicas:
+    type: integer
+    description: Number of instances
+    default: 1
+  external_cert_cert_type:
+    type: string
+    description: Output type
+    default: 'P12'
+  external_cert_ca_name:
+    type: string
+    description: Name of Certificate Authority configured on CertService side.
+    default: 'RA'
+  external_cert_common_name:
+    type: string
+    description: Common name which should be present in certificate.
+    default: 'ves-client'
+  external_cert_sans:
+    type: string
+    description: 'List of Subject Alternative Names (SANs) which should be present
+      in certificate. Delimiter - , Should contain common_name value and other FQDNs
+      under which given component is accessible.'
+    default: 'ves-client'
+  external_cert_use_external_tls:
+    type: boolean
+    description: Flag to indicate external tls enable/disable.
+    default: true
+  service_component_type:
+    type: string
+    default: "ves-client"
+  service_component_name_override:
+    type: string
+    default: "ves-client"
+node_templates:
+  ves-client:
+    type: dcae.nodes.ContainerizedServiceComponent
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        start:
+          inputs:
+            envs:
+              STRICT_HOSTNAME_VERIFICATION: 'true'
+              MONGO_HOSTNAME:
+                concat: ["mongo-", {get_input: service_component_name_override}]
+            ports:
+              - '5000:0'
+    properties:
+      service_component_type: { get_input: service_component_type }
+      service_component_name_override: { get_input: service_component_name_override }
+      image: { get_input: tag_version }
+      replicas: { get_input: replicas }
+      always_pull_image: true
+      tls_info:
+        cert_directory: '/app/store/'
+      external_cert:
+        external_cert_directory: '/app/store/'
+        use_external_tls:
+          get_input: external_cert_use_external_tls
+        cert_type:
+          get_input: external_cert_cert_type
+        ca_name:
+          get_input: external_cert_ca_name
+        external_certificate_parameters:
+          common_name:
+            get_input: external_cert_common_name
+          sans:
+            get_input: external_cert_sans