diff --git a/cmd/doc.go b/cmd/doc.go
index 035b202..6b1610b 100644
--- a/cmd/doc.go
+++ b/cmd/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/cmd/root.go b/cmd/root.go
index 6efbbdd..cdf050f 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,5 +1,7 @@
 // Copyright © 2020, 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/cmd/servicedirectory.go b/cmd/servicedirectory.go
index 2539eb5..9f25c93 100644
--- a/cmd/servicedirectory.go
+++ b/cmd/servicedirectory.go
@@ -1,5 +1,7 @@
 // Copyright © 2020, 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/cmd/version.go b/cmd/version.go
index 597f7e6..a4e0eb9 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/main.go b/main.go
index d2c84c0..8692c7b 100644
--- a/main.go
+++ b/main.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/cloudmap/cloudmap.go b/pkg/cmd/poll/cloudmap/cloudmap.go
index aec47c5..a1d8e63 100644
--- a/pkg/cmd/poll/cloudmap/cloudmap.go
+++ b/pkg/cmd/poll/cloudmap/cloudmap.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/cloudmap/cloudmap_test.go b/pkg/cmd/poll/cloudmap/cloudmap_test.go
index 8568bd0..0d210bb 100644
--- a/pkg/cmd/poll/cloudmap/cloudmap_test.go
+++ b/pkg/cmd/poll/cloudmap/cloudmap_test.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/cloudmap/command.go b/pkg/cmd/poll/cloudmap/command.go
index e5cee90..e3cdec8 100644
--- a/pkg/cmd/poll/cloudmap/command.go
+++ b/pkg/cmd/poll/cloudmap/command.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/cloudmap/doc.go b/pkg/cmd/poll/cloudmap/doc.go
index c77ae35..c401327 100644
--- a/pkg/cmd/poll/cloudmap/doc.go
+++ b/pkg/cmd/poll/cloudmap/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/cloudmap/fake_servicediscovery.go b/pkg/cmd/poll/cloudmap/fake_servicediscovery.go
index 8717324..2c394fb 100644
--- a/pkg/cmd/poll/cloudmap/fake_servicediscovery.go
+++ b/pkg/cmd/poll/cloudmap/fake_servicediscovery.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/cloudmap/options.go b/pkg/cmd/poll/cloudmap/options.go
index af5d3ee..8034259 100644
--- a/pkg/cmd/poll/cloudmap/options.go
+++ b/pkg/cmd/poll/cloudmap/options.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/cloudmap/utils.go b/pkg/cmd/poll/cloudmap/utils.go
index 8d85c9c..1b20e3e 100644
--- a/pkg/cmd/poll/cloudmap/utils.go
+++ b/pkg/cmd/poll/cloudmap/utils.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/cloudmap/utils_test.go b/pkg/cmd/poll/cloudmap/utils_test.go
index 06c9d52..569802c 100644
--- a/pkg/cmd/poll/cloudmap/utils_test.go
+++ b/pkg/cmd/poll/cloudmap/utils_test.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/cloudmap/vars.go b/pkg/cmd/poll/cloudmap/vars.go
index 9d5acd9..f3e1364 100644
--- a/pkg/cmd/poll/cloudmap/vars.go
+++ b/pkg/cmd/poll/cloudmap/vars.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/command.go b/pkg/cmd/poll/command.go
index 89e49db..9d715d9 100644
--- a/pkg/cmd/poll/command.go
+++ b/pkg/cmd/poll/command.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/doc.go b/pkg/cmd/poll/doc.go
index b0c6eeb..d3ae717 100644
--- a/pkg/cmd/poll/doc.go
+++ b/pkg/cmd/poll/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/poll/vars.go b/pkg/cmd/poll/vars.go
index 2c4b95b..1ecf4d4 100644
--- a/pkg/cmd/poll/vars.go
+++ b/pkg/cmd/poll/vars.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/command.go b/pkg/cmd/watch/command.go
index 86a0ea2..abe7846 100644
--- a/pkg/cmd/watch/command.go
+++ b/pkg/cmd/watch/command.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/doc.go b/pkg/cmd/watch/doc.go
index c307bdc..3ebc819 100644
--- a/pkg/cmd/watch/doc.go
+++ b/pkg/cmd/watch/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/command.go b/pkg/cmd/watch/etcd/command.go
index cd52ba3..bf28a62 100644
--- a/pkg/cmd/watch/etcd/command.go
+++ b/pkg/cmd/watch/etcd/command.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/doc.go b/pkg/cmd/watch/etcd/doc.go
index 35891f8..6ac372b 100644
--- a/pkg/cmd/watch/etcd/doc.go
+++ b/pkg/cmd/watch/etcd/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/fake_kv.go b/pkg/cmd/watch/etcd/fake_kv.go
index 179d5af..e215239 100644
--- a/pkg/cmd/watch/etcd/fake_kv.go
+++ b/pkg/cmd/watch/etcd/fake_kv.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/fake_queue.go b/pkg/cmd/watch/etcd/fake_queue.go
index 58cd8f2..ea5c51c 100644
--- a/pkg/cmd/watch/etcd/fake_queue.go
+++ b/pkg/cmd/watch/etcd/fake_queue.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/fake_sr.go b/pkg/cmd/watch/etcd/fake_sr.go
index faf7b26..0064546 100644
--- a/pkg/cmd/watch/etcd/fake_sr.go
+++ b/pkg/cmd/watch/etcd/fake_sr.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/options.go b/pkg/cmd/watch/etcd/options.go
index 3064215..55fda4a 100644
--- a/pkg/cmd/watch/etcd/options.go
+++ b/pkg/cmd/watch/etcd/options.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/utils.go b/pkg/cmd/watch/etcd/utils.go
index f6622d0..b50b29e 100644
--- a/pkg/cmd/watch/etcd/utils.go
+++ b/pkg/cmd/watch/etcd/utils.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/utils_test.go b/pkg/cmd/watch/etcd/utils_test.go
index 37d403a..fb92cad 100644
--- a/pkg/cmd/watch/etcd/utils_test.go
+++ b/pkg/cmd/watch/etcd/utils_test.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/vars.go b/pkg/cmd/watch/etcd/vars.go
index 9e63e84..e382795 100644
--- a/pkg/cmd/watch/etcd/vars.go
+++ b/pkg/cmd/watch/etcd/vars.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/watcher.go b/pkg/cmd/watch/etcd/watcher.go
index c3b6d2b..a28cf63 100644
--- a/pkg/cmd/watch/etcd/watcher.go
+++ b/pkg/cmd/watch/etcd/watcher.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/cmd/watch/etcd/watcher_test.go b/pkg/cmd/watch/etcd/watcher_test.go
index 404a733..dd33574 100644
--- a/pkg/cmd/watch/etcd/watcher_test.go
+++ b/pkg/cmd/watch/etcd/watcher_test.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/configuration/configuration.go b/pkg/configuration/configuration.go
index 74029eb..bc09a80 100644
--- a/pkg/configuration/configuration.go
+++ b/pkg/configuration/configuration.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/configuration/types.go b/pkg/configuration/types.go
index 64ef5f8..bfa196a 100644
--- a/pkg/configuration/types.go
+++ b/pkg/configuration/types.go
@@ -1,5 +1,7 @@
 // Copyright © 2021 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/internal/utils/utils.go b/pkg/internal/utils/utils.go
index b956eda..bb6735b 100644
--- a/pkg/internal/utils/utils.go
+++ b/pkg/internal/utils/utils.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/internal/utils/utils_test.go b/pkg/internal/utils/utils_test.go
index 670b2fd..931b1f6 100644
--- a/pkg/internal/utils/utils_test.go
+++ b/pkg/internal/utils/utils_test.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/api_events.go b/pkg/openapi/api_events.go
index 54f7c4a..f328104 100644
--- a/pkg/openapi/api_events.go
+++ b/pkg/openapi/api_events.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/client.go b/pkg/openapi/client.go
index 9c5c16d..0042eb9 100644
--- a/pkg/openapi/client.go
+++ b/pkg/openapi/client.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/configuration.go b/pkg/openapi/configuration.go
index 0a0b5de..0bde5f6 100644
--- a/pkg/openapi/configuration.go
+++ b/pkg/openapi/configuration.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/doc.go b/pkg/openapi/doc.go
index 2a0ea0a..7a55c7e 100644
--- a/pkg/openapi/doc.go
+++ b/pkg/openapi/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/model_errors.go b/pkg/openapi/model_errors.go
index e7b0323..037b762 100644
--- a/pkg/openapi/model_errors.go
+++ b/pkg/openapi/model_errors.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/model_event.go b/pkg/openapi/model_event.go
index a33d81b..7f76925 100644
--- a/pkg/openapi/model_event.go
+++ b/pkg/openapi/model_event.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/model_metadata.go b/pkg/openapi/model_metadata.go
index a86d1d8..5807508 100644
--- a/pkg/openapi/model_metadata.go
+++ b/pkg/openapi/model_metadata.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/model_resource_response.go b/pkg/openapi/model_resource_response.go
index 98975a5..fd945cb 100644
--- a/pkg/openapi/model_resource_response.go
+++ b/pkg/openapi/model_resource_response.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/model_response.go b/pkg/openapi/model_response.go
index 5fc4063..4cc54f8 100644
--- a/pkg/openapi/model_response.go
+++ b/pkg/openapi/model_response.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/model_service.go b/pkg/openapi/model_service.go
index f0478e6..447728a 100644
--- a/pkg/openapi/model_service.go
+++ b/pkg/openapi/model_service.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/openapi/response.go b/pkg/openapi/response.go
index 7c06985..338ad16 100644
--- a/pkg/openapi/response.go
+++ b/pkg/openapi/response.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/poller/doc.go b/pkg/poller/doc.go
index 4fba99e..50398b6 100644
--- a/pkg/poller/doc.go
+++ b/pkg/poller/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/poller/poller.go b/pkg/poller/poller.go
index 820a20d..bf2ceef 100644
--- a/pkg/poller/poller.go
+++ b/pkg/poller/poller.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/poller/poller_test.go b/pkg/poller/poller_test.go
index 3290a34..1deb9fd 100644
--- a/pkg/poller/poller_test.go
+++ b/pkg/poller/poller_test.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/queue/doc.go b/pkg/queue/doc.go
index a153d64..edd126a 100644
--- a/pkg/queue/doc.go
+++ b/pkg/queue/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/queue/queue.go b/pkg/queue/queue.go
index af052fc..4f57959 100644
--- a/pkg/queue/queue.go
+++ b/pkg/queue/queue.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/queue/queue_test.go b/pkg/queue/queue_test.go
index e22cc54..74c1651 100644
--- a/pkg/queue/queue_test.go
+++ b/pkg/queue/queue_test.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/sdhandler/doc.go b/pkg/sdhandler/doc.go
index af644e0..da6b1a7 100644
--- a/pkg/sdhandler/doc.go
+++ b/pkg/sdhandler/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/sdhandler/interface.go b/pkg/sdhandler/interface.go
index c30d4ef..b64b82d 100644
--- a/pkg/sdhandler/interface.go
+++ b/pkg/sdhandler/interface.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/sdhandler/service_directory.go b/pkg/sdhandler/service_directory.go
index bd908cb..397597a 100644
--- a/pkg/sdhandler/service_directory.go
+++ b/pkg/sdhandler/service_directory.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/services/datastore.go b/pkg/services/datastore.go
index dc354ef..de2bc6b 100644
--- a/pkg/services/datastore.go
+++ b/pkg/services/datastore.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/services/datastore_test.go b/pkg/services/datastore_test.go
index 932c100..520c500 100644
--- a/pkg/services/datastore_test.go
+++ b/pkg/services/datastore_test.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/services/doc.go b/pkg/services/doc.go
index 7ead46a..2daa8cd 100644
--- a/pkg/services/doc.go
+++ b/pkg/services/doc.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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
diff --git a/pkg/services/handler.go b/pkg/services/handler.go
index 8634ca6..50971a9 100644
--- a/pkg/services/handler.go
+++ b/pkg/services/handler.go
@@ -1,5 +1,7 @@
 // Copyright © 2020 Cisco
 //
+// SPDX-License-Identifier: Apache-2.0
+//
 // 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