diff --git a/containerm/api/doc.go b/containerm/api/doc.go
index ce905f3..d35efc6 100644
--- a/containerm/api/doc.go
+++ b/containerm/api/doc.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Package api provides the gRPC API of containerm
 package api
diff --git a/containerm/api/services/containers/containers.proto b/containerm/api/services/containers/containers.proto
index 6abe563..e910155 100644
--- a/containerm/api/services/containers/containers.proto
+++ b/containerm/api/services/containers/containers.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/services/containers/doc.go b/containerm/api/services/containers/doc.go
index 1154268..8665acc 100644
--- a/containerm/api/services/containers/doc.go
+++ b/containerm/api/services/containers/doc.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Package containers provides definition of the Containers gRPC service
 package containers
diff --git a/containerm/api/services/doc.go b/containerm/api/services/doc.go
index e409d3e..1adee3c 100644
--- a/containerm/api/services/doc.go
+++ b/containerm/api/services/doc.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Package services provides the proto definitions of all gRPC services provided by containerm
 package services
diff --git a/containerm/api/services/sysinfo/doc.go b/containerm/api/services/sysinfo/doc.go
index 95eb181..8e1b15d 100644
--- a/containerm/api/services/sysinfo/doc.go
+++ b/containerm/api/services/sysinfo/doc.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Package sysinfo provides type definition of the SystemInfo gRPC service
 package sysinfo
diff --git a/containerm/api/services/sysinfo/system_info.proto b/containerm/api/services/sysinfo/system_info.proto
index 42dbb98..58cd222 100644
--- a/containerm/api/services/sysinfo/system_info.proto
+++ b/containerm/api/services/sysinfo/system_info.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/container.proto b/containerm/api/types/containers/container.proto
index 0ed1621..2a91ebc 100644
--- a/containerm/api/types/containers/container.proto
+++ b/containerm/api/types/containers/container.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/container_config.proto b/containerm/api/types/containers/container_config.proto
index 65d63e5..9bc714c 100644
--- a/containerm/api/types/containers/container_config.proto
+++ b/containerm/api/types/containers/container_config.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/decrypt_config.proto b/containerm/api/types/containers/decrypt_config.proto
index fd0ff39..f028321 100644
--- a/containerm/api/types/containers/decrypt_config.proto
+++ b/containerm/api/types/containers/decrypt_config.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/device_mapping.proto b/containerm/api/types/containers/device_mapping.proto
index b38fd3a..bc9a62a 100644
--- a/containerm/api/types/containers/device_mapping.proto
+++ b/containerm/api/types/containers/device_mapping.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/doc.go b/containerm/api/types/containers/doc.go
index 2a83ccc..5e72f80 100644
--- a/containerm/api/types/containers/doc.go
+++ b/containerm/api/types/containers/doc.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Package containers provides type definitions used by the Containers gRPC service
 package containers
diff --git a/containerm/api/types/containers/endpoint_settings.proto b/containerm/api/types/containers/endpoint_settings.proto
index c292b36..84661d9 100644
--- a/containerm/api/types/containers/endpoint_settings.proto
+++ b/containerm/api/types/containers/endpoint_settings.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/hook.proto b/containerm/api/types/containers/hook.proto
index f564c8a..bbb7acd 100644
--- a/containerm/api/types/containers/hook.proto
+++ b/containerm/api/types/containers/hook.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/host_config.proto b/containerm/api/types/containers/host_config.proto
index 701d56b..15d471f 100644
--- a/containerm/api/types/containers/host_config.proto
+++ b/containerm/api/types/containers/host_config.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/image.proto b/containerm/api/types/containers/image.proto
index 6cc646b..0e010f3 100644
--- a/containerm/api/types/containers/image.proto
+++ b/containerm/api/types/containers/image.proto
@@ -1,4 +1,3 @@
-
 // Copyright (c) 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
@@ -6,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/io_config.proto b/containerm/api/types/containers/io_config.proto
index 4257a52..435ecf5 100644
--- a/containerm/api/types/containers/io_config.proto
+++ b/containerm/api/types/containers/io_config.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/log_config.proto b/containerm/api/types/containers/log_config.proto
index 5d768ef..d39b1c3 100644
--- a/containerm/api/types/containers/log_config.proto
+++ b/containerm/api/types/containers/log_config.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/mount_point.proto b/containerm/api/types/containers/mount_point.proto
index 315db17..1227fd4 100644
--- a/containerm/api/types/containers/mount_point.proto
+++ b/containerm/api/types/containers/mount_point.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/network_settings.proto b/containerm/api/types/containers/network_settings.proto
index b886a1a..6d216f1 100644
--- a/containerm/api/types/containers/network_settings.proto
+++ b/containerm/api/types/containers/network_settings.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/port_mapping.proto b/containerm/api/types/containers/port_mapping.proto
index 8124da7..de82829 100644
--- a/containerm/api/types/containers/port_mapping.proto
+++ b/containerm/api/types/containers/port_mapping.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/resources.proto b/containerm/api/types/containers/resources.proto
index e2d2225..5f95ff8 100644
--- a/containerm/api/types/containers/resources.proto
+++ b/containerm/api/types/containers/resources.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/restart_policy.proto b/containerm/api/types/containers/restart_policy.proto
index c1ec2c7..d8cdf96 100644
--- a/containerm/api/types/containers/restart_policy.proto
+++ b/containerm/api/types/containers/restart_policy.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/state.proto b/containerm/api/types/containers/state.proto
index bbac2e7..a1dff0c 100644
--- a/containerm/api/types/containers/state.proto
+++ b/containerm/api/types/containers/state.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/stop_options.proto b/containerm/api/types/containers/stop_options.proto
index abb76e0..4d3ce8a 100644
--- a/containerm/api/types/containers/stop_options.proto
+++ b/containerm/api/types/containers/stop_options.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/containers/update_options.proto b/containerm/api/types/containers/update_options.proto
index 962b7a0..e96e9f6 100644
--- a/containerm/api/types/containers/update_options.proto
+++ b/containerm/api/types/containers/update_options.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/api/types/doc.go b/containerm/api/types/doc.go
index b770bde..f8b975a 100644
--- a/containerm/api/types/doc.go
+++ b/containerm/api/types/doc.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Package types provides type definitions used by all gRPC services provided by containerm
 package types
diff --git a/containerm/api/types/sysinfo/doc.go b/containerm/api/types/sysinfo/doc.go
index 17c7066..d28dc27 100644
--- a/containerm/api/types/sysinfo/doc.go
+++ b/containerm/api/types/sysinfo/doc.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Package sysinfo provides type definitions used by the SystemInfo gRPC service
 package sysinfo
diff --git a/containerm/api/types/sysinfo/project_info.proto b/containerm/api/types/sysinfo/project_info.proto
index 6d3e884..e9fb865 100644
--- a/containerm/api/types/sysinfo/project_info.proto
+++ b/containerm/api/types/sysinfo/project_info.proto
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 syntax = "proto3";
 
diff --git a/containerm/cli/cli.go b/containerm/cli/cli.go
index 107bfe3..ff9a403 100644
--- a/containerm/cli/cli.go
+++ b/containerm/cli/cli.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_commamd_ctrs_base_test.go b/containerm/cli/cli_commamd_ctrs_base_test.go
index 198e2c7..5e72273 100644
--- a/containerm/cli/cli_commamd_ctrs_base_test.go
+++ b/containerm/cli/cli_commamd_ctrs_base_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command.go b/containerm/cli/cli_command.go
index 135d1bf..f1b6644 100644
--- a/containerm/cli/cli_command.go
+++ b/containerm/cli/cli_command.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_create.go b/containerm/cli/cli_command_ctrs_create.go
index 4f48c33..ad2951b 100644
--- a/containerm/cli/cli_command_ctrs_create.go
+++ b/containerm/cli/cli_command_ctrs_create.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_create_test.go b/containerm/cli/cli_command_ctrs_create_test.go
index a64c57d..19f6df4 100644
--- a/containerm/cli/cli_command_ctrs_create_test.go
+++ b/containerm/cli/cli_command_ctrs_create_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_get_info.go b/containerm/cli/cli_command_ctrs_get_info.go
index 1471c85..8828d44 100644
--- a/containerm/cli/cli_command_ctrs_get_info.go
+++ b/containerm/cli/cli_command_ctrs_get_info.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_get_info_test.go b/containerm/cli/cli_command_ctrs_get_info_test.go
index 894a466..6751f9c 100644
--- a/containerm/cli/cli_command_ctrs_get_info_test.go
+++ b/containerm/cli/cli_command_ctrs_get_info_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_list.go b/containerm/cli/cli_command_ctrs_list.go
index 721faab..7a170d9 100644
--- a/containerm/cli/cli_command_ctrs_list.go
+++ b/containerm/cli/cli_command_ctrs_list.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_list_test.go b/containerm/cli/cli_command_ctrs_list_test.go
index 2967315..883162a 100644
--- a/containerm/cli/cli_command_ctrs_list_test.go
+++ b/containerm/cli/cli_command_ctrs_list_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_remove.go b/containerm/cli/cli_command_ctrs_remove.go
index d9e8c49..8981e3c 100644
--- a/containerm/cli/cli_command_ctrs_remove.go
+++ b/containerm/cli/cli_command_ctrs_remove.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_remove_test.go b/containerm/cli/cli_command_ctrs_remove_test.go
index c9b7a70..3959661 100644
--- a/containerm/cli/cli_command_ctrs_remove_test.go
+++ b/containerm/cli/cli_command_ctrs_remove_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_rename.go b/containerm/cli/cli_command_ctrs_rename.go
index 836f77c..78681c9 100644
--- a/containerm/cli/cli_command_ctrs_rename.go
+++ b/containerm/cli/cli_command_ctrs_rename.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_rename_test.go b/containerm/cli/cli_command_ctrs_rename_test.go
index 290fb57..44f50c0 100644
--- a/containerm/cli/cli_command_ctrs_rename_test.go
+++ b/containerm/cli/cli_command_ctrs_rename_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_start.go b/containerm/cli/cli_command_ctrs_start.go
index f5ee0d4..ab6476e 100644
--- a/containerm/cli/cli_command_ctrs_start.go
+++ b/containerm/cli/cli_command_ctrs_start.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_start_test.go b/containerm/cli/cli_command_ctrs_start_test.go
index 58160e5..3cfc2d2 100644
--- a/containerm/cli/cli_command_ctrs_start_test.go
+++ b/containerm/cli/cli_command_ctrs_start_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_stop.go b/containerm/cli/cli_command_ctrs_stop.go
index febd558..3a4336f 100644
--- a/containerm/cli/cli_command_ctrs_stop.go
+++ b/containerm/cli/cli_command_ctrs_stop.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_stop_test.go b/containerm/cli/cli_command_ctrs_stop_test.go
index ec65feb..9c17e95 100644
--- a/containerm/cli/cli_command_ctrs_stop_test.go
+++ b/containerm/cli/cli_command_ctrs_stop_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_update.go b/containerm/cli/cli_command_ctrs_update.go
index c41c649..de40e36 100644
--- a/containerm/cli/cli_command_ctrs_update.go
+++ b/containerm/cli/cli_command_ctrs_update.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_ctrs_update_test.go b/containerm/cli/cli_command_ctrs_update_test.go
index 29a2a4f..d7fac7c 100644
--- a/containerm/cli/cli_command_ctrs_update_test.go
+++ b/containerm/cli/cli_command_ctrs_update_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_sys_info.go b/containerm/cli/cli_command_sys_info.go
index b662afd..4d93afd 100644
--- a/containerm/cli/cli_command_sys_info.go
+++ b/containerm/cli/cli_command_sys_info.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_command_sys_info_test.go b/containerm/cli/cli_command_sys_info_test.go
index eae0a92..8f4e94d 100644
--- a/containerm/cli/cli_command_sys_info_test.go
+++ b/containerm/cli/cli_command_sys_info_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_config.go b/containerm/cli/cli_config.go
index 961f480..14fdb2e 100644
--- a/containerm/cli/cli_config.go
+++ b/containerm/cli/cli_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_io_util.go b/containerm/cli/cli_io_util.go
index 22a5e24..6647f08 100644
--- a/containerm/cli/cli_io_util.go
+++ b/containerm/cli/cli_io_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/cli/cli_start.go b/containerm/cli/cli_start.go
index 522b052..ac1b350 100644
--- a/containerm/cli/cli_start.go
+++ b/containerm/cli/cli_start.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/client/client.go b/containerm/client/client.go
index 7c58507..31517e0 100644
--- a/containerm/client/client.go
+++ b/containerm/client/client.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/containerm/client/client_api.go b/containerm/client/client_api.go
index 201faca..4d5f55d 100644
--- a/containerm/client/client_api.go
+++ b/containerm/client/client_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/containerm/client/client_filters.go b/containerm/client/client_filters.go
index 59abe8a..2e17288 100644
--- a/containerm/client/client_filters.go
+++ b/containerm/client/client_filters.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/containerm/client/client_init.go b/containerm/client/client_init.go
index ac2dff4..00da5bd 100644
--- a/containerm/client/client_init.go
+++ b/containerm/client/client_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/containerm/client/client_test.go b/containerm/client/client_test.go
index c77da27..b726f13 100644
--- a/containerm/client/client_test.go
+++ b/containerm/client/client_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/containerm/containers/types/container.go b/containerm/containers/types/container.go
index bbc6b55..6bfbc5c 100644
--- a/containerm/containers/types/container.go
+++ b/containerm/containers/types/container.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/container_config.go b/containerm/containers/types/container_config.go
index 3dba5fb..3cbcbf5 100644
--- a/containerm/containers/types/container_config.go
+++ b/containerm/containers/types/container_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/decrypt_config.go b/containerm/containers/types/decrypt_config.go
index b6ada17..398689f 100644
--- a/containerm/containers/types/decrypt_config.go
+++ b/containerm/containers/types/decrypt_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/device_mapping.go b/containerm/containers/types/device_mapping.go
index 7e5ff5b..1f81164 100644
--- a/containerm/containers/types/device_mapping.go
+++ b/containerm/containers/types/device_mapping.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/endpoint_settings.go b/containerm/containers/types/endpoint_settings.go
index b648411..475f24a 100644
--- a/containerm/containers/types/endpoint_settings.go
+++ b/containerm/containers/types/endpoint_settings.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/event.go b/containerm/containers/types/event.go
index 3b08195..76e6e15 100644
--- a/containerm/containers/types/event.go
+++ b/containerm/containers/types/event.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/hook.go b/containerm/containers/types/hook.go
index da43379..44d4813 100644
--- a/containerm/containers/types/hook.go
+++ b/containerm/containers/types/hook.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/host_config.go b/containerm/containers/types/host_config.go
index b0ce5af..1a561ff 100644
--- a/containerm/containers/types/host_config.go
+++ b/containerm/containers/types/host_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/image.go b/containerm/containers/types/image.go
index d33150c..271bb92 100644
--- a/containerm/containers/types/image.go
+++ b/containerm/containers/types/image.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/io_config.go b/containerm/containers/types/io_config.go
index 09801ac..7d6e418 100644
--- a/containerm/containers/types/io_config.go
+++ b/containerm/containers/types/io_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/log_config.go b/containerm/containers/types/log_config.go
index f5af6d5..7b3cb3e 100644
--- a/containerm/containers/types/log_config.go
+++ b/containerm/containers/types/log_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/metrics.go b/containerm/containers/types/metrics.go
index d38f299..dec0bb3 100644
--- a/containerm/containers/types/metrics.go
+++ b/containerm/containers/types/metrics.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl_2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX_License_Identifier: EPL_2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/mount_point.go b/containerm/containers/types/mount_point.go
index 24b45b7..5fda32c 100644
--- a/containerm/containers/types/mount_point.go
+++ b/containerm/containers/types/mount_point.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/network_settings.go b/containerm/containers/types/network_settings.go
index 33e4630..856e9c0 100644
--- a/containerm/containers/types/network_settings.go
+++ b/containerm/containers/types/network_settings.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/port_mapping.go b/containerm/containers/types/port_mapping.go
index e3fe347..20d0b8e 100644
--- a/containerm/containers/types/port_mapping.go
+++ b/containerm/containers/types/port_mapping.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/resources.go b/containerm/containers/types/resources.go
index a96c99f..8ace549 100644
--- a/containerm/containers/types/resources.go
+++ b/containerm/containers/types/resources.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/restart_policy.go b/containerm/containers/types/restart_policy.go
index 2f48520..9d259f5 100644
--- a/containerm/containers/types/restart_policy.go
+++ b/containerm/containers/types/restart_policy.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/state.go b/containerm/containers/types/state.go
index 4550283..c0e5bce 100644
--- a/containerm/containers/types/state.go
+++ b/containerm/containers/types/state.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/stop_opts.go b/containerm/containers/types/stop_opts.go
index 256dced..e518e67 100644
--- a/containerm/containers/types/stop_opts.go
+++ b/containerm/containers/types/stop_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/containers/types/update_opts.go b/containerm/containers/types/update_opts.go
index 8f337e6..01fde40 100644
--- a/containerm/containers/types/update_opts.go
+++ b/containerm/containers/types/update_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/ctr/ctr_client_api.go b/containerm/ctr/ctr_client_api.go
index e77fc51..4d8a78e 100644
--- a/containerm/ctr/ctr_client_api.go
+++ b/containerm/ctr/ctr_client_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctr_client_opts.go b/containerm/ctr/ctr_client_opts.go
index 9ad1ee1..01e7926 100644
--- a/containerm/ctr/ctr_client_opts.go
+++ b/containerm/ctr/ctr_client_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctr_client_opts_test.go b/containerm/ctr/ctr_client_opts_test.go
index 27c14cc..f5c76c8 100644
--- a/containerm/ctr/ctr_client_opts_test.go
+++ b/containerm/ctr/ctr_client_opts_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctr_tls_util.go b/containerm/ctr/ctr_tls_util.go
index 54e1880..0cd099b 100644
--- a/containerm/ctr/ctr_tls_util.go
+++ b/containerm/ctr/ctr_tls_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctr_tls_util_test.go b/containerm/ctr/ctr_tls_util_test.go
index fe68ddc..32eb430 100644
--- a/containerm/ctr/ctr_tls_util_test.go
+++ b/containerm/ctr/ctr_tls_util_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_cache.go b/containerm/ctr/ctrd_cache.go
index 53b993e..8d43fa1 100644
--- a/containerm/ctr/ctrd_cache.go
+++ b/containerm/ctr/ctrd_cache.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_cache_test.go b/containerm/ctr/ctrd_cache_test.go
index f754c53..da6d5f0 100644
--- a/containerm/ctr/ctrd_cache_test.go
+++ b/containerm/ctr/ctrd_cache_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_checkpoint_test.go b/containerm/ctr/ctrd_checkpoint_test.go
index 65df0c5..abe5b9d 100644
--- a/containerm/ctr/ctrd_checkpoint_test.go
+++ b/containerm/ctr/ctrd_checkpoint_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_cio_cache.go b/containerm/ctr/ctrd_cio_cache.go
index c19be07..99689d3 100644
--- a/containerm/ctr/ctrd_cio_cache.go
+++ b/containerm/ctr/ctrd_cio_cache.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_cio_cache_test.go b/containerm/ctr/ctrd_cio_cache_test.go
index d146e5d..8cc551b 100644
--- a/containerm/ctr/ctrd_cio_cache_test.go
+++ b/containerm/ctr/ctrd_cio_cache_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_cio_mgr.go b/containerm/ctr/ctrd_cio_mgr.go
index 676e5e1..80187a1 100644
--- a/containerm/ctr/ctrd_cio_mgr.go
+++ b/containerm/ctr/ctrd_cio_mgr.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_cio_mgr_internal_test.go b/containerm/ctr/ctrd_cio_mgr_internal_test.go
index 3a65c88..b8eb1fd 100644
--- a/containerm/ctr/ctrd_cio_mgr_internal_test.go
+++ b/containerm/ctr/ctrd_cio_mgr_internal_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_cio_mgr_mock.go b/containerm/ctr/ctrd_cio_mgr_mock.go
index a9c5130..24dcf32 100644
--- a/containerm/ctr/ctrd_cio_mgr_mock.go
+++ b/containerm/ctr/ctrd_cio_mgr_mock.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/ctr/ctrd_cio_mgr.go
diff --git a/containerm/ctr/ctrd_cio_mgr_test.go b/containerm/ctr/ctrd_cio_mgr_test.go
index 89666a3..2e81419 100644
--- a/containerm/ctr/ctrd_cio_mgr_test.go
+++ b/containerm/ctr/ctrd_cio_mgr_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_cio_mock.go b/containerm/ctr/ctrd_cio_mock.go
index 8f4628a..7b7c893 100644
--- a/containerm/ctr/ctrd_cio_mock.go
+++ b/containerm/ctr/ctrd_cio_mock.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/ctr/ctrd_cio.go
diff --git a/containerm/ctr/ctrd_cio_test.go b/containerm/ctr/ctrd_cio_test.go
index 0398d36..194c146 100644
--- a/containerm/ctr/ctrd_cio_test.go
+++ b/containerm/ctr/ctrd_cio_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_client.go b/containerm/ctr/ctrd_client.go
index 27712ef..9f6de11 100644
--- a/containerm/ctr/ctrd_client.go
+++ b/containerm/ctr/ctrd_client.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_client_init.go b/containerm/ctr/ctrd_client_init.go
index 0909545..5a3a0f3 100644
--- a/containerm/ctr/ctrd_client_init.go
+++ b/containerm/ctr/ctrd_client_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_client_internal.go b/containerm/ctr/ctrd_client_internal.go
index 8ed4867..a2fdc38 100644
--- a/containerm/ctr/ctrd_client_internal.go
+++ b/containerm/ctr/ctrd_client_internal.go
@@ -1,18 +1,14 @@
-// Copyright The PouchContainer Authors.
+// Copyright (c) 2021 Contributors to the Eclipse 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
+// See the NOTICE file(s) distributed with this work for additional
+// information regarding copyright ownership.
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://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.
-
-// Package name changed also removed not needed IOs logic and added custom code to handle the specific use case, Bosch.IO GmbH, 2020
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_client_internal_test.go b/containerm/ctr/ctrd_client_internal_test.go
index 2974bba..872ba4d 100644
--- a/containerm/ctr/ctrd_client_internal_test.go
+++ b/containerm/ctr/ctrd_client_internal_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_client_test.go b/containerm/ctr/ctrd_client_test.go
index fbf0c8d..44b5172 100644
--- a/containerm/ctr/ctrd_client_test.go
+++ b/containerm/ctr/ctrd_client_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_container_create_opts.go b/containerm/ctr/ctrd_container_create_opts.go
index 4f162dc..82b7723 100644
--- a/containerm/ctr/ctrd_container_create_opts.go
+++ b/containerm/ctr/ctrd_container_create_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_decrypt_mgr.go b/containerm/ctr/ctrd_decrypt_mgr.go
index c9150a2..fd6c663 100644
--- a/containerm/ctr/ctrd_decrypt_mgr.go
+++ b/containerm/ctr/ctrd_decrypt_mgr.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_decrypt_mgr_test.go b/containerm/ctr/ctrd_decrypt_mgr_test.go
index 20cab87..b76b8c3 100644
--- a/containerm/ctr/ctrd_decrypt_mgr_test.go
+++ b/containerm/ctr/ctrd_decrypt_mgr_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_log_mgr.go b/containerm/ctr/ctrd_log_mgr.go
index ea251e9..d1249d2 100644
--- a/containerm/ctr/ctrd_log_mgr.go
+++ b/containerm/ctr/ctrd_log_mgr.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_log_mgr_test.go b/containerm/ctr/ctrd_log_mgr_test.go
index c2b1177..739f9c4 100644
--- a/containerm/ctr/ctrd_log_mgr_test.go
+++ b/containerm/ctr/ctrd_log_mgr_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_metrics_util.go b/containerm/ctr/ctrd_metrics_util.go
index 78ff76a..4ae645c 100644
--- a/containerm/ctr/ctrd_metrics_util.go
+++ b/containerm/ctr/ctrd_metrics_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_metrics_util_test.go b/containerm/ctr/ctrd_metrics_util_test.go
index cb9582c..7398917 100755
--- a/containerm/ctr/ctrd_metrics_util_test.go
+++ b/containerm/ctr/ctrd_metrics_util_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_oci_linux.go b/containerm/ctr/ctrd_oci_linux.go
index ed77356..16dc24e 100644
--- a/containerm/ctr/ctrd_oci_linux.go
+++ b/containerm/ctr/ctrd_oci_linux.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_registries_resolver.go b/containerm/ctr/ctrd_registries_resolver.go
index f48774a..b9ff398 100644
--- a/containerm/ctr/ctrd_registries_resolver.go
+++ b/containerm/ctr/ctrd_registries_resolver.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_registries_resolver_test.go b/containerm/ctr/ctrd_registries_resolver_test.go
index f07ddd5..884d567 100644
--- a/containerm/ctr/ctrd_registries_resolver_test.go
+++ b/containerm/ctr/ctrd_registries_resolver_test.go
@@ -1,13 +1,14 @@
-// Copyright (c) 2022 Contributors to the Eclipse Foundation
+// Copyright (c) 2021 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_resource_watcher.go b/containerm/ctr/ctrd_resource_watcher.go
index 0ccaffc..509aeea 100644
--- a/containerm/ctr/ctrd_resource_watcher.go
+++ b/containerm/ctr/ctrd_resource_watcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_resource_watcher_mock.go b/containerm/ctr/ctrd_resource_watcher_mock.go
index 1205138..b2b8381 100644
--- a/containerm/ctr/ctrd_resource_watcher_mock.go
+++ b/containerm/ctr/ctrd_resource_watcher_mock.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./containerm/ctr/ctrd_resource_watcher.go
diff --git a/containerm/ctr/ctrd_spi.go b/containerm/ctr/ctrd_spi.go
index dfd6b70..d4dcd0a 100644
--- a/containerm/ctr/ctrd_spi.go
+++ b/containerm/ctr/ctrd_spi.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_containers.go b/containerm/ctr/ctrd_spi_containers.go
index 8f8bac7..9634082 100644
--- a/containerm/ctr/ctrd_spi_containers.go
+++ b/containerm/ctr/ctrd_spi_containers.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_containers_test.go b/containerm/ctr/ctrd_spi_containers_test.go
index 53cbea1..c995214 100644
--- a/containerm/ctr/ctrd_spi_containers_test.go
+++ b/containerm/ctr/ctrd_spi_containers_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_events.go b/containerm/ctr/ctrd_spi_events.go
index 48b27b3..ec500d7 100644
--- a/containerm/ctr/ctrd_spi_events.go
+++ b/containerm/ctr/ctrd_spi_events.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_events_test.go b/containerm/ctr/ctrd_spi_events_test.go
index 624fabc..7a4fa9f 100644
--- a/containerm/ctr/ctrd_spi_events_test.go
+++ b/containerm/ctr/ctrd_spi_events_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_images.go b/containerm/ctr/ctrd_spi_images.go
index 78a3475..aafe64d 100644
--- a/containerm/ctr/ctrd_spi_images.go
+++ b/containerm/ctr/ctrd_spi_images.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_images_test.go b/containerm/ctr/ctrd_spi_images_test.go
index 97f9420..53c4c31 100644
--- a/containerm/ctr/ctrd_spi_images_test.go
+++ b/containerm/ctr/ctrd_spi_images_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_internal.go b/containerm/ctr/ctrd_spi_internal.go
index eb0ecf9..f434200 100644
--- a/containerm/ctr/ctrd_spi_internal.go
+++ b/containerm/ctr/ctrd_spi_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_snapshots.go b/containerm/ctr/ctrd_spi_snapshots.go
index 49ca3a8..8491d04 100644
--- a/containerm/ctr/ctrd_spi_snapshots.go
+++ b/containerm/ctr/ctrd_spi_snapshots.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_snapshots_test.go b/containerm/ctr/ctrd_spi_snapshots_test.go
index 921966d..523695f 100644
--- a/containerm/ctr/ctrd_spi_snapshots_test.go
+++ b/containerm/ctr/ctrd_spi_snapshots_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/ctr/ctrd_spi_test.go b/containerm/ctr/ctrd_spi_test.go
index 5964d62..ee3244d 100644
--- a/containerm/ctr/ctrd_spi_test.go
+++ b/containerm/ctr/ctrd_spi_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package ctr
 
diff --git a/containerm/daemon/daemon.go b/containerm/daemon/daemon.go
index 76ff058..db5f104 100644
--- a/containerm/daemon/daemon.go
+++ b/containerm/daemon/daemon.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/daemon/daemon_command.go b/containerm/daemon/daemon_command.go
index d567bc5..c61a893 100644
--- a/containerm/daemon/daemon_command.go
+++ b/containerm/daemon/daemon_command.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/daemon/daemon_config.go b/containerm/daemon/daemon_config.go
index 4f44faf..4aaa8c2 100644
--- a/containerm/daemon/daemon_config.go
+++ b/containerm/daemon/daemon_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/daemon/daemon_config_default.go b/containerm/daemon/daemon_config_default.go
index 7f28c03..e005f75 100644
--- a/containerm/daemon/daemon_config_default.go
+++ b/containerm/daemon/daemon_config_default.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/daemon/daemon_config_util.go b/containerm/daemon/daemon_config_util.go
index 48d26ab..7e22a5a 100644
--- a/containerm/daemon/daemon_config_util.go
+++ b/containerm/daemon/daemon_config_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/daemon/daemon_internal.go b/containerm/daemon/daemon_internal.go
index d96fc85..f9c9c4b 100644
--- a/containerm/daemon/daemon_internal.go
+++ b/containerm/daemon/daemon_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/daemon/daemon_internal_init.go b/containerm/daemon/daemon_internal_init.go
index 9ba9e0c..599e6d5 100644
--- a/containerm/daemon/daemon_internal_init.go
+++ b/containerm/daemon/daemon_internal_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/daemon/daemon_run_lock.go b/containerm/daemon/daemon_run_lock.go
index ea547da..909e0b3 100644
--- a/containerm/daemon/daemon_run_lock.go
+++ b/containerm/daemon/daemon_run_lock.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/daemon/daemon_run_lock_unix.go b/containerm/daemon/daemon_run_lock_unix.go
index 7c339fe..80c7dad 100644
--- a/containerm/daemon/daemon_run_lock_unix.go
+++ b/containerm/daemon/daemon_run_lock_unix.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 //go:build linux || netbsd || openbsd || freebsd || darwin
 // +build linux netbsd openbsd freebsd darwin
diff --git a/containerm/daemon/daemon_start.go b/containerm/daemon/daemon_start.go
index 4a28c42..5f87e06 100644
--- a/containerm/daemon/daemon_start.go
+++ b/containerm/daemon/daemon_start.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/daemon/daemon_test.go b/containerm/daemon/daemon_test.go
index 627086e..23dbdaa 100644
--- a/containerm/daemon/daemon_test.go
+++ b/containerm/daemon/daemon_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package main
 
diff --git a/containerm/events/events.go b/containerm/events/events.go
index 3f880ad..80833a9 100644
--- a/containerm/events/events.go
+++ b/containerm/events/events.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package events
 
diff --git a/containerm/events/events_api.go b/containerm/events/events_api.go
index a78dcb3..6b799de 100644
--- a/containerm/events/events_api.go
+++ b/containerm/events/events_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package events
 
diff --git a/containerm/events/events_init.go b/containerm/events/events_init.go
index 1c4eb37..c7f598c 100644
--- a/containerm/events/events_init.go
+++ b/containerm/events/events_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package events
 
diff --git a/containerm/events/events_sink_channel.go b/containerm/events/events_sink_channel.go
index 0f5280e..1b2f821 100644
--- a/containerm/events/events_sink_channel.go
+++ b/containerm/events/events_sink_channel.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package events
 
diff --git a/containerm/events/events_sink_queue.go b/containerm/events/events_sink_queue.go
index 7683b3d..52c21a3 100644
--- a/containerm/events/events_sink_queue.go
+++ b/containerm/events/events_sink_queue.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package events
 
diff --git a/containerm/events/events_sinks_dispatcher.go b/containerm/events/events_sinks_dispatcher.go
index 38a6d7c..4341f03 100644
--- a/containerm/events/events_sinks_dispatcher.go
+++ b/containerm/events/events_sinks_dispatcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package events
 
diff --git a/containerm/events/events_test.go b/containerm/events/events_test.go
index f30aa88..26e7ac1 100644
--- a/containerm/events/events_test.go
+++ b/containerm/events/events_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package events
 
diff --git a/containerm/log/errors.go b/containerm/log/errors.go
index 9b26a82..7bfb08e 100644
--- a/containerm/log/errors.go
+++ b/containerm/log/errors.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package log
 
diff --git a/containerm/log/logger.go b/containerm/log/logger.go
index 1ff8a61..4cf8b41 100644
--- a/containerm/log/logger.go
+++ b/containerm/log/logger.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package log
 
diff --git a/containerm/log/logger_config.go b/containerm/log/logger_config.go
index 6149a6e..e1a0d9c 100644
--- a/containerm/log/logger_config.go
+++ b/containerm/log/logger_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 //go:build windows && nacl && plan9
 // +build windows,nacl,plan9
diff --git a/containerm/log/logger_config_syslog.go b/containerm/log/logger_config_syslog.go
index a227e15..21049b5 100644
--- a/containerm/log/logger_config_syslog.go
+++ b/containerm/log/logger_config_syslog.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 //go:build !windows && !nacl && !plan9
 // +build !windows,!nacl,!plan9
diff --git a/containerm/log/logger_util.go b/containerm/log/logger_util.go
index 493d0b7..781741d 100644
--- a/containerm/log/logger_util.go
+++ b/containerm/log/logger_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package log
 
diff --git a/containerm/log/logger_util_test.go b/containerm/log/logger_util_test.go
index 59fa4d7..7116a96 100644
--- a/containerm/log/logger_util_test.go
+++ b/containerm/log/logger_util_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package log
 
diff --git a/containerm/logger/buffered/buffered_log.go b/containerm/logger/buffered/buffered_log.go
index 8e7678c..4efb265 100644
--- a/containerm/logger/buffered/buffered_log.go
+++ b/containerm/logger/buffered/buffered_log.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package buffered
 
diff --git a/containerm/logger/buffered/log_message_queue.go b/containerm/logger/buffered/log_message_queue.go
index e15eceb..57b94a4 100644
--- a/containerm/logger/buffered/log_message_queue.go
+++ b/containerm/logger/buffered/log_message_queue.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package buffered
 
diff --git a/containerm/logger/buffered/ring_buffer.go b/containerm/logger/buffered/ring_buffer.go
index 5a75049..bb3107f 100644
--- a/containerm/logger/buffered/ring_buffer.go
+++ b/containerm/logger/buffered/ring_buffer.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package buffered
 
diff --git a/containerm/logger/jsonfile/json_file_log_encode_util.go b/containerm/logger/jsonfile/json_file_log_encode_util.go
index a6e3c4a..2b90fa2 100644
--- a/containerm/logger/jsonfile/json_file_log_encode_util.go
+++ b/containerm/logger/jsonfile/json_file_log_encode_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package jsonfile
 
diff --git a/containerm/logger/jsonfile/json_file_log_file_util.go b/containerm/logger/jsonfile/json_file_log_file_util.go
index c17a644..f80da84 100644
--- a/containerm/logger/jsonfile/json_file_log_file_util.go
+++ b/containerm/logger/jsonfile/json_file_log_file_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package jsonfile
 
diff --git a/containerm/logger/jsonfile/json_file_log_opts.go b/containerm/logger/jsonfile/json_file_log_opts.go
index 3e9c965..1997d31 100644
--- a/containerm/logger/jsonfile/json_file_log_opts.go
+++ b/containerm/logger/jsonfile/json_file_log_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package jsonfile
 
diff --git a/containerm/logger/jsonfile/json_file_log_rotate_util.go b/containerm/logger/jsonfile/json_file_log_rotate_util.go
index 0ab6ed6..35abb57 100644
--- a/containerm/logger/jsonfile/json_file_log_rotate_util.go
+++ b/containerm/logger/jsonfile/json_file_log_rotate_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package jsonfile
 
diff --git a/containerm/logger/jsonfile/json_log_file.go b/containerm/logger/jsonfile/json_log_file.go
index 3b2c83c..682e2a7 100644
--- a/containerm/logger/jsonfile/json_log_file.go
+++ b/containerm/logger/jsonfile/json_log_file.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package jsonfile
 
diff --git a/containerm/logger/jsonfile/json_log_file_internal.go b/containerm/logger/jsonfile/json_log_file_internal.go
index b7ac2e3..c16922e 100644
--- a/containerm/logger/jsonfile/json_log_file_internal.go
+++ b/containerm/logger/jsonfile/json_log_file_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package jsonfile
 
diff --git a/containerm/logger/log_driver.go b/containerm/logger/log_driver.go
index bf764cd..7db6768 100644
--- a/containerm/logger/log_driver.go
+++ b/containerm/logger/log_driver.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package logger
 
diff --git a/containerm/logger/log_handler.go b/containerm/logger/log_handler.go
index de73229..106f255 100644
--- a/containerm/logger/log_handler.go
+++ b/containerm/logger/log_handler.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package logger
 
diff --git a/containerm/logger/log_message.go b/containerm/logger/log_message.go
index 6aad650..c92da92 100644
--- a/containerm/logger/log_message.go
+++ b/containerm/logger/log_message.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package logger
 
diff --git a/containerm/mgr/container_fs_repository.go b/containerm/mgr/container_fs_repository.go
index f4365cc..74fa48f 100644
--- a/containerm/mgr/container_fs_repository.go
+++ b/containerm/mgr/container_fs_repository.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/container_fs_repository_test.go b/containerm/mgr/container_fs_repository_test.go
index 9107d54..847166b 100644
--- a/containerm/mgr/container_fs_repository_test.go
+++ b/containerm/mgr/container_fs_repository_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/container_repository.go b/containerm/mgr/container_repository.go
index 78d80a0..715ae2e 100644
--- a/containerm/mgr/container_repository.go
+++ b/containerm/mgr/container_repository.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/mgr.go b/containerm/mgr/mgr.go
index 7ee65c8..d34bfb4 100644
--- a/containerm/mgr/mgr.go
+++ b/containerm/mgr/mgr.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/mgr_api.go b/containerm/mgr/mgr_api.go
index 9c873c4..595a47b 100644
--- a/containerm/mgr/mgr_api.go
+++ b/containerm/mgr/mgr_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/mgr_internal.go b/containerm/mgr/mgr_internal.go
index 2d2ceb3..36f842f 100644
--- a/containerm/mgr/mgr_internal.go
+++ b/containerm/mgr/mgr_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/mgr_internal_init.go b/containerm/mgr/mgr_internal_init.go
index 42b66fc..5738d06 100644
--- a/containerm/mgr/mgr_internal_init.go
+++ b/containerm/mgr/mgr_internal_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/mgr_opts.go b/containerm/mgr/mgr_opts.go
index 1c4c79a..9021880 100644
--- a/containerm/mgr/mgr_opts.go
+++ b/containerm/mgr/mgr_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/mgr_opts_test.go b/containerm/mgr/mgr_opts_test.go
index 2a3f6b2..80ff878 100644
--- a/containerm/mgr/mgr_opts_test.go
+++ b/containerm/mgr/mgr_opts_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/mgr_restart_mgmt_cache.go b/containerm/mgr/mgr_restart_mgmt_cache.go
index bf55a4f..1fe9d31 100644
--- a/containerm/mgr/mgr_restart_mgmt_cache.go
+++ b/containerm/mgr/mgr_restart_mgmt_cache.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/mgr_restart_mgr.go b/containerm/mgr/mgr_restart_mgr.go
index edbc8bf..cdd5101 100644
--- a/containerm/mgr/mgr_restart_mgr.go
+++ b/containerm/mgr/mgr_restart_mgr.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/mgr/mgr_test.go b/containerm/mgr/mgr_test.go
index a58b78e..61b77c5 100644
--- a/containerm/mgr/mgr_test.go
+++ b/containerm/mgr/mgr_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package mgr
 
diff --git a/containerm/network/libnet_mgr.go b/containerm/network/libnet_mgr.go
index 2e2bd07..a4da8e5 100644
--- a/containerm/network/libnet_mgr.go
+++ b/containerm/network/libnet_mgr.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/libnet_mgr_config.go b/containerm/network/libnet_mgr_config.go
index 0097baa..a7ab17a 100644
--- a/containerm/network/libnet_mgr_config.go
+++ b/containerm/network/libnet_mgr_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/libnet_mgr_init.go b/containerm/network/libnet_mgr_init.go
index a35a6d7..5a33ee5 100644
--- a/containerm/network/libnet_mgr_init.go
+++ b/containerm/network/libnet_mgr_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/libnet_mgr_init_test.go b/containerm/network/libnet_mgr_init_test.go
index 0df4daa..9745b17 100644
--- a/containerm/network/libnet_mgr_init_test.go
+++ b/containerm/network/libnet_mgr_init_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/libnet_mgr_internal.go b/containerm/network/libnet_mgr_internal.go
index 4b33f6a..952eb58 100644
--- a/containerm/network/libnet_mgr_internal.go
+++ b/containerm/network/libnet_mgr_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/libnet_mgr_internal_common.go b/containerm/network/libnet_mgr_internal_common.go
index 581e2d5..9c537b4 100644
--- a/containerm/network/libnet_mgr_internal_common.go
+++ b/containerm/network/libnet_mgr_internal_common.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/libnet_mgr_internal_common_ctrs.go b/containerm/network/libnet_mgr_internal_common_ctrs.go
index 09158b9..91af379 100644
--- a/containerm/network/libnet_mgr_internal_common_ctrs.go
+++ b/containerm/network/libnet_mgr_internal_common_ctrs.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/libnet_mgr_internal_common_test.go b/containerm/network/libnet_mgr_internal_common_test.go
index e7b032a..59ec549 100644
--- a/containerm/network/libnet_mgr_internal_common_test.go
+++ b/containerm/network/libnet_mgr_internal_common_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/libnet_mgr_opts_test.go b/containerm/network/libnet_mgr_opts_test.go
index 232d833..d7588c9 100644
--- a/containerm/network/libnet_mgr_opts_test.go
+++ b/containerm/network/libnet_mgr_opts_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/libnet_mgr_test.go b/containerm/network/libnet_mgr_test.go
index 5eefa79..a8d4cf4 100644
--- a/containerm/network/libnet_mgr_test.go
+++ b/containerm/network/libnet_mgr_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/net_mgr_api.go b/containerm/network/net_mgr_api.go
index 76dfe06..05998f3 100644
--- a/containerm/network/net_mgr_api.go
+++ b/containerm/network/net_mgr_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/network/net_mgr_opts.go b/containerm/network/net_mgr_opts.go
index 83f3acf..1cf5a51 100644
--- a/containerm/network/net_mgr_opts.go
+++ b/containerm/network/net_mgr_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package network
 
diff --git a/containerm/pkg/testutil/assertions.go b/containerm/pkg/testutil/assertions.go
index c901354..422dd97 100644
--- a/containerm/pkg/testutil/assertions.go
+++ b/containerm/pkg/testutil/assertions.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package testutil
 
diff --git a/containerm/pkg/testutil/matchers/cio_attach_matcher.go b/containerm/pkg/testutil/matchers/cio_attach_matcher.go
index 9aceef4..e80fcad 100644
--- a/containerm/pkg/testutil/matchers/cio_attach_matcher.go
+++ b/containerm/pkg/testutil/matchers/cio_attach_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/cio_creator_matcher.go b/containerm/pkg/testutil/matchers/cio_creator_matcher.go
index 43a2f95..6a3bcd1 100644
--- a/containerm/pkg/testutil/matchers/cio_creator_matcher.go
+++ b/containerm/pkg/testutil/matchers/cio_creator_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/container_id_matcher.go b/containerm/pkg/testutil/matchers/container_id_matcher.go
index 828ff4f..e8fd43e 100644
--- a/containerm/pkg/testutil/matchers/container_id_matcher.go
+++ b/containerm/pkg/testutil/matchers/container_id_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/container_name_matcher.go b/containerm/pkg/testutil/matchers/container_name_matcher.go
index 1d9a45c..e5bfaa7 100644
--- a/containerm/pkg/testutil/matchers/container_name_matcher.go
+++ b/containerm/pkg/testutil/matchers/container_name_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/container_state_matcher.go b/containerm/pkg/testutil/matchers/container_state_matcher.go
index f5db442..6e3ca9e 100644
--- a/containerm/pkg/testutil/matchers/container_state_matcher.go
+++ b/containerm/pkg/testutil/matchers/container_state_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/container_update_matcher.go b/containerm/pkg/testutil/matchers/container_update_matcher.go
index b405f6f..47b691f 100644
--- a/containerm/pkg/testutil/matchers/container_update_matcher.go
+++ b/containerm/pkg/testutil/matchers/container_update_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/contains_string_matcher.go b/containerm/pkg/testutil/matchers/contains_string_matcher.go
index 9c95cdd..56eb994 100644
--- a/containerm/pkg/testutil/matchers/contains_string_matcher.go
+++ b/containerm/pkg/testutil/matchers/contains_string_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/kill_task_opts_matcher.go b/containerm/pkg/testutil/matchers/kill_task_opts_matcher.go
index 09f6973..116f600 100644
--- a/containerm/pkg/testutil/matchers/kill_task_opts_matcher.go
+++ b/containerm/pkg/testutil/matchers/kill_task_opts_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/new_container_opts_matcher.go b/containerm/pkg/testutil/matchers/new_container_opts_matcher.go
index 62debb2..d816f02 100644
--- a/containerm/pkg/testutil/matchers/new_container_opts_matcher.go
+++ b/containerm/pkg/testutil/matchers/new_container_opts_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/new_task_opts_matcher.go b/containerm/pkg/testutil/matchers/new_task_opts_matcher.go
index 70ab213..dc478ca 100644
--- a/containerm/pkg/testutil/matchers/new_task_opts_matcher.go
+++ b/containerm/pkg/testutil/matchers/new_task_opts_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/resolver_opts_matcher.go b/containerm/pkg/testutil/matchers/resolver_opts_matcher.go
index e5e5ecb..fa507c3 100644
--- a/containerm/pkg/testutil/matchers/resolver_opts_matcher.go
+++ b/containerm/pkg/testutil/matchers/resolver_opts_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/unpack_opts_matcher.go b/containerm/pkg/testutil/matchers/unpack_opts_matcher.go
index 2c7a24b..d64b695 100644
--- a/containerm/pkg/testutil/matchers/unpack_opts_matcher.go
+++ b/containerm/pkg/testutil/matchers/unpack_opts_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/matchers/update_task_opts_matcher.go b/containerm/pkg/testutil/matchers/update_task_opts_matcher.go
index 111081b..937f66a 100644
--- a/containerm/pkg/testutil/matchers/update_task_opts_matcher.go
+++ b/containerm/pkg/testutil/matchers/update_task_opts_matcher.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package matchers
 
diff --git a/containerm/pkg/testutil/mocks/api/services/containers/mock_containers.go b/containerm/pkg/testutil/mocks/api/services/containers/mock_containers.go
index 43b84aa..f166015 100644
--- a/containerm/pkg/testutil/mocks/api/services/containers/mock_containers.go
+++ b/containerm/pkg/testutil/mocks/api/services/containers/mock_containers.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/eclipse-kanto/container-management/containerm/api/services/containers (interfaces: ContainersClient,Containers_AttachClient)
diff --git a/containerm/pkg/testutil/mocks/api/services/sysinfo/mock_sysinfo.go b/containerm/pkg/testutil/mocks/api/services/sysinfo/mock_sysinfo.go
index 821eb49..18e279b 100644
--- a/containerm/pkg/testutil/mocks/api/services/sysinfo/mock_sysinfo.go
+++ b/containerm/pkg/testutil/mocks/api/services/sysinfo/mock_sysinfo.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/eclipse-kanto/container-management/containerm/api/services/sysinfo (interfaces: SystemInfoClient)
diff --git a/containerm/pkg/testutil/mocks/cli/mock_terminal_manager.go b/containerm/pkg/testutil/mocks/cli/mock_terminal_manager.go
index 4dafa29..31bf735 100644
--- a/containerm/pkg/testutil/mocks/cli/mock_terminal_manager.go
+++ b/containerm/pkg/testutil/mocks/cli/mock_terminal_manager.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: cli_command_ctrs_start.go
diff --git a/containerm/pkg/testutil/mocks/client/mock_client_api.go b/containerm/pkg/testutil/mocks/client/mock_client_api.go
index 528682b..fe0302c 100644
--- a/containerm/pkg/testutil/mocks/client/mock_client_api.go
+++ b/containerm/pkg/testutil/mocks/client/mock_client_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/eclipse-kanto/container-management/containerm/client (interfaces: Client)
diff --git a/containerm/pkg/testutil/mocks/containerd/mock_cio_io.go b/containerm/pkg/testutil/mocks/containerd/mock_cio_io.go
index 1556c37..1d4e298 100644
--- a/containerm/pkg/testutil/mocks/containerd/mock_cio_io.go
+++ b/containerm/pkg/testutil/mocks/containerd/mock_cio_io.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/containerd/containerd/cio/io.go
diff --git a/containerm/pkg/testutil/mocks/containerd/mock_container.go b/containerm/pkg/testutil/mocks/containerd/mock_container.go
index 77711d9..9f23f87 100644
--- a/containerm/pkg/testutil/mocks/containerd/mock_container.go
+++ b/containerm/pkg/testutil/mocks/containerd/mock_container.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/containerd/containerd (interfaces: Container)
diff --git a/containerm/pkg/testutil/mocks/containerd/mock_image.go b/containerm/pkg/testutil/mocks/containerd/mock_image.go
index 240e649..9a83cf6 100644
--- a/containerm/pkg/testutil/mocks/containerd/mock_image.go
+++ b/containerm/pkg/testutil/mocks/containerd/mock_image.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/containerd/containerd (interfaces: Image)
diff --git a/containerm/pkg/testutil/mocks/containerd/mock_remotes_resolver.go b/containerm/pkg/testutil/mocks/containerd/mock_remotes_resolver.go
index 3ba7eef..7276bc5 100644
--- a/containerm/pkg/testutil/mocks/containerd/mock_remotes_resolver.go
+++ b/containerm/pkg/testutil/mocks/containerd/mock_remotes_resolver.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/containerd/containerd/remotes (interfaces: Resolver)
diff --git a/containerm/pkg/testutil/mocks/containerd/mock_snapshots_service.go b/containerm/pkg/testutil/mocks/containerd/mock_snapshots_service.go
index 1941b49..b44ef15 100644
--- a/containerm/pkg/testutil/mocks/containerd/mock_snapshots_service.go
+++ b/containerm/pkg/testutil/mocks/containerd/mock_snapshots_service.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/containerd/containerd/snapshots (interfaces: Snapshotter)
diff --git a/containerm/pkg/testutil/mocks/containerd/mock_task.go b/containerm/pkg/testutil/mocks/containerd/mock_task.go
index 828c167..3935522 100644
--- a/containerm/pkg/testutil/mocks/containerd/mock_task.go
+++ b/containerm/pkg/testutil/mocks/containerd/mock_task.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/containerd/containerd (interfaces: Task)
diff --git a/containerm/pkg/testutil/mocks/context/mock_context.go b/containerm/pkg/testutil/mocks/context/mock_context.go
index acf116d..70415d4 100644
--- a/containerm/pkg/testutil/mocks/context/mock_context.go
+++ b/containerm/pkg/testutil/mocks/context/mock_context.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: /usr/lib/go-1.14/src/context/context.go
diff --git a/containerm/pkg/testutil/mocks/ctr/mock_ctr_client_api.go b/containerm/pkg/testutil/mocks/ctr/mock_ctr_client_api.go
index a516322..cde949d 100644
--- a/containerm/pkg/testutil/mocks/ctr/mock_ctr_client_api.go
+++ b/containerm/pkg/testutil/mocks/ctr/mock_ctr_client_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./containerm/ctr/ctr_client_api.go
diff --git a/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_decrypt_mgr.go b/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_decrypt_mgr.go
index 53cc580..b63da90 100644
--- a/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_decrypt_mgr.go
+++ b/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_decrypt_mgr.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/ctr/ctrd_decrypt_mgr.go
diff --git a/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_log_mgr.go b/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_log_mgr.go
index ef2a6db..78e8b42 100644
--- a/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_log_mgr.go
+++ b/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_log_mgr.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/ctr/ctrd_log_mgr.go
diff --git a/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_registries_resolver.go b/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_registries_resolver.go
index ed5c089..dd45f4e 100644
--- a/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_registries_resolver.go
+++ b/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_registries_resolver.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/ctr/ctrd_registries_resolver.go
diff --git a/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_spi.go b/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_spi.go
index 62ede8e..59aeb24 100644
--- a/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_spi.go
+++ b/containerm/pkg/testutil/mocks/ctrd/mock_ctrd_spi.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/ctr/ctrd_spi.go
diff --git a/containerm/pkg/testutil/mocks/events/mock_events_api.go b/containerm/pkg/testutil/mocks/events/mock_events_api.go
index 3ce7c1a..617e34d 100644
--- a/containerm/pkg/testutil/mocks/events/mock_events_api.go
+++ b/containerm/pkg/testutil/mocks/events/mock_events_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/events/events_api.go
diff --git a/containerm/pkg/testutil/mocks/io/mock_io.go b/containerm/pkg/testutil/mocks/io/mock_io.go
index b6dd874..c41cbb9 100644
--- a/containerm/pkg/testutil/mocks/io/mock_io.go
+++ b/containerm/pkg/testutil/mocks/io/mock_io.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: io (interfaces: ReadCloser,WriteCloser)
diff --git a/containerm/pkg/testutil/mocks/logger/mock_log_driver.go b/containerm/pkg/testutil/mocks/logger/mock_log_driver.go
index 00205ae..26e939e 100644
--- a/containerm/pkg/testutil/mocks/logger/mock_log_driver.go
+++ b/containerm/pkg/testutil/mocks/logger/mock_log_driver.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/logger/log_driver.go
diff --git a/containerm/pkg/testutil/mocks/logger/mock_log_handler.go b/containerm/pkg/testutil/mocks/logger/mock_log_handler.go
index a1bcbd5..afa3250 100644
--- a/containerm/pkg/testutil/mocks/logger/mock_log_handler.go
+++ b/containerm/pkg/testutil/mocks/logger/mock_log_handler.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/logger/log_handler.go
diff --git a/containerm/pkg/testutil/mocks/mgr/mock_container_repository.go b/containerm/pkg/testutil/mocks/mgr/mock_container_repository.go
index d7c346e..c8427c3 100644
--- a/containerm/pkg/testutil/mocks/mgr/mock_container_repository.go
+++ b/containerm/pkg/testutil/mocks/mgr/mock_container_repository.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./containerm/mgr/container_repository.go
diff --git a/containerm/pkg/testutil/mocks/mgr/mock_mgr_api.go b/containerm/pkg/testutil/mocks/mgr/mock_mgr_api.go
index 3ba997a..877c559 100644
--- a/containerm/pkg/testutil/mocks/mgr/mock_mgr_api.go
+++ b/containerm/pkg/testutil/mocks/mgr/mock_mgr_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/eclipse-kanto/container-management/containerm/mgr (interfaces: ContainerManager)
diff --git a/containerm/pkg/testutil/mocks/network/mock_libnet_ctrl.go b/containerm/pkg/testutil/mocks/network/mock_libnet_ctrl.go
index 9b2f585..836bd7d 100644
--- a/containerm/pkg/testutil/mocks/network/mock_libnet_ctrl.go
+++ b/containerm/pkg/testutil/mocks/network/mock_libnet_ctrl.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: controller.go
diff --git a/containerm/pkg/testutil/mocks/network/mock_libnet_ep.go b/containerm/pkg/testutil/mocks/network/mock_libnet_ep.go
index bb9289f..751a359 100644
--- a/containerm/pkg/testutil/mocks/network/mock_libnet_ep.go
+++ b/containerm/pkg/testutil/mocks/network/mock_libnet_ep.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: endpoint.go
diff --git a/containerm/pkg/testutil/mocks/network/mock_libnet_ep_info.go b/containerm/pkg/testutil/mocks/network/mock_libnet_ep_info.go
index 29e4a41..abb8c1c 100644
--- a/containerm/pkg/testutil/mocks/network/mock_libnet_ep_info.go
+++ b/containerm/pkg/testutil/mocks/network/mock_libnet_ep_info.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: endpoint_info.go
diff --git a/containerm/pkg/testutil/mocks/network/mock_libnet_network.go b/containerm/pkg/testutil/mocks/network/mock_libnet_network.go
index 72ea3d1..ecc4444 100644
--- a/containerm/pkg/testutil/mocks/network/mock_libnet_network.go
+++ b/containerm/pkg/testutil/mocks/network/mock_libnet_network.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: network.go
diff --git a/containerm/pkg/testutil/mocks/network/mock_libnet_sb.go b/containerm/pkg/testutil/mocks/network/mock_libnet_sb.go
index 7859153..ef560a2 100644
--- a/containerm/pkg/testutil/mocks/network/mock_libnet_sb.go
+++ b/containerm/pkg/testutil/mocks/network/mock_libnet_sb.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: sandbox.go
diff --git a/containerm/pkg/testutil/mocks/network/mock_net_mgr_api.go b/containerm/pkg/testutil/mocks/network/mock_net_mgr_api.go
index 3724a7b..57edff5 100644
--- a/containerm/pkg/testutil/mocks/network/mock_net_mgr_api.go
+++ b/containerm/pkg/testutil/mocks/network/mock_net_mgr_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/network/net_mgr_api.go
diff --git a/containerm/pkg/testutil/mocks/registry/mock_registry_services.go b/containerm/pkg/testutil/mocks/registry/mock_registry_services.go
index 05d4afe..f4891d1 100644
--- a/containerm/pkg/testutil/mocks/registry/mock_registry_services.go
+++ b/containerm/pkg/testutil/mocks/registry/mock_registry_services.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/registry/registry.go
diff --git a/containerm/pkg/testutil/mocks/streams/mock_stream.go b/containerm/pkg/testutil/mocks/streams/mock_stream.go
index 9c830a4..79c47b2 100644
--- a/containerm/pkg/testutil/mocks/streams/mock_stream.go
+++ b/containerm/pkg/testutil/mocks/streams/mock_stream.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/streams/stream.go
diff --git a/containerm/pkg/testutil/mocks/sysinfo/mock_sysinfo_api.go b/containerm/pkg/testutil/mocks/sysinfo/mock_sysinfo_api.go
index 03a016c..661b5c1 100644
--- a/containerm/pkg/testutil/mocks/sysinfo/mock_sysinfo_api.go
+++ b/containerm/pkg/testutil/mocks/sysinfo/mock_sysinfo_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/eclipse-kanto/container-management/containerm/sysinfo (interfaces: SystemInfoManager)
diff --git a/containerm/pkg/testutil/mocks/things/mock_ctr_factory_persistence.go b/containerm/pkg/testutil/mocks/things/mock_ctr_factory_persistence.go
index 3f58887..37c726a 100644
--- a/containerm/pkg/testutil/mocks/things/mock_ctr_factory_persistence.go
+++ b/containerm/pkg/testutil/mocks/things/mock_ctr_factory_persistence.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: containerm/things/features_container_factory_persistence.go
diff --git a/containerm/pkg/testutil/mocks/things/mock_thing.go b/containerm/pkg/testutil/mocks/things/mock_thing.go
index d280ae8..825d07e 100644
--- a/containerm/pkg/testutil/mocks/things/mock_thing.go
+++ b/containerm/pkg/testutil/mocks/things/mock_thing.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 // Code generated by MockGen. DO NOT EDIT.
 // Source: things/api/model/thing.go
diff --git a/containerm/registry/context.go b/containerm/registry/context.go
index 2b4fdae..268abb3 100644
--- a/containerm/registry/context.go
+++ b/containerm/registry/context.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package registry
 
diff --git a/containerm/registry/registry.go b/containerm/registry/registry.go
index 22ae144..9936aca 100644
--- a/containerm/registry/registry.go
+++ b/containerm/registry/registry.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package registry
 
diff --git a/containerm/registry/registry_test.go b/containerm/registry/registry_test.go
index 5709ca4..69aa524 100644
--- a/containerm/registry/registry_test.go
+++ b/containerm/registry/registry_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package registry
 
diff --git a/containerm/server/grpc_server_internal.go b/containerm/server/grpc_server_internal.go
index 534224b..19804c7 100644
--- a/containerm/server/grpc_server_internal.go
+++ b/containerm/server/grpc_server_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package server
 
diff --git a/containerm/server/grpc_server_internal_init.go b/containerm/server/grpc_server_internal_init.go
index 11ad5e2..d2386fa 100644
--- a/containerm/server/grpc_server_internal_init.go
+++ b/containerm/server/grpc_server_internal_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package server
 
diff --git a/containerm/server/grpc_server_internal_init_test.go b/containerm/server/grpc_server_internal_init_test.go
index d8da670..88de23d 100644
--- a/containerm/server/grpc_server_internal_init_test.go
+++ b/containerm/server/grpc_server_internal_init_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package server
 
diff --git a/containerm/server/grpc_server_opts.go b/containerm/server/grpc_server_opts.go
index 3f1026f..7b8d4c7 100644
--- a/containerm/server/grpc_server_opts.go
+++ b/containerm/server/grpc_server_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package server
 
diff --git a/containerm/server/grpc_server_opts_test.go b/containerm/server/grpc_server_opts_test.go
index 410f6e3..9881917 100644
--- a/containerm/server/grpc_server_opts_test.go
+++ b/containerm/server/grpc_server_opts_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package server
 
diff --git a/containerm/services/grpc_containers_service.go b/containerm/services/grpc_containers_service.go
index 8a2d5b6..5ab09a1 100644
--- a/containerm/services/grpc_containers_service.go
+++ b/containerm/services/grpc_containers_service.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package services
 
diff --git a/containerm/services/grpc_containers_service_init.go b/containerm/services/grpc_containers_service_init.go
index 2b33678..fc37558 100644
--- a/containerm/services/grpc_containers_service_init.go
+++ b/containerm/services/grpc_containers_service_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package services
 
diff --git a/containerm/services/grpc_services.go b/containerm/services/grpc_services.go
index 9b3493d..62eb7ed 100644
--- a/containerm/services/grpc_services.go
+++ b/containerm/services/grpc_services.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package services
 
diff --git a/containerm/services/grpc_services_test.go b/containerm/services/grpc_services_test.go
index 519ce7d..478291e 100644
--- a/containerm/services/grpc_services_test.go
+++ b/containerm/services/grpc_services_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package services
 
diff --git a/containerm/services/grpc_system_info_service.go b/containerm/services/grpc_system_info_service.go
index 213131d..34a427a 100644
--- a/containerm/services/grpc_system_info_service.go
+++ b/containerm/services/grpc_system_info_service.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package services
 
diff --git a/containerm/services/grpc_system_info_service_init.go b/containerm/services/grpc_system_info_service_init.go
index 1031acd..b6b3a71 100644
--- a/containerm/services/grpc_system_info_service_init.go
+++ b/containerm/services/grpc_system_info_service_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package services
 
diff --git a/containerm/sysinfo/sysinfo.go b/containerm/sysinfo/sysinfo.go
index d4352c1..0faafed 100644
--- a/containerm/sysinfo/sysinfo.go
+++ b/containerm/sysinfo/sysinfo.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package sysinfo
 
diff --git a/containerm/sysinfo/sysinfo_api.go b/containerm/sysinfo/sysinfo_api.go
index 2037f63..3177c01 100644
--- a/containerm/sysinfo/sysinfo_api.go
+++ b/containerm/sysinfo/sysinfo_api.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package sysinfo
 
diff --git a/containerm/sysinfo/sysinfo_init.go b/containerm/sysinfo/sysinfo_init.go
index 2c403a8..2bfd7ea 100644
--- a/containerm/sysinfo/sysinfo_init.go
+++ b/containerm/sysinfo/sysinfo_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package sysinfo
 
diff --git a/containerm/sysinfo/sysinfo_init_test.go b/containerm/sysinfo/sysinfo_init_test.go
index 7eaa131..bde5f2b 100644
--- a/containerm/sysinfo/sysinfo_init_test.go
+++ b/containerm/sysinfo/sysinfo_init_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package sysinfo
 
diff --git a/containerm/sysinfo/sysinfo_test.go b/containerm/sysinfo/sysinfo_test.go
index b6dc5fb..7ebe2d8 100644
--- a/containerm/sysinfo/sysinfo_test.go
+++ b/containerm/sysinfo/sysinfo_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package sysinfo
 
diff --git a/containerm/sysinfo/types/project_info.go b/containerm/sysinfo/types/project_info.go
index e5be020..7e732bb 100644
--- a/containerm/sysinfo/types/project_info.go
+++ b/containerm/sysinfo/types/project_info.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package types
 
diff --git a/containerm/things/datatypes_container_configuration.go b/containerm/things/datatypes_container_configuration.go
index 19d7cad..a13de4f 100644
--- a/containerm/things/datatypes_container_configuration.go
+++ b/containerm/things/datatypes_container_configuration.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_configuration_test.go b/containerm/things/datatypes_container_configuration_test.go
index a8e01f1..7bfc440 100644
--- a/containerm/things/datatypes_container_configuration_test.go
+++ b/containerm/things/datatypes_container_configuration_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_devices.go b/containerm/things/datatypes_container_devices.go
index 894ddc2..ee5f928 100644
--- a/containerm/things/datatypes_container_devices.go
+++ b/containerm/things/datatypes_container_devices.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_devices_test.go b/containerm/things/datatypes_container_devices_test.go
index 9e25aa1..5930a2a 100644
--- a/containerm/things/datatypes_container_devices_test.go
+++ b/containerm/things/datatypes_container_devices_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_log_config.go b/containerm/things/datatypes_container_log_config.go
index 3e12c15..658d40d 100644
--- a/containerm/things/datatypes_container_log_config.go
+++ b/containerm/things/datatypes_container_log_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_log_config_test.go b/containerm/things/datatypes_container_log_config_test.go
index e0a38f1..c553d52 100644
--- a/containerm/things/datatypes_container_log_config_test.go
+++ b/containerm/things/datatypes_container_log_config_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_metrics.go b/containerm/things/datatypes_container_metrics.go
index 583dcb1..280b3ee 100644
--- a/containerm/things/datatypes_container_metrics.go
+++ b/containerm/things/datatypes_container_metrics.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_metrics_test.go b/containerm/things/datatypes_container_metrics_test.go
index a0ec632..83d2739 100644
--- a/containerm/things/datatypes_container_metrics_test.go
+++ b/containerm/things/datatypes_container_metrics_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_mount_point.go b/containerm/things/datatypes_container_mount_point.go
index d522621..d0f05ad 100644
--- a/containerm/things/datatypes_container_mount_point.go
+++ b/containerm/things/datatypes_container_mount_point.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_mount_point_test.go b/containerm/things/datatypes_container_mount_point_test.go
index 774cb03..5ae22f8 100644
--- a/containerm/things/datatypes_container_mount_point_test.go
+++ b/containerm/things/datatypes_container_mount_point_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_resources.go b/containerm/things/datatypes_container_resources.go
index c44a82d..382c808 100644
--- a/containerm/things/datatypes_container_resources.go
+++ b/containerm/things/datatypes_container_resources.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_resources_test.go b/containerm/things/datatypes_container_resources_test.go
index 9008eb7..356eb3b 100644
--- a/containerm/things/datatypes_container_resources_test.go
+++ b/containerm/things/datatypes_container_resources_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_restart_policy.go b/containerm/things/datatypes_container_restart_policy.go
index 84c1a03..9ea1017 100644
--- a/containerm/things/datatypes_container_restart_policy.go
+++ b/containerm/things/datatypes_container_restart_policy.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_restart_policy_test.go b/containerm/things/datatypes_container_restart_policy_test.go
index 2b6a4e2..54a137c 100644
--- a/containerm/things/datatypes_container_restart_policy_test.go
+++ b/containerm/things/datatypes_container_restart_policy_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_state.go b/containerm/things/datatypes_container_state.go
index 174912d..cf8e9ca 100644
--- a/containerm/things/datatypes_container_state.go
+++ b/containerm/things/datatypes_container_state.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_status.go b/containerm/things/datatypes_container_status.go
index 69f3144..cb73df7 100644
--- a/containerm/things/datatypes_container_status.go
+++ b/containerm/things/datatypes_container_status.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_status_test.go b/containerm/things/datatypes_container_status_test.go
index c4d7fca..b7e98b6 100644
--- a/containerm/things/datatypes_container_status_test.go
+++ b/containerm/things/datatypes_container_status_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_stop_options.go b/containerm/things/datatypes_container_stop_options.go
index 33b204c..210ffc9 100644
--- a/containerm/things/datatypes_container_stop_options.go
+++ b/containerm/things/datatypes_container_stop_options.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_update_options.go b/containerm/things/datatypes_container_update_options.go
index 3d70117..e69994e 100644
--- a/containerm/things/datatypes_container_update_options.go
+++ b/containerm/things/datatypes_container_update_options.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_container_update_options_test.go b/containerm/things/datatypes_container_update_options_test.go
index 64f6da3..f71688d 100644
--- a/containerm/things/datatypes_container_update_options_test.go
+++ b/containerm/things/datatypes_container_update_options_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/datatypes_contianer_port_mappings.go b/containerm/things/datatypes_contianer_port_mappings.go
index 8c0d88b..af58b09 100644
--- a/containerm/things/datatypes_contianer_port_mappings.go
+++ b/containerm/things/datatypes_contianer_port_mappings.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container.go b/containerm/things/features_container.go
index 0998a84..680c01a 100644
--- a/containerm/things/features_container.go
+++ b/containerm/things/features_container.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container_factory.go b/containerm/things/features_container_factory.go
index e3e49d4..bdc282b 100644
--- a/containerm/things/features_container_factory.go
+++ b/containerm/things/features_container_factory.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container_factory_event_handler.go b/containerm/things/features_container_factory_event_handler.go
index b4b7613..4f705f1 100644
--- a/containerm/things/features_container_factory_event_handler.go
+++ b/containerm/things/features_container_factory_event_handler.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container_factory_event_handler_test.go b/containerm/things/features_container_factory_event_handler_test.go
index 66294c8..9b570f2 100644
--- a/containerm/things/features_container_factory_event_handler_test.go
+++ b/containerm/things/features_container_factory_event_handler_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container_factory_internal.go b/containerm/things/features_container_factory_internal.go
index 2628609..fbc999e 100644
--- a/containerm/things/features_container_factory_internal.go
+++ b/containerm/things/features_container_factory_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container_factory_internal_test.go b/containerm/things/features_container_factory_internal_test.go
index 167b640..b9f7f69 100644
--- a/containerm/things/features_container_factory_internal_test.go
+++ b/containerm/things/features_container_factory_internal_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container_factory_persistence.go b/containerm/things/features_container_factory_persistence.go
index 1218416..3f48a2c 100644
--- a/containerm/things/features_container_factory_persistence.go
+++ b/containerm/things/features_container_factory_persistence.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container_factory_persistence_test.go b/containerm/things/features_container_factory_persistence_test.go
index e0a916d..54ec447 100644
--- a/containerm/things/features_container_factory_persistence_test.go
+++ b/containerm/things/features_container_factory_persistence_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container_factory_test.go b/containerm/things/features_container_factory_test.go
index 4a253f7..595530e 100644
--- a/containerm/things/features_container_factory_test.go
+++ b/containerm/things/features_container_factory_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_container_test.go b/containerm/things/features_container_test.go
index 42f17d1..a96a0fc 100644
--- a/containerm/things/features_container_test.go
+++ b/containerm/things/features_container_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_metrics.go b/containerm/things/features_metrics.go
index 3b073b1..eae9bd6 100644
--- a/containerm/things/features_metrics.go
+++ b/containerm/things/features_metrics.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_metrics_event_handler.go b/containerm/things/features_metrics_event_handler.go
index dd5a3ee..3562871 100644
--- a/containerm/things/features_metrics_event_handler.go
+++ b/containerm/things/features_metrics_event_handler.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_metrics_event_handler_test.go b/containerm/things/features_metrics_event_handler_test.go
index ed34024..a47afce 100644
--- a/containerm/things/features_metrics_event_handler_test.go
+++ b/containerm/things/features_metrics_event_handler_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_metrics_test.go b/containerm/things/features_metrics_test.go
index 2315dbd..cc477b6 100644
--- a/containerm/things/features_metrics_test.go
+++ b/containerm/things/features_metrics_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_rollouts_software_updatable.go b/containerm/things/features_rollouts_software_updatable.go
index 3abcde6..ab9b477 100644
--- a/containerm/things/features_rollouts_software_updatable.go
+++ b/containerm/things/features_rollouts_software_updatable.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_rollouts_software_updatable_event_handler.go b/containerm/things/features_rollouts_software_updatable_event_handler.go
index c88699f..a7a0122 100644
--- a/containerm/things/features_rollouts_software_updatable_event_handler.go
+++ b/containerm/things/features_rollouts_software_updatable_event_handler.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_rollouts_software_updatable_event_handler_test.go b/containerm/things/features_rollouts_software_updatable_event_handler_test.go
index f366955..31bf910 100644
--- a/containerm/things/features_rollouts_software_updatable_event_handler_test.go
+++ b/containerm/things/features_rollouts_software_updatable_event_handler_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_rollouts_software_updatable_internal.go b/containerm/things/features_rollouts_software_updatable_internal.go
index 210f11d..0efc523 100644
--- a/containerm/things/features_rollouts_software_updatable_internal.go
+++ b/containerm/things/features_rollouts_software_updatable_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_rollouts_software_updatable_internal_test.go b/containerm/things/features_rollouts_software_updatable_internal_test.go
index b34066e..4d07cf9 100644
--- a/containerm/things/features_rollouts_software_updatable_internal_test.go
+++ b/containerm/things/features_rollouts_software_updatable_internal_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_rollouts_util.go b/containerm/things/features_rollouts_util.go
index f1171a1..850f889 100644
--- a/containerm/things/features_rollouts_util.go
+++ b/containerm/things/features_rollouts_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/features_rollouts_util_test.go b/containerm/things/features_rollouts_util_test.go
index 4557fc4..8f4fde2 100644
--- a/containerm/things/features_rollouts_util_test.go
+++ b/containerm/things/features_rollouts_util_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/things_containers_service.go b/containerm/things/things_containers_service.go
index 4863c33..4e06b19 100644
--- a/containerm/things/things_containers_service.go
+++ b/containerm/things/things_containers_service.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/things_containers_service_init.go b/containerm/things/things_containers_service_init.go
index b0cfe47..b3e6f49 100644
--- a/containerm/things/things_containers_service_init.go
+++ b/containerm/things/things_containers_service_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/things_containers_service_internal.go b/containerm/things/things_containers_service_internal.go
index b432868..bc65882 100644
--- a/containerm/things/things_containers_service_internal.go
+++ b/containerm/things/things_containers_service_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/things_containers_service_internal_test.go b/containerm/things/things_containers_service_internal_test.go
index 89a750d..1d17c2b 100644
--- a/containerm/things/things_containers_service_internal_test.go
+++ b/containerm/things/things_containers_service_internal_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/things_containers_service_opts.go b/containerm/things/things_containers_service_opts.go
index 617ea62..bff9bd8 100644
--- a/containerm/things/things_containers_service_opts.go
+++ b/containerm/things/things_containers_service_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/things_containers_service_test.go b/containerm/things/things_containers_service_test.go
index bbe1be2..2916e31 100644
--- a/containerm/things/things_containers_service_test.go
+++ b/containerm/things/things_containers_service_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/things/things_test_base_test.go b/containerm/things/things_test_base_test.go
index 568fa58..4f33dc3 100644
--- a/containerm/things/things_test_base_test.go
+++ b/containerm/things/things_test_base_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package things
 
diff --git a/containerm/util/bytes_size_conversion.go b/containerm/util/bytes_size_conversion.go
index 7b5563f..c27553e 100644
--- a/containerm/util/bytes_size_conversion.go
+++ b/containerm/util/bytes_size_conversion.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/bytes_size_conversion_test.go b/containerm/util/bytes_size_conversion_test.go
index 35c10be..7674386 100644
--- a/containerm/util/bytes_size_conversion_test.go
+++ b/containerm/util/bytes_size_conversion_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/cli/args_util.go b/containerm/util/cli/args_util.go
index 9f4bd5b..9382cef 100644
--- a/containerm/util/cli/args_util.go
+++ b/containerm/util/cli/args_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package cli
 
diff --git a/containerm/util/cli/args_util_test.go b/containerm/util/cli/args_util_test.go
index 7f96e9e..313624d 100644
--- a/containerm/util/cli/args_util_test.go
+++ b/containerm/util/cli/args_util_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package cli
 
diff --git a/containerm/util/containers.go b/containerm/util/containers.go
index bf50e59..7c82807 100644
--- a/containerm/util/containers.go
+++ b/containerm/util/containers.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/containers_test.go b/containerm/util/containers_test.go
index bf12cf4..a73e1bf 100644
--- a/containerm/util/containers_test.go
+++ b/containerm/util/containers_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/containers_validation.go b/containerm/util/containers_validation.go
index 6245c10..0a16136 100644
--- a/containerm/util/containers_validation.go
+++ b/containerm/util/containers_validation.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/containers_validation_test.go b/containerm/util/containers_validation_test.go
index 2c9d9ce..9835fe6 100644
--- a/containerm/util/containers_validation_test.go
+++ b/containerm/util/containers_validation_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/error/error_util.go b/containerm/util/error/error_util.go
index d31389a..60e451a 100644
--- a/containerm/util/error/error_util.go
+++ b/containerm/util/error/error_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package error
 
diff --git a/containerm/util/error/error_util_test.go b/containerm/util/error/error_util_test.go
index f634221..1012524 100644
--- a/containerm/util/error/error_util_test.go
+++ b/containerm/util/error/error_util_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package error
 
diff --git a/containerm/util/io/reader.go b/containerm/util/io/reader.go
index 4181fd3..dd5d6af 100644
--- a/containerm/util/io/reader.go
+++ b/containerm/util/io/reader.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package io
 
diff --git a/containerm/util/locks_cache.go b/containerm/util/locks_cache.go
index 161192c..097cca0 100644
--- a/containerm/util/locks_cache.go
+++ b/containerm/util/locks_cache.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/protobuf/convert_test.go b/containerm/util/protobuf/convert_test.go
index 28d2c80..36bd02c 100644
--- a/containerm/util/protobuf/convert_test.go
+++ b/containerm/util/protobuf/convert_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package protobuf
 
diff --git a/containerm/util/protobuf/convert_to_internal_util.go b/containerm/util/protobuf/convert_to_internal_util.go
index a0105f5..35704ab 100644
--- a/containerm/util/protobuf/convert_to_internal_util.go
+++ b/containerm/util/protobuf/convert_to_internal_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package protobuf
 
diff --git a/containerm/util/protobuf/convert_to_proto_util.go b/containerm/util/protobuf/convert_to_proto_util.go
index 7196d4e..8fb30ac 100644
--- a/containerm/util/protobuf/convert_to_proto_util.go
+++ b/containerm/util/protobuf/convert_to_proto_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package protobuf
 
diff --git a/containerm/util/util_base_test.go b/containerm/util/util_base_test.go
index f57ceaa..3a43d41 100644
--- a/containerm/util/util_base_test.go
+++ b/containerm/util/util_base_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/util_dirs.go b/containerm/util/util_dirs.go
index fe96abd..83c4391 100644
--- a/containerm/util/util_dirs.go
+++ b/containerm/util/util_dirs.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/util_dirs_test.go b/containerm/util/util_dirs_test.go
index 8933fe4..bbd9027 100644
--- a/containerm/util/util_dirs_test.go
+++ b/containerm/util/util_dirs_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/util_metrics.go b/containerm/util/util_metrics.go
index b2912de..950f495 100644
--- a/containerm/util/util_metrics.go
+++ b/containerm/util/util_metrics.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/util_metrics_test.go b/containerm/util/util_metrics_test.go
index 9ae4122..413799c 100644
--- a/containerm/util/util_metrics_test.go
+++ b/containerm/util/util_metrics_test.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/util_stop_opts.go b/containerm/util/util_stop_opts.go
index 2c8697f..d8fe741 100644
--- a/containerm/util/util_stop_opts.go
+++ b/containerm/util/util_stop_opts.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/util/util_system.go b/containerm/util/util_system.go
index 7886b9f..5891414 100644
--- a/containerm/util/util_system.go
+++ b/containerm/util/util_system.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package util
 
diff --git a/containerm/version/version.go b/containerm/version/version.go
index c2f9440..01a55b5 100644
--- a/containerm/version/version.go
+++ b/containerm/version/version.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package version
 
diff --git a/rollouts/api/datatypes/dependency_description.go b/rollouts/api/datatypes/dependency_description.go
index 0d3e3ac..34a722d 100644
--- a/rollouts/api/datatypes/dependency_description.go
+++ b/rollouts/api/datatypes/dependency_description.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/hash.go b/rollouts/api/datatypes/hash.go
index b17fadd..9fec854 100644
--- a/rollouts/api/datatypes/hash.go
+++ b/rollouts/api/datatypes/hash.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/links.go b/rollouts/api/datatypes/links.go
index 8af5236..1545547 100644
--- a/rollouts/api/datatypes/links.go
+++ b/rollouts/api/datatypes/links.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/operation_status.go b/rollouts/api/datatypes/operation_status.go
index 86d1ac6..cd0fdfe 100644
--- a/rollouts/api/datatypes/operation_status.go
+++ b/rollouts/api/datatypes/operation_status.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/protocol.go b/rollouts/api/datatypes/protocol.go
index be4f878..cf3cc51 100644
--- a/rollouts/api/datatypes/protocol.go
+++ b/rollouts/api/datatypes/protocol.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/software_artifact_action.go b/rollouts/api/datatypes/software_artifact_action.go
index c4b2b18..09aa976 100644
--- a/rollouts/api/datatypes/software_artifact_action.go
+++ b/rollouts/api/datatypes/software_artifact_action.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/software_module_action.go b/rollouts/api/datatypes/software_module_action.go
index c1bbcda..bd38fd6 100644
--- a/rollouts/api/datatypes/software_module_action.go
+++ b/rollouts/api/datatypes/software_module_action.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/software_module_id.go b/rollouts/api/datatypes/software_module_id.go
index 008b647..3eb72e2 100644
--- a/rollouts/api/datatypes/software_module_id.go
+++ b/rollouts/api/datatypes/software_module_id.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/software_remove_action.go b/rollouts/api/datatypes/software_remove_action.go
index 8cf875d..be5663a 100644
--- a/rollouts/api/datatypes/software_remove_action.go
+++ b/rollouts/api/datatypes/software_remove_action.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/software_update_action.go b/rollouts/api/datatypes/software_update_action.go
index 9f7a688..876793f 100644
--- a/rollouts/api/datatypes/software_update_action.go
+++ b/rollouts/api/datatypes/software_update_action.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/datatypes/status.go b/rollouts/api/datatypes/status.go
index a7a756b..fd9e860 100644
--- a/rollouts/api/datatypes/status.go
+++ b/rollouts/api/datatypes/status.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package datatypes
 
diff --git a/rollouts/api/features/software_updatable.go b/rollouts/api/features/software_updatable.go
index ebcfd2f..3944d2f 100644
--- a/rollouts/api/features/software_updatable.go
+++ b/rollouts/api/features/software_updatable.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package features
 
diff --git a/things/api/handlers/change_types.go b/things/api/handlers/change_types.go
index 4529672..a00f312 100644
--- a/things/api/handlers/change_types.go
+++ b/things/api/handlers/change_types.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package handlers
 
diff --git a/things/api/handlers/feature_handler.go b/things/api/handlers/feature_handler.go
index 550ff4d..229d16c 100644
--- a/things/api/handlers/feature_handler.go
+++ b/things/api/handlers/feature_handler.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package handlers
 
diff --git a/things/api/handlers/thing_handler.go b/things/api/handlers/thing_handler.go
index 5d1beb9..d426102 100644
--- a/things/api/handlers/thing_handler.go
+++ b/things/api/handlers/thing_handler.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package handlers
 
diff --git a/things/api/handlers/things_registry_handler.go b/things/api/handlers/things_registry_handler.go
index 7289b18..0b8d69b 100644
--- a/things/api/handlers/things_registry_handler.go
+++ b/things/api/handlers/things_registry_handler.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package handlers
 
diff --git a/things/api/model/definition_id.go b/things/api/model/definition_id.go
index f81925e..df84fb5 100644
--- a/things/api/model/definition_id.go
+++ b/things/api/model/definition_id.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package model
 
diff --git a/things/api/model/feature.go b/things/api/model/feature.go
index 99e977d..9cb4f07 100644
--- a/things/api/model/feature.go
+++ b/things/api/model/feature.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package model
 
diff --git a/things/api/model/namespaced_id.go b/things/api/model/namespaced_id.go
index 2a93e01..5931f4f 100644
--- a/things/api/model/namespaced_id.go
+++ b/things/api/model/namespaced_id.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package model
 
diff --git a/things/api/model/registry.go b/things/api/model/registry.go
index 7a001da..81307b2 100644
--- a/things/api/model/registry.go
+++ b/things/api/model/registry.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package model
 
diff --git a/things/api/model/thing.go b/things/api/model/thing.go
index 27bff0b..645a23e 100644
--- a/things/api/model/thing.go
+++ b/things/api/model/thing.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package model
 
diff --git a/things/client/client.go b/things/client/client.go
index 537eddc..148908c 100644
--- a/things/client/client.go
+++ b/things/client/client.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/client_config.go b/things/client/client_config.go
index c502c1c..98b9674 100644
--- a/things/client/client_config.go
+++ b/things/client/client_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/client_handler_commands.go b/things/client/client_handler_commands.go
index 5f3b2b5..ba766b3 100644
--- a/things/client/client_handler_commands.go
+++ b/things/client/client_handler_commands.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/client_handler_errors.go b/things/client/client_handler_errors.go
index 11b794e..695dfd1 100644
--- a/things/client/client_handler_errors.go
+++ b/things/client/client_handler_errors.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/client_handler_events.go b/things/client/client_handler_events.go
index 588c8d6..b79896a 100644
--- a/things/client/client_handler_events.go
+++ b/things/client/client_handler_events.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/client_handler_utils.go b/things/client/client_handler_utils.go
index 36ffcb3..05512ae 100644
--- a/things/client/client_handler_utils.go
+++ b/things/client/client_handler_utils.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/client_init.go b/things/client/client_init.go
index 35d449b..6f3ee3a 100644
--- a/things/client/client_init.go
+++ b/things/client/client_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/client_internal.go b/things/client/client_internal.go
index 50aa539..3ccecfb 100644
--- a/things/client/client_internal.go
+++ b/things/client/client_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/client_local_config.go b/things/client/client_local_config.go
index f5e376a..ff54790 100644
--- a/things/client/client_local_config.go
+++ b/things/client/client_local_config.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/definition_id.go b/things/client/definition_id.go
index 623bd2a..2932dd7 100644
--- a/things/client/definition_id.go
+++ b/things/client/definition_id.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/device.go b/things/client/device.go
index e05decf..cc1581e 100644
--- a/things/client/device.go
+++ b/things/client/device.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/device_connection.go b/things/client/device_connection.go
index 06c2823..f54f977 100644
--- a/things/client/device_connection.go
+++ b/things/client/device_connection.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/device_credentials.go b/things/client/device_credentials.go
index 9537f0d..3c4abd5 100644
--- a/things/client/device_credentials.go
+++ b/things/client/device_credentials.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/device_init.go b/things/client/device_init.go
index 82d13b7..e1f1fae 100644
--- a/things/client/device_init.go
+++ b/things/client/device_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/feature.go b/things/client/feature.go
index ff53bb9..94ae217 100644
--- a/things/client/feature.go
+++ b/things/client/feature.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/feature_init.go b/things/client/feature_init.go
index 73cddbe..7d27d88 100644
--- a/things/client/feature_init.go
+++ b/things/client/feature_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/feature_internal.go b/things/client/feature_internal.go
index 936e957..0e60526 100644
--- a/things/client/feature_internal.go
+++ b/things/client/feature_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/generator.go b/things/client/generator.go
index 46a5771..c69ce64 100644
--- a/things/client/generator.go
+++ b/things/client/generator.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/headers.go b/things/client/headers.go
index 975be49..7b9a5b7 100644
--- a/things/client/headers.go
+++ b/things/client/headers.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/headers_init.go b/things/client/headers_init.go
index 35bc1ec..8b5b2ee 100644
--- a/things/client/headers_init.go
+++ b/things/client/headers_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/json_util.go b/things/client/json_util.go
index c09bd6c..f2f44b1 100644
--- a/things/client/json_util.go
+++ b/things/client/json_util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/namespaced_id.go b/things/client/namespaced_id.go
index 42911aa..75b1689 100644
--- a/things/client/namespaced_id.go
+++ b/things/client/namespaced_id.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/protocol/envelope.go b/things/client/protocol/envelope.go
index 783da43..12795cf 100644
--- a/things/client/protocol/envelope.go
+++ b/things/client/protocol/envelope.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package protocol
 
diff --git a/things/client/protocol/headers.go b/things/client/protocol/headers.go
index 09400db..9d1f94d 100644
--- a/things/client/protocol/headers.go
+++ b/things/client/protocol/headers.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package protocol
 
diff --git a/things/client/protocol/topic.go b/things/client/protocol/topic.go
index c6a9643..3d07abc 100644
--- a/things/client/protocol/topic.go
+++ b/things/client/protocol/topic.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package protocol
 
diff --git a/things/client/thing.go b/things/client/thing.go
index eec8f07..0f15a54 100644
--- a/things/client/thing.go
+++ b/things/client/thing.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/thing_errors.go b/things/client/thing_errors.go
index b5456bb..e0f0e3f 100644
--- a/things/client/thing_errors.go
+++ b/things/client/thing_errors.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/thing_init.go b/things/client/thing_init.go
index 879aaeb..959a99d 100644
--- a/things/client/thing_init.go
+++ b/things/client/thing_init.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/thing_internal.go b/things/client/thing_internal.go
index d6d6334..e01c424 100644
--- a/things/client/thing_internal.go
+++ b/things/client/thing_internal.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client
 
diff --git a/things/client/util.go b/things/client/util.go
index 43c7b9d..531e207 100644
--- a/things/client/util.go
+++ b/things/client/util.go
@@ -5,9 +5,10 @@
 //
 // This program and the accompanying materials are made available under the
 // terms of the Eclipse Public License 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
 //
-// SPDX-License-Identifier: EPL-2.0
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
 
 package client