diff --git a/voltha/templates/vcli.yaml b/voltha/templates/vcli.yaml
new file mode 100644
index 0000000..76c8681
--- /dev/null
+++ b/voltha/templates/vcli.yaml
@@ -0,0 +1,68 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: vcli
+  namespace: {{ .Values.global.namespace }}
+  serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
+  labels:
+    name: vcli
+spec:
+  type: NodePort
+  ports:
+    - name: ssh
+      port: 5022
+      targetPort: 22
+      nodePort: {{ .Values.node_ports.vcli_port }}
+  selector:
+    app: vcli
+---
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  name: vcli
+  namespace: {{ .Values.global.namespace }}
+  serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
+spec:
+  replicas: 2
+  template:
+    metadata:
+      labels:
+        app: vcli
+      annotations:
+        cni: "weave"
+    spec:
+      serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
+      containers:
+        - name: vcli
+          image: {{ .Values.pull_docker_registry }}{{ .Values.images.vcli.repository }}:{{ .Values.images.vcli.tag }}
+          env:
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          args:
+{{ toYaml .Values.vcli_args |  indent 12 }} 
+          ports:
+            - containerPort: 22
+              name: ssh-port
+          imagePullPolicy: {{ .Values.image_pull_policy }}
+
+