diff --git a/aether-apps/infosys-deepstream/templates/_helpers.tpl b/aether-apps/infosys-deepstream/templates/_helpers.tpl
new file mode 100644
index 0000000..8120674
--- /dev/null
+++ b/aether-apps/infosys-deepstream/templates/_helpers.tpl
@@ -0,0 +1,36 @@
+{{- /*
+# Copyright 2020-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.
+*/ -}}
+
+{{/*
+Renders a set of standardised labels
+*/}}
+{{- define "deepstream.metadata_labels" -}}
+{{- $application := index . 0 -}}
+{{- $context := index . 1 -}}
+release: {{ $context.Release.Name }}
+app: {{ $application }}
+{{- end -}}
+
+{{/*
+Render the given template.
+*/}}
+{{- define "deepstream.template" -}}
+{{- $name := index . 0 -}}
+{{- $context := index . 1 -}}
+{{- $last := base $context.Template.Name }}
+{{- $wtf := $context.Template.Name | replace $last $name -}}
+{{ include $wtf $context }}
+{{- end -}}
diff --git a/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl b/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
new file mode 100755
index 0000000..15c96bc
--- /dev/null
+++ b/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
@@ -0,0 +1,28 @@
+################################################################################
+# Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+################################################################################
+[message-broker]
+password = {{ .Values.config.deepstream.amqp.password }}
+hostname = {{ .Values.config.deepstream.amqp.host }}
+username = {{ .Values.config.deepstream.amqp.username }}
+port = {{ .Values.config.deepstream.amqp.port }}
+exchange = amq.topic
+topic = jetson
diff --git a/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl b/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl
new file mode 100755
index 0000000..535897d
--- /dev/null
+++ b/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl
@@ -0,0 +1,94 @@
+[application]
+enable-perf-measurement=1
+perf-measurement-interval-sec=5
+
+[tiled-display]
+enable={{ .Values.config.deepstream.display.enabled }}
+rows=1
+columns=1
+width=900
+height=500
+gpu-id=0
+nvbuf-memory-type=4
+
+[source0]
+enable=1
+#Type - 1=CameraV4L2 2=URI 3=MultiURI 4=RTSP, 5=CSI
+type=2
+uri={{ .Values.config.deepstream.source }}
+num-sources=1
+#drop-frame-interval=5
+gpu-id=0
+cudadec-memtype=0
+
+[source1]
+enable=0
+#Type - 1=CameraV4L2 2=URI 3=MultiURI 4=RTSP, 5=CSI
+type=2
+uri=file:/root/deepstream_sdk_v4.0.2_jetson/samples/streams/sample_1080p_h265.mp4
+num-sources=1
+gpu-id=0
+cudadec-memtype=0
+
+[sink0]
+enable=1
+#Type - 1=FakeSink 2=EglSink 3=File 4=RTSPStreaming 5=Overlay
+type=5
+sync=0
+display-id=0
+offset-x=100
+offset-y=0
+width=900
+height=500
+overlay-id=1
+source-id=0
+
+[sink1]
+enable=1
+#Type - 1=FakeSink 2=EglSink 3=File 4=UDPSink 5=nvoverlaysink 6=MsgConvBroker
+type=6
+msg-conv-config=/configs/msg_config.txt
+msg-conv-payload-type=1
+msg-broker-proto-lib=/opt/nvidia/deepstream/deepstream-4.0/lib/libnvds_amqp_proto.so
+msg-broker-config=/configs/amqp_config.txt
+
+[osd]
+enable=1
+border-width=1
+text-size=0
+text-color=1;1;1;1;
+text-bg-color=0.3;0.3;0.3;0
+font=Serif
+show-clock=1
+clock-x-offset=10
+clock-y-offset=10
+clock-text-size=12
+clock-color=0;0;0;.8
+
+[streammux]
+live-source=1
+batch-size=1
+batched-push-timeout=40000
+width=1280
+height=720
+
+[primary-gie]
+enable=1
+batch-size=1
+bbox-border-color0=1;0;0;1
+bbox-border-color1=0;1;1;1
+bbox-border-color2=0;0;1;1
+bbox-border-color3=0;1;0;1
+interval=0
+gie-unique-id=1
+config-file=/configs/infer_config.txt
+
+[tracker]
+enable=1
+tracker-width=480
+tracker-height=272
+ll-lib-file=/opt/nvidia/deepstream/deepstream-4.0/lib/libnvds_nvdcf.so
+ll-config-file=/configs/tracker_config.yml
+gpu-id=0
+enable-batch-process=1
+
diff --git a/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml b/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml
new file mode 100644
index 0000000..5dad6ab
--- /dev/null
+++ b/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml
@@ -0,0 +1,33 @@
+{{- /*
+# Copyright 2020-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: ConfigMap
+metadata:
+  name: deepstream
+  labels:
+{{ tuple "deepstream" . | include "deepstream.metadata_labels" | indent 4 }}
+data:
+  main_config.txt: |
+{{ tuple "config/_main_config.txt.tpl" . | include "deepstream.template" | indent 4 }}
+  amqp_config.txt: |
+{{ tuple "config/_amqp_config.txt.tpl" . | include "deepstream.template" | indent 4 }}
+  infer_config.txt: |
+{{ .Files.Get "files/infer_config.txt" | indent 4 }}
+  msg_config.txt: |
+{{ .Files.Get "files/msg_config.txt" | indent 4 }}
+  tracker_config.yml: |
+{{ .Files.Get "files/tracker_config.yml" | indent 4 }}
diff --git a/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml b/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml
new file mode 100644
index 0000000..6684fdc
--- /dev/null
+++ b/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml
@@ -0,0 +1,66 @@
+{{- /*
+# Copyright 2020-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: apps/v1
+kind: Deployment
+metadata:
+  name: deepstream
+  labels:
+{{ tuple "deepstream" . | include "deepstream.metadata_labels" | indent 4 }}
+spec:
+  selector:
+    matchLabels:
+{{ tuple "deepstream" . | include "deepstream.metadata_labels" | indent 6 }}
+  template:
+    metadata:
+      labels:
+{{ tuple "deepstream" . | include "deepstream.metadata_labels" | indent 8 }}
+    spec:
+    {{- if .Values.nodeSelectors.enabled }}
+      nodeSelector:
+        {{ .Values.nodeSelectors.deepstream.label }}: {{ .Values.nodeSelectors.deepstream.value }}
+    {{- end }}
+      hostNetwork: true
+      containers:
+      - name: deepstream
+        image: {{ .Values.images.tags.deepstreamTx2 }}
+        imagePullPolicy: {{ .Values.images.pullPolicy }}
+      {{- if .Values.resources.enabled }}
+        resources:
+{{ toYaml .Values.resources.deepstream | indent 10 }}
+      {{- end }}
+        env:
+        - name: DISPLAY
+          value: {{ .Values.config.deepstream.display.display }}
+        volumeMounts:
+        - name: configs
+          mountPath: /configs
+          readOnly: true
+        - name: x11-unix
+          mountPath: /tmp/.X11-unix
+        - name: argus-socket
+          mountPath: /tmp/argus_socket
+      volumes:
+      - name: configs
+        configMap:
+          defaultMode: 0644
+          name: deepstream
+      - name: x11-unix
+        hostPath:
+          path: /tmp/.X11-unix
+      - name: argus-socket
+        hostPath:
+          path: /tmp/argus_socket