diff --git a/aether-apps/ott-services/cdn-remote/Chart.yaml b/aether-apps/ott-services/cdn-remote/Chart.yaml
index 6c6c2fb..72adc79 100644
--- a/aether-apps/ott-services/cdn-remote/Chart.yaml
+++ b/aether-apps/ott-services/cdn-remote/Chart.yaml
@@ -1,17 +1,9 @@
 ---
+
 # Copyright 2019-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
 appVersion: "1.0"
diff --git a/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl b/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl
index 69921bd..2d09c3a 100644
--- a/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl
+++ b/aether-apps/ott-services/cdn-remote/templates/_helpers.tpl
@@ -1,17 +1,8 @@
 {{- /*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-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/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl b/aether-apps/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl
index 2d928b3..6598f9c 100644
--- a/aether-apps/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl
+++ b/aether-apps/ott-services/cdn-remote/templates/bin/_start-stream.sh.tpl
@@ -1,18 +1,9 @@
 #!/bin/bash
-#
+
 # Copyright 2019-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
 
 QUALITY=$1
 
diff --git a/aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml b/aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml
index 29fa3c8..4a94c94 100644
--- a/aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml
+++ b/aether-apps/ott-services/cdn-remote/templates/configmap-video-archive.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-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/ott-services/cdn-remote/templates/service-ant-media.yaml b/aether-apps/ott-services/cdn-remote/templates/service-ant-media.yaml
index ba31e53..d1dcdc1 100644
--- a/aether-apps/ott-services/cdn-remote/templates/service-ant-media.yaml
+++ b/aether-apps/ott-services/cdn-remote/templates/service-ant-media.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-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/ott-services/cdn-remote/templates/statefulset-ant-media.yaml b/aether-apps/ott-services/cdn-remote/templates/statefulset-ant-media.yaml
index 1e9778a..3564e21 100644
--- a/aether-apps/ott-services/cdn-remote/templates/statefulset-ant-media.yaml
+++ b/aether-apps/ott-services/cdn-remote/templates/statefulset-ant-media.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-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
 */}}
 
 {{ tuple "ant-media" . | include "cdn-remote.service_account" }}
diff --git a/aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml b/aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml
index 2f5460a..56cf009 100644
--- a/aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml
+++ b/aether-apps/ott-services/cdn-remote/templates/statefulset-video-archive.yaml
@@ -1,17 +1,8 @@
 {{/*
-Copyright 2019-present Open Networking Foundation
+# Copyright 2019-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
 */}}
 
 {{ tuple "video-archive" . | include "cdn-remote.service_account" }}
diff --git a/aether-apps/ott-services/cdn-remote/values.yaml b/aether-apps/ott-services/cdn-remote/values.yaml
index c515371..4d9e642 100644
--- a/aether-apps/ott-services/cdn-remote/values.yaml
+++ b/aether-apps/ott-services/cdn-remote/values.yaml
@@ -1,17 +1,9 @@
 ---
+
 # Copyright 2019-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: