diff --git a/aether-apps/infosys-deepstream/Chart.yaml b/aether-apps/infosys-deepstream/Chart.yaml
index 3e7b7c6..f63eb29 100644
--- a/aether-apps/infosys-deepstream/Chart.yaml
+++ b/aether-apps/infosys-deepstream/Chart.yaml
@@ -1,16 +1,7 @@
 # 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.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 ---
 apiVersion: v1
diff --git a/aether-apps/infosys-deepstream/files/infer_config.txt.license b/aether-apps/infosys-deepstream/files/infer_config.txt.license
new file mode 100644
index 0000000..995fb49
--- /dev/null
+++ b/aether-apps/infosys-deepstream/files/infer_config.txt.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
+
+SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only
\ No newline at end of file
diff --git a/aether-apps/infosys-deepstream/files/msg_config.txt.license b/aether-apps/infosys-deepstream/files/msg_config.txt.license
new file mode 100644
index 0000000..995fb49
--- /dev/null
+++ b/aether-apps/infosys-deepstream/files/msg_config.txt.license
@@ -0,0 +1,4 @@
+SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
+
+SPDX-License-Identifier: Apache-2.0
+SPDX-License-Identifier: LicenseRef-ONF-Member-Only
\ No newline at end of file
diff --git a/aether-apps/infosys-deepstream/files/tracker_config.yml b/aether-apps/infosys-deepstream/files/tracker_config.yml
index 5d2b678..fc4beda 100755
--- a/aether-apps/infosys-deepstream/files/tracker_config.yml
+++ b/aether-apps/infosys-deepstream/files/tracker_config.yml
@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 %YAML:1.0
 
 NvDCF:
diff --git a/aether-apps/infosys-deepstream/templates/_helpers.tpl b/aether-apps/infosys-deepstream/templates/_helpers.tpl
index 8120674..4432b21 100644
--- a/aether-apps/infosys-deepstream/templates/_helpers.tpl
+++ b/aether-apps/infosys-deepstream/templates/_helpers.tpl
@@ -1,17 +1,10 @@
 {{- /*
+
 # 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.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 {{/*
diff --git a/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl b/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
index 15c96bc..049d045 100755
--- a/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
+++ b/aether-apps/infosys-deepstream/templates/config/_amqp_config.txt.tpl
@@ -1,24 +1,8 @@
-################################################################################
 # 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.
-################################################################################
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 [message-broker]
 password = {{ .Values.config.deepstream.amqp.password }}
 hostname = {{ .Values.config.deepstream.amqp.host }}
diff --git a/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl b/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl
index 535897d..91624e1 100755
--- a/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl
+++ b/aether-apps/infosys-deepstream/templates/config/_main_config.txt.tpl
@@ -1,3 +1,8 @@
+# SPDX-FileCopyrightText: 2020 Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 [application]
 enable-perf-measurement=1
 perf-measurement-interval-sec=5
diff --git a/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml b/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml
index 5dad6ab..e4aed77 100644
--- a/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml
+++ b/aether-apps/infosys-deepstream/templates/configmap-deepstream.yaml
@@ -1,17 +1,10 @@
 {{- /*
+
 # 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.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 apiVersion: v1
diff --git a/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml b/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml
index 6684fdc..5036d5d 100644
--- a/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml
+++ b/aether-apps/infosys-deepstream/templates/deployment-deepstream.yaml
@@ -1,17 +1,10 @@
 {{- /*
+
 # 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.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
+
 */ -}}
 
 apiVersion: apps/v1
diff --git a/aether-apps/infosys-deepstream/values.yaml b/aether-apps/infosys-deepstream/values.yaml
index 76f6d9c..1335f45 100644
--- a/aether-apps/infosys-deepstream/values.yaml
+++ b/aether-apps/infosys-deepstream/values.yaml
@@ -1,16 +1,7 @@
 # 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.
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only
 
 images:
   tags: