diff --git a/kubernetes/cli/Chart.yaml b/kubernetes/cli/Chart.yaml
new file mode 100644
index 0000000..077cc6e
--- /dev/null
+++ b/kubernetes/cli/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: cli
+version: 0.1.0
diff --git a/kubernetes/cli/templates/all-service.yaml b/kubernetes/cli/templates/all-service.yaml
new file mode 100644
index 0000000..ffd9f68
--- /dev/null
+++ b/kubernetes/cli/templates/all-service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: cli
+  namespace: "{{ .Values.nsPrefix }}-cli"
+  labels:
+    app: cli
+spec:
+  ports:
+  - name: 80-port
+    port: 80
+    targetPort: 80
+    nodePort: {{ .Values.nodePortPrefix }}60
+  type: NodePort
+  selector:
+    app: cli
diff --git a/kubernetes/cli/templates/cli-deployment.yaml b/kubernetes/cli/templates/cli-deployment.yaml
new file mode 100644
index 0000000..88cb3eb
--- /dev/null
+++ b/kubernetes/cli/templates/cli-deployment.yaml
@@ -0,0 +1,34 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: cli
+  name: cli
+  namespace: "{{ .Values.nsPrefix }}-cli"
+spec:
+  selector:
+    matchLabels:
+      app: cli
+  template:
+    metadata:
+      labels:
+        app: cli
+      name: cli
+    spec:
+      containers:
+      - image:  {{ .Values.image.cliImage}}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: "cli"
+        env:
+        - name: CLI_MODE
+          value: daemon
+        ports:
+        - containerPort: 80
+          name: cli
+        readinessProbe:
+          tcpSocket:
+            port: 80
+          initialDelaySeconds: 5
+          periodSeconds: 10
+      imagePullSecrets:
+      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
new file mode 100644
index 0000000..b8fe44e
--- /dev/null
+++ b/kubernetes/cli/values.yaml
@@ -0,0 +1,5 @@
+nsPrefix: onap
+pullPolicy: Always
+nodePortPrefix: 302
+image:
+  cliImage: nexus3.onap.org:10001/onap/cli:1.1-STAGING-latest
diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash
index f39b555..c52f4d3 100644
--- a/kubernetes/oneclick/setenv.bash
+++ b/kubernetes/oneclick/setenv.bash
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcae' 'log')
+HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcae' 'log' 'cli')
 ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
 ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}
 ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker}