diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9e1aa50173..96acf62626 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/docker/launch.sh b/docker/launch.sh
index 24f66568da..041784cd5b 100755
--- a/docker/launch.sh
+++ b/docker/launch.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/orchestrator-controller.yaml b/kubernetes/orchestrator-controller.yaml
index 59a5cb5b9d..d39941efb4 100644
--- a/kubernetes/orchestrator-controller.yaml
+++ b/kubernetes/orchestrator-controller.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/orchestrator-database-controller.yaml b/kubernetes/orchestrator-database-controller.yaml
index 979094ddfa..8affed3351 100644
--- a/kubernetes/orchestrator-database-controller.yaml
+++ b/kubernetes/orchestrator-database-controller.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/orchestrator-database-pv.yaml b/kubernetes/orchestrator-database-pv.yaml
index f00cfe385d..2376946e7a 100644
--- a/kubernetes/orchestrator-database-pv.yaml
+++ b/kubernetes/orchestrator-database-pv.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/orchestrator-database-pvc.yaml b/kubernetes/orchestrator-database-pvc.yaml
index 7fcf52d7e5..0dfb7d174d 100644
--- a/kubernetes/orchestrator-database-pvc.yaml
+++ b/kubernetes/orchestrator-database-pvc.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/orchestrator-database-service.yaml b/kubernetes/orchestrator-database-service.yaml
index 6629edc224..32b1acec49 100644
--- a/kubernetes/orchestrator-database-service.yaml
+++ b/kubernetes/orchestrator-database-service.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/orchestrator-pv.yaml b/kubernetes/orchestrator-pv.yaml
index e06f5fd1fa..ec6ddb0b12 100644
--- a/kubernetes/orchestrator-pv.yaml
+++ b/kubernetes/orchestrator-pv.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/orchestrator-pvc.yaml b/kubernetes/orchestrator-pvc.yaml
index aeebadbf60..495edbd364 100644
--- a/kubernetes/orchestrator-pvc.yaml
+++ b/kubernetes/orchestrator-pvc.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/orchestrator-service.yaml b/kubernetes/orchestrator-service.yaml
index 93e619bd69..4b943ca095 100644
--- a/kubernetes/orchestrator-service.yaml
+++ b/kubernetes/orchestrator-service.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/workflow-database-controller.yaml b/kubernetes/workflow-database-controller.yaml
index 0e84d5a3b7..45a2166eca 100644
--- a/kubernetes/workflow-database-controller.yaml
+++ b/kubernetes/workflow-database-controller.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/workflow-database-pv.yaml b/kubernetes/workflow-database-pv.yaml
index 4ec830971e..b9d861e47d 100644
--- a/kubernetes/workflow-database-pv.yaml
+++ b/kubernetes/workflow-database-pv.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/workflow-database-pvc.yaml b/kubernetes/workflow-database-pvc.yaml
index 880327d67a..a0dd94d0e9 100644
--- a/kubernetes/workflow-database-pvc.yaml
+++ b/kubernetes/workflow-database-pvc.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/kubernetes/workflow-database-service.yaml b/kubernetes/workflow-database-service.yaml
index 1e333f6e6d..b00606d207 100644
--- a/kubernetes/workflow-database-service.yaml
+++ b/kubernetes/workflow-database-service.yaml
@@ -1,4 +1,5 @@
 #
+# Copyright © 2015-2021 I.N.F.N.
 # Copyright © 2015-2020 Santer Reply S.p.A.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/pom.xml b/pom.xml
index 6d2e28bc2a..9bc28a6f3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,7 @@
 <!--
 
-    Copyright © 2015-2021 Santer Reply S.p.A.
+    Copyright © 2015-2021 I.N.F.N.
+    Copyright © 2015-2020 Santer Reply S.p.A.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -47,8 +48,8 @@
   </scm>
 
   <organization>
-    <name>Santer Reply S.p.A.</name>
-    <url>http://www.reply.com</url>
+    <name>I.N.F.N.</name>
+    <url>http://www.infn.it</url>
   </organization>
 
   <inceptionYear>2015</inceptionYear>
@@ -750,57 +751,6 @@
           <excludes>
             <exclude>docker/*.war</exclude>
             <exclude>src/main/java/it/reply/orchestrator/dto/kubernetes/fluxcd/**</exclude>
-            <!-- excluded because I.N.F.N. Copyright -->
-            <exclude>src/main/java/it/reply/orchestrator/config/properties/VaultProperties.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/controller/ConfigurationController.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dal/util/ResourceMetadataToJsonConverter.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/SystemEndpoints.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/QcgService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/Tenant.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/deployment/QcgJobsOrderedIterator.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/vault/VaultSecret.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/enums/PrivateNetworkType.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/exception/VaultJwtTokenExpiredException.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/exception/VaultSecretNotFoundException.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/exception/VaultServiceNotAvailableException.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/resource/CloudProviderEndpointResource.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/ConfigurationService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/ConfigurationServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/VaultService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/VaultServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/ProviderTimeout.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/deployment/providers/QcgServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/deployment/providers/factory/QcgClientFactory.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/utils/OneDataUtils.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/controller/ConfigurationControllerTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/service/commands/ProviderTimeoutTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/service/deployment/providers/QcgServiceTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/service/ConfigurationServiceTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/service/VaultServiceTest.java</exclude>
-            <exclude>src/test/java/it/reply/orchestrator/controller/DeploymentScheduleControllerTest.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/security/IamUserInfo.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/CloudProviderEndpoint.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/workflow/CloudServicesOrderedIterator.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/KubernetesService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/ChronosService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/ComputeService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/MarathonService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/CloudService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dto/cmdb/StorageService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/config/properties/XdcClientProperties.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/TemplateServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/SlamServiceV1Impl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/security/OAuth2TokenService.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/CloudProviderEndpointServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/AbstractCmdbServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/deployment/providers/KubernetesServiceImpl.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactory.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/DeleteTempReplicationRule.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/GetSlam.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataUpdate.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/service/commands/PrefilterCloudProviders.java</exclude>
-            <exclude>src/main/java/it/reply/orchestrator/dal/repository/ReplicationRuleRepository.java</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/src/main/java/it/reply/orchestrator/Application.java b/src/main/java/it/reply/orchestrator/Application.java
index 5bad8a78c2..0d55c99a1e 100644
--- a/src/main/java/it/reply/orchestrator/Application.java
+++ b/src/main/java/it/reply/orchestrator/Application.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/annotation/DeploymentProviderQualifier.java b/src/main/java/it/reply/orchestrator/annotation/DeploymentProviderQualifier.java
index 11db1c70e7..8ef6939ee0 100644
--- a/src/main/java/it/reply/orchestrator/annotation/DeploymentProviderQualifier.java
+++ b/src/main/java/it/reply/orchestrator/annotation/DeploymentProviderQualifier.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/annotation/ServiceVersion.java b/src/main/java/it/reply/orchestrator/annotation/ServiceVersion.java
index 142f36c69e..74787d1948 100644
--- a/src/main/java/it/reply/orchestrator/annotation/ServiceVersion.java
+++ b/src/main/java/it/reply/orchestrator/annotation/ServiceVersion.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/annotation/SpringDefaultProfile.java b/src/main/java/it/reply/orchestrator/annotation/SpringDefaultProfile.java
index 869b80fda6..0e98052eb1 100644
--- a/src/main/java/it/reply/orchestrator/annotation/SpringDefaultProfile.java
+++ b/src/main/java/it/reply/orchestrator/annotation/SpringDefaultProfile.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/DatasourceConfig.java b/src/main/java/it/reply/orchestrator/config/DatasourceConfig.java
index 8aaf2b6128..9d46806c93 100644
--- a/src/main/java/it/reply/orchestrator/config/DatasourceConfig.java
+++ b/src/main/java/it/reply/orchestrator/config/DatasourceConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/DependenciesConfig.java b/src/main/java/it/reply/orchestrator/config/DependenciesConfig.java
index 3179ee5f79..60f9205a1a 100644
--- a/src/main/java/it/reply/orchestrator/config/DependenciesConfig.java
+++ b/src/main/java/it/reply/orchestrator/config/DependenciesConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/IgniteConfig.java b/src/main/java/it/reply/orchestrator/config/IgniteConfig.java
index 046b0b7880..e98ef5e621 100644
--- a/src/main/java/it/reply/orchestrator/config/IgniteConfig.java
+++ b/src/main/java/it/reply/orchestrator/config/IgniteConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/ReactorConfig.java b/src/main/java/it/reply/orchestrator/config/ReactorConfig.java
index 56da155ba5..f696731173 100644
--- a/src/main/java/it/reply/orchestrator/config/ReactorConfig.java
+++ b/src/main/java/it/reply/orchestrator/config/ReactorConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/WebAppInitializer.java b/src/main/java/it/reply/orchestrator/config/WebAppInitializer.java
index cee93a1c7a..9f4fed2928 100644
--- a/src/main/java/it/reply/orchestrator/config/WebAppInitializer.java
+++ b/src/main/java/it/reply/orchestrator/config/WebAppInitializer.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/WebMvcConfig.java b/src/main/java/it/reply/orchestrator/config/WebMvcConfig.java
index aafcea19d7..5504020b6a 100644
--- a/src/main/java/it/reply/orchestrator/config/WebMvcConfig.java
+++ b/src/main/java/it/reply/orchestrator/config/WebMvcConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/WorkflowConfig.java b/src/main/java/it/reply/orchestrator/config/WorkflowConfig.java
index 69e7bf3533..fdd1ac8e0a 100644
--- a/src/main/java/it/reply/orchestrator/config/WorkflowConfig.java
+++ b/src/main/java/it/reply/orchestrator/config/WorkflowConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/filters/CustomRequestLoggingFilter.java b/src/main/java/it/reply/orchestrator/config/filters/CustomRequestLoggingFilter.java
index d4130becd3..ea48d067dd 100644
--- a/src/main/java/it/reply/orchestrator/config/filters/CustomRequestLoggingFilter.java
+++ b/src/main/java/it/reply/orchestrator/config/filters/CustomRequestLoggingFilter.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/CmdbProperties.java b/src/main/java/it/reply/orchestrator/config/properties/CmdbProperties.java
index 4a2dd35c77..22058215f0 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/CmdbProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/CmdbProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -55,6 +56,11 @@ public class CmdbProperties {
   private String tenantsByServiceIdPath =
       "/service/id/{serviceId}/has_many/tenants?include_docs=true";
 
+  @NotNull
+  @NonNull
+  private String tenantsListPath =
+      "/tenant/list?include_docs=true";
+
   @NotNull
   @NonNull
   private String tenantsByOrganizationIdPath =
diff --git a/src/main/java/it/reply/orchestrator/config/properties/CprProperties.java b/src/main/java/it/reply/orchestrator/config/properties/CprProperties.java
index 6764514fc6..cac7c52ad2 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/CprProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/CprProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/ImProperties.java b/src/main/java/it/reply/orchestrator/config/properties/ImProperties.java
index ebeef08113..fe9c2f5afb 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/ImProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/ImProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java b/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java
index 61bb9b0305..51d219b8c6 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/MonitoringProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/OidcProperties.java b/src/main/java/it/reply/orchestrator/config/properties/OidcProperties.java
index 013c8461fd..4e44c931a2 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/OidcProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/OidcProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/OneDataProperties.java b/src/main/java/it/reply/orchestrator/config/properties/OneDataProperties.java
index 20ddb8915c..564c164623 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/OneDataProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/OneDataProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/OrchestratorProperties.java b/src/main/java/it/reply/orchestrator/config/properties/OrchestratorProperties.java
index 1ac4a5cc3f..e8b6ed6ec1 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/OrchestratorProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/OrchestratorProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/RucioProperties.java b/src/main/java/it/reply/orchestrator/config/properties/RucioProperties.java
index 83c2e381a5..9b59b0001e 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/RucioProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/RucioProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/SlamProperties.java b/src/main/java/it/reply/orchestrator/config/properties/SlamProperties.java
index cae399ee88..3d0d863051 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/SlamProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/SlamProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/ToscaProperties.java b/src/main/java/it/reply/orchestrator/config/properties/ToscaProperties.java
index a7e5b15e82..288eea37f6 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/ToscaProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/ToscaProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/properties/VaultProperties.java b/src/main/java/it/reply/orchestrator/config/properties/VaultProperties.java
index 6d385c857e..25371c8f8c 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/VaultProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/VaultProperties.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/config/properties/XdcClientProperties.java b/src/main/java/it/reply/orchestrator/config/properties/XdcClientProperties.java
index 1b0707b4d3..2df213da46 100644
--- a/src/main/java/it/reply/orchestrator/config/properties/XdcClientProperties.java
+++ b/src/main/java/it/reply/orchestrator/config/properties/XdcClientProperties.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/config/security/AnonimousWebSecurityConfig.java b/src/main/java/it/reply/orchestrator/config/security/AnonimousWebSecurityConfig.java
index a6047ceb0c..69a86c7254 100644
--- a/src/main/java/it/reply/orchestrator/config/security/AnonimousWebSecurityConfig.java
+++ b/src/main/java/it/reply/orchestrator/config/security/AnonimousWebSecurityConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/security/AuthenticatedWebSecurityConfig.java b/src/main/java/it/reply/orchestrator/config/security/AuthenticatedWebSecurityConfig.java
index e7ab57e65f..09a3b84f9d 100644
--- a/src/main/java/it/reply/orchestrator/config/security/AuthenticatedWebSecurityConfig.java
+++ b/src/main/java/it/reply/orchestrator/config/security/AuthenticatedWebSecurityConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/config/security/BaseWebSecurityConfig.java b/src/main/java/it/reply/orchestrator/config/security/BaseWebSecurityConfig.java
index a9b8a8e6d6..523926c8cc 100644
--- a/src/main/java/it/reply/orchestrator/config/security/BaseWebSecurityConfig.java
+++ b/src/main/java/it/reply/orchestrator/config/security/BaseWebSecurityConfig.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/controller/ConfigurationController.java b/src/main/java/it/reply/orchestrator/controller/ConfigurationController.java
index 736423ab28..f4baae60c4 100644
--- a/src/main/java/it/reply/orchestrator/controller/ConfigurationController.java
+++ b/src/main/java/it/reply/orchestrator/controller/ConfigurationController.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/controller/DeploymentController.java b/src/main/java/it/reply/orchestrator/controller/DeploymentController.java
index a117a13576..512d3253c1 100644
--- a/src/main/java/it/reply/orchestrator/controller/DeploymentController.java
+++ b/src/main/java/it/reply/orchestrator/controller/DeploymentController.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -74,6 +75,8 @@ public class DeploymentController {
    *
    * @param createdBy
    *          created by name
+   * @param userGroup
+   *          user group
    * @param pageable
    *          {@link Pageable}
    * @param pagedAssembler
@@ -85,17 +88,18 @@ public class DeploymentController {
       produces = MediaType.APPLICATION_JSON_VALUE)
   public PagedResources<DeploymentResource> getDeployments(
       @RequestParam(name = "createdBy", required = false) @Nullable String createdBy,
+      @RequestParam(name = "userGroup", required = false) @Nullable String userGroup,
       @PageableDefault(sort = "createdAt", direction = Direction.DESC) Pageable pageable,
       PagedResourcesAssembler<Deployment> pagedAssembler) {
 
-    Page<Deployment> deployments = deploymentService.getDeployments(pageable, createdBy);
+    Page<Deployment> deployments = deploymentService.getDeployments(pageable, createdBy, userGroup);
 
     return pagedAssembler.toResource(deployments, deploymentResourceAssembler,
         ControllerLinkBuilder
             .linkTo(
                 DummyInvocationUtils
                     .methodOn(DeploymentController.class)
-                    .getDeployments(createdBy, pageable, pagedAssembler))
+                    .getDeployments(createdBy, userGroup, pageable, pagedAssembler))
             .withSelfRel());
 
   }
diff --git a/src/main/java/it/reply/orchestrator/controller/DeploymentScheduleController.java b/src/main/java/it/reply/orchestrator/controller/DeploymentScheduleController.java
index f421799906..749a94e6f7 100644
--- a/src/main/java/it/reply/orchestrator/controller/DeploymentScheduleController.java
+++ b/src/main/java/it/reply/orchestrator/controller/DeploymentScheduleController.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/controller/MiscController.java b/src/main/java/it/reply/orchestrator/controller/MiscController.java
index 985a4419b3..5ca0441b86 100644
--- a/src/main/java/it/reply/orchestrator/controller/MiscController.java
+++ b/src/main/java/it/reply/orchestrator/controller/MiscController.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/controller/ResourceController.java b/src/main/java/it/reply/orchestrator/controller/ResourceController.java
index 78ef8b313c..45bd8b675a 100644
--- a/src/main/java/it/reply/orchestrator/controller/ResourceController.java
+++ b/src/main/java/it/reply/orchestrator/controller/ResourceController.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/controller/TemplateController.java b/src/main/java/it/reply/orchestrator/controller/TemplateController.java
index 6bb9cb1b00..1c2e84d54d 100644
--- a/src/main/java/it/reply/orchestrator/controller/TemplateController.java
+++ b/src/main/java/it/reply/orchestrator/controller/TemplateController.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/AbstractResourceEntity.java b/src/main/java/it/reply/orchestrator/dal/entity/AbstractResourceEntity.java
index 4aa16524a0..df0ba8e29c 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/AbstractResourceEntity.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/AbstractResourceEntity.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/Deployment.java b/src/main/java/it/reply/orchestrator/dal/entity/Deployment.java
index 1908ba1d99..17a052d498 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/Deployment.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/Deployment.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -86,6 +87,9 @@ public class Deployment extends AbstractResourceEntity {
   @Nullable
   private String callback;
 
+  @Nullable
+  private String userGroup;
+
   @Lob
   @Basic
   @Column(nullable = false)
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/DeploymentSchedule.java b/src/main/java/it/reply/orchestrator/dal/entity/DeploymentSchedule.java
index 5bc39c6c51..abebffae52 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/DeploymentSchedule.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/DeploymentSchedule.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/DeploymentScheduleEvent.java b/src/main/java/it/reply/orchestrator/dal/entity/DeploymentScheduleEvent.java
index dfc7318287..e700c94ea1 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/DeploymentScheduleEvent.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/DeploymentScheduleEvent.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/OidcEntity.java b/src/main/java/it/reply/orchestrator/dal/entity/OidcEntity.java
index 2ee8d4f107..6dfa5b6146 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/OidcEntity.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/OidcEntity.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/OidcEntityId.java b/src/main/java/it/reply/orchestrator/dal/entity/OidcEntityId.java
index 7ed0dd2c63..167049c59d 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/OidcEntityId.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/OidcEntityId.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/OidcIssuerAwareId.java b/src/main/java/it/reply/orchestrator/dal/entity/OidcIssuerAwareId.java
index cbc4cc3776..0820a8a796 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/OidcIssuerAwareId.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/OidcIssuerAwareId.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/OidcRefreshToken.java b/src/main/java/it/reply/orchestrator/dal/entity/OidcRefreshToken.java
index 58a4df6394..345f9edd9d 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/OidcRefreshToken.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/OidcRefreshToken.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/OidcTokenId.java b/src/main/java/it/reply/orchestrator/dal/entity/OidcTokenId.java
index ff17144308..ddba99cb8f 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/OidcTokenId.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/OidcTokenId.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/ReplicationRule.java b/src/main/java/it/reply/orchestrator/dal/entity/ReplicationRule.java
index 6703654646..e41b177425 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/ReplicationRule.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/ReplicationRule.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/Resource.java b/src/main/java/it/reply/orchestrator/dal/entity/Resource.java
index d4a6831992..dc7b7266ce 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/Resource.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/Resource.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/UuidIdentifiable.java b/src/main/java/it/reply/orchestrator/dal/entity/UuidIdentifiable.java
index 346ebcf23f..d3468acf63 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/UuidIdentifiable.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/UuidIdentifiable.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/entity/WorkflowReference.java b/src/main/java/it/reply/orchestrator/dal/entity/WorkflowReference.java
index 0a7f69c1a5..633034eeb8 100644
--- a/src/main/java/it/reply/orchestrator/dal/entity/WorkflowReference.java
+++ b/src/main/java/it/reply/orchestrator/dal/entity/WorkflowReference.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/repository/DeploymentRepository.java b/src/main/java/it/reply/orchestrator/dal/repository/DeploymentRepository.java
index a2f2a4432a..16396baf75 100644
--- a/src/main/java/it/reply/orchestrator/dal/repository/DeploymentRepository.java
+++ b/src/main/java/it/reply/orchestrator/dal/repository/DeploymentRepository.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,6 +43,13 @@ public interface DeploymentRepository extends JpaRepository<Deployment, String>
       + "where d.owner.oidcEntityId = ?#{#ownerId}")
   public Page<Deployment> findAllByOwner(@Param("ownerId") OidcEntityId ownerId, Pageable pageable);
 
+  @Query("select d "
+        + "from #{#entityName} d "
+        + "where d.owner.oidcEntityId = ?#{#ownerId} "
+        + "and d.userGroup = ?#{#userGroup}")
+  public Page<Deployment> findAllByOwner(@Param("ownerId") OidcEntityId ownerId,
+      @Param("userGroup") String userGroup, Pageable pageable);
+
   @Query("select d "
       + "from #{#entityName} d "
       + "where d.owner.oidcEntityId = ?#{#ownerId} "
@@ -50,6 +58,15 @@ public Page<Deployment> findAllByOwner(@Param("requester") OidcEntity requester,
       @Param("ownerId") OidcEntityId ownerId,
       Pageable pageable);
 
+  @Query("select d "
+      + "from #{#entityName} d "
+      + "where d.owner.oidcEntityId = ?#{#ownerId} "
+      + "and " + IN_SAME_ORGANIZATION
+      + "and d.userGroup = ?#{#userGroup}")
+  public Page<Deployment> findAllByOwner(@Param("requester") OidcEntity requester,
+      @Param("ownerId") OidcEntityId ownerId, @Param("userGroup") String userGroup,
+      Pageable pageable);
+
   @Query("select d "
       + "from #{#entityName} d "
       + "where d.id = ?#{#id} "
diff --git a/src/main/java/it/reply/orchestrator/dal/repository/DeploymentScheduleEventRepository.java b/src/main/java/it/reply/orchestrator/dal/repository/DeploymentScheduleEventRepository.java
index b15ba4c33a..f13bd5a312 100644
--- a/src/main/java/it/reply/orchestrator/dal/repository/DeploymentScheduleEventRepository.java
+++ b/src/main/java/it/reply/orchestrator/dal/repository/DeploymentScheduleEventRepository.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/repository/DeploymentScheduleRepository.java b/src/main/java/it/reply/orchestrator/dal/repository/DeploymentScheduleRepository.java
index 8c67442bf4..160d308328 100644
--- a/src/main/java/it/reply/orchestrator/dal/repository/DeploymentScheduleRepository.java
+++ b/src/main/java/it/reply/orchestrator/dal/repository/DeploymentScheduleRepository.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/repository/OidcEntityRepository.java b/src/main/java/it/reply/orchestrator/dal/repository/OidcEntityRepository.java
index ddeab57e61..7bf73c393b 100644
--- a/src/main/java/it/reply/orchestrator/dal/repository/OidcEntityRepository.java
+++ b/src/main/java/it/reply/orchestrator/dal/repository/OidcEntityRepository.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/repository/OidcTokenRepository.java b/src/main/java/it/reply/orchestrator/dal/repository/OidcTokenRepository.java
index b5b94a287d..df7bb1c89a 100644
--- a/src/main/java/it/reply/orchestrator/dal/repository/OidcTokenRepository.java
+++ b/src/main/java/it/reply/orchestrator/dal/repository/OidcTokenRepository.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/repository/ReplicationRuleRepository.java b/src/main/java/it/reply/orchestrator/dal/repository/ReplicationRuleRepository.java
index 3af958c2a8..7ac6453cc7 100644
--- a/src/main/java/it/reply/orchestrator/dal/repository/ReplicationRuleRepository.java
+++ b/src/main/java/it/reply/orchestrator/dal/repository/ReplicationRuleRepository.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dal/repository/ResourceRepository.java b/src/main/java/it/reply/orchestrator/dal/repository/ResourceRepository.java
index bc0c1fdd32..8a0961bef0 100644
--- a/src/main/java/it/reply/orchestrator/dal/repository/ResourceRepository.java
+++ b/src/main/java/it/reply/orchestrator/dal/repository/ResourceRepository.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/util/AbstractToJsonConverter.java b/src/main/java/it/reply/orchestrator/dal/util/AbstractToJsonConverter.java
index 6a09eb204c..6a7ab947eb 100644
--- a/src/main/java/it/reply/orchestrator/dal/util/AbstractToJsonConverter.java
+++ b/src/main/java/it/reply/orchestrator/dal/util/AbstractToJsonConverter.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/util/CloudProviderEndpointToJsonConverter.java b/src/main/java/it/reply/orchestrator/dal/util/CloudProviderEndpointToJsonConverter.java
index 92e852be9f..c6bf289c05 100644
--- a/src/main/java/it/reply/orchestrator/dal/util/CloudProviderEndpointToJsonConverter.java
+++ b/src/main/java/it/reply/orchestrator/dal/util/CloudProviderEndpointToJsonConverter.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/util/ListStringToJsonConverter.java b/src/main/java/it/reply/orchestrator/dal/util/ListStringToJsonConverter.java
index 4e29160eb4..5235817558 100644
--- a/src/main/java/it/reply/orchestrator/dal/util/ListStringToJsonConverter.java
+++ b/src/main/java/it/reply/orchestrator/dal/util/ListStringToJsonConverter.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/util/ObjectToJsonConverter.java b/src/main/java/it/reply/orchestrator/dal/util/ObjectToJsonConverter.java
index 96c6ad11a5..67bad961f1 100644
--- a/src/main/java/it/reply/orchestrator/dal/util/ObjectToJsonConverter.java
+++ b/src/main/java/it/reply/orchestrator/dal/util/ObjectToJsonConverter.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/util/ResourceMetadataToJsonConverter.java b/src/main/java/it/reply/orchestrator/dal/util/ResourceMetadataToJsonConverter.java
index 3fc8a3eba5..17b7df7916 100644
--- a/src/main/java/it/reply/orchestrator/dal/util/ResourceMetadataToJsonConverter.java
+++ b/src/main/java/it/reply/orchestrator/dal/util/ResourceMetadataToJsonConverter.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dal/util/SetStringToJsonConverter.java b/src/main/java/it/reply/orchestrator/dal/util/SetStringToJsonConverter.java
index 899c68e8b8..869e74c244 100644
--- a/src/main/java/it/reply/orchestrator/dal/util/SetStringToJsonConverter.java
+++ b/src/main/java/it/reply/orchestrator/dal/util/SetStringToJsonConverter.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dal/util/StrongSequentialUuidGenerator.java b/src/main/java/it/reply/orchestrator/dal/util/StrongSequentialUuidGenerator.java
index e7e73285ef..aae0583988 100644
--- a/src/main/java/it/reply/orchestrator/dal/util/StrongSequentialUuidGenerator.java
+++ b/src/main/java/it/reply/orchestrator/dal/util/StrongSequentialUuidGenerator.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/CloudProviderEndpoint.java b/src/main/java/it/reply/orchestrator/dto/CloudProviderEndpoint.java
index e561feba84..e65ea0bc7e 100644
--- a/src/main/java/it/reply/orchestrator/dto/CloudProviderEndpoint.java
+++ b/src/main/java/it/reply/orchestrator/dto/CloudProviderEndpoint.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/RankCloudProvidersMessage.java b/src/main/java/it/reply/orchestrator/dto/RankCloudProvidersMessage.java
index da7090319c..9840f6587f 100644
--- a/src/main/java/it/reply/orchestrator/dto/RankCloudProvidersMessage.java
+++ b/src/main/java/it/reply/orchestrator/dto/RankCloudProvidersMessage.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/SystemEndpoints.java b/src/main/java/it/reply/orchestrator/dto/SystemEndpoints.java
index af12149e26..6f6c68267e 100644
--- a/src/main/java/it/reply/orchestrator/dto/SystemEndpoints.java
+++ b/src/main/java/it/reply/orchestrator/dto/SystemEndpoints.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,4 +55,7 @@ public class SystemEndpoints {
   @JsonProperty("vault_url")
   private URI vaultUrl;
 
+  @Nullable
+  @JsonProperty("rucio_url")
+  private URI rucioUrl;
 }
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/ChronosService.java b/src/main/java/it/reply/orchestrator/dto/cmdb/ChronosService.java
index a62c2163da..985294d6f7 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/ChronosService.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/ChronosService.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/CloudProvider.java b/src/main/java/it/reply/orchestrator/dto/cmdb/CloudProvider.java
index b4ad3a3efa..08ea39199d 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/CloudProvider.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/CloudProvider.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/CloudService.java b/src/main/java/it/reply/orchestrator/dto/cmdb/CloudService.java
index 1b1c4c9d11..e07af6c783 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/CloudService.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/CloudService.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,6 +93,7 @@ public class CloudService implements CmdbIdentifiable {
   @Nullable
   private String parentServiceId;
 
+  @Builder.Default
   @JsonProperty("iam_enabled")
   private boolean iamEnabled = true;
 
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/CloudServiceResolver.java b/src/main/java/it/reply/orchestrator/dto/cmdb/CloudServiceResolver.java
index 602a0ae1bf..bf289e4a0b 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/CloudServiceResolver.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/CloudServiceResolver.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/CloudServiceType.java b/src/main/java/it/reply/orchestrator/dto/cmdb/CloudServiceType.java
index cae9403774..8b3041c017 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/CloudServiceType.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/CloudServiceType.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/CmdbIdentifiable.java b/src/main/java/it/reply/orchestrator/dto/cmdb/CmdbIdentifiable.java
index 90548dce9f..6bc9ce6a25 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/CmdbIdentifiable.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/CmdbIdentifiable.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/ComputeService.java b/src/main/java/it/reply/orchestrator/dto/cmdb/ComputeService.java
index 50502ba727..209fe231dc 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/ComputeService.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/ComputeService.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/Flavor.java b/src/main/java/it/reply/orchestrator/dto/cmdb/Flavor.java
index 38df85a67a..c90d1ae0da 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/Flavor.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/Flavor.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/Image.java b/src/main/java/it/reply/orchestrator/dto/cmdb/Image.java
index 4a6fca27d2..844bea0e5a 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/Image.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/Image.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/KubernetesService.java b/src/main/java/it/reply/orchestrator/dto/cmdb/KubernetesService.java
index f579f51fe2..8ce3051d28 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/KubernetesService.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/KubernetesService.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/MarathonService.java b/src/main/java/it/reply/orchestrator/dto/cmdb/MarathonService.java
index d5b30ce34f..c6eec0c3b6 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/MarathonService.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/MarathonService.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkService.java b/src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkService.java
index 78de9790f6..a35b3e4a6e 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkService.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkService.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkServiceProperties.java b/src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkServiceProperties.java
index 1f87ca4138..5e6d0f5c8f 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkServiceProperties.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/MesosFrameworkServiceProperties.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/QcgService.java b/src/main/java/it/reply/orchestrator/dto/cmdb/QcgService.java
index 676209b6c7..2cd7ed5084 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/QcgService.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/QcgService.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019-2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/StorageService.java b/src/main/java/it/reply/orchestrator/dto/cmdb/StorageService.java
index ca70f0a508..300905ff80 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/StorageService.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/StorageService.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/Tenant.java b/src/main/java/it/reply/orchestrator/dto/cmdb/Tenant.java
index 9eb49ddccf..b5640bd00f 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/Tenant.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/Tenant.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019-2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbDataWrapper.java b/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbDataWrapper.java
index ff1103dfc3..1438865a90 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbDataWrapper.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbDataWrapper.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbHasManyList.java b/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbHasManyList.java
index 514ba9d1f2..f2e368c3e1 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbHasManyList.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbHasManyList.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbRow.java b/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbRow.java
index ca130d5ac3..77f3aab208 100644
--- a/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbRow.java
+++ b/src/main/java/it/reply/orchestrator/dto/cmdb/wrappers/CmdbRow.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/common/Error.java b/src/main/java/it/reply/orchestrator/dto/common/Error.java
index 09af019807..6ac7457bcf 100644
--- a/src/main/java/it/reply/orchestrator/dto/common/Error.java
+++ b/src/main/java/it/reply/orchestrator/dto/common/Error.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/deployment/BaseWorkflowMessage.java b/src/main/java/it/reply/orchestrator/dto/deployment/BaseWorkflowMessage.java
index 6ddc8cf6cd..091bbaebc9 100644
--- a/src/main/java/it/reply/orchestrator/dto/deployment/BaseWorkflowMessage.java
+++ b/src/main/java/it/reply/orchestrator/dto/deployment/BaseWorkflowMessage.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/deployment/ChronosJobsOrderedIterator.java b/src/main/java/it/reply/orchestrator/dto/deployment/ChronosJobsOrderedIterator.java
index 8442c68ad7..dc07e0f571 100644
--- a/src/main/java/it/reply/orchestrator/dto/deployment/ChronosJobsOrderedIterator.java
+++ b/src/main/java/it/reply/orchestrator/dto/deployment/ChronosJobsOrderedIterator.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/deployment/DeploymentMessage.java b/src/main/java/it/reply/orchestrator/dto/deployment/DeploymentMessage.java
index 3fed1f02ee..32798a8e68 100644
--- a/src/main/java/it/reply/orchestrator/dto/deployment/DeploymentMessage.java
+++ b/src/main/java/it/reply/orchestrator/dto/deployment/DeploymentMessage.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/deployment/QcgJobsOrderedIterator.java b/src/main/java/it/reply/orchestrator/dto/deployment/QcgJobsOrderedIterator.java
index 383ac7859d..b936e7f79e 100644
--- a/src/main/java/it/reply/orchestrator/dto/deployment/QcgJobsOrderedIterator.java
+++ b/src/main/java/it/reply/orchestrator/dto/deployment/QcgJobsOrderedIterator.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/dynafed/Dynafed.java b/src/main/java/it/reply/orchestrator/dto/dynafed/Dynafed.java
index 11ec817fd4..b0fab5dc43 100644
--- a/src/main/java/it/reply/orchestrator/dto/dynafed/Dynafed.java
+++ b/src/main/java/it/reply/orchestrator/dto/dynafed/Dynafed.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/dynafed/Metalink.java b/src/main/java/it/reply/orchestrator/dto/dynafed/Metalink.java
index 03603f4dc5..c2f4d7e38e 100644
--- a/src/main/java/it/reply/orchestrator/dto/dynafed/Metalink.java
+++ b/src/main/java/it/reply/orchestrator/dto/dynafed/Metalink.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/mesos/MesosContainer.java b/src/main/java/it/reply/orchestrator/dto/mesos/MesosContainer.java
index 19701625ad..83b3f7d5ff 100644
--- a/src/main/java/it/reply/orchestrator/dto/mesos/MesosContainer.java
+++ b/src/main/java/it/reply/orchestrator/dto/mesos/MesosContainer.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/mesos/MesosPortMapping.java b/src/main/java/it/reply/orchestrator/dto/mesos/MesosPortMapping.java
index 3a5a4b35fb..89b2683aef 100644
--- a/src/main/java/it/reply/orchestrator/dto/mesos/MesosPortMapping.java
+++ b/src/main/java/it/reply/orchestrator/dto/mesos/MesosPortMapping.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/mesos/MesosTask.java b/src/main/java/it/reply/orchestrator/dto/mesos/MesosTask.java
index 15fc9c3838..e9bf747b7b 100644
--- a/src/main/java/it/reply/orchestrator/dto/mesos/MesosTask.java
+++ b/src/main/java/it/reply/orchestrator/dto/mesos/MesosTask.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/mesos/chronos/ChronosJob.java b/src/main/java/it/reply/orchestrator/dto/mesos/chronos/ChronosJob.java
index f720271a16..016d52d383 100644
--- a/src/main/java/it/reply/orchestrator/dto/mesos/chronos/ChronosJob.java
+++ b/src/main/java/it/reply/orchestrator/dto/mesos/chronos/ChronosJob.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/mesos/marathon/MarathonApp.java b/src/main/java/it/reply/orchestrator/dto/mesos/marathon/MarathonApp.java
index 09b12c0508..65e076757c 100644
--- a/src/main/java/it/reply/orchestrator/dto/mesos/marathon/MarathonApp.java
+++ b/src/main/java/it/reply/orchestrator/dto/mesos/marathon/MarathonApp.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/Event.java b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/Event.java
index 6b99910730..c59d80c092 100644
--- a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/Event.java
+++ b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/Event.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/EventPayload.java b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/EventPayload.java
index aaebddf4f6..49fb7e1144 100644
--- a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/EventPayload.java
+++ b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/EventPayload.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/GenericEvent.java b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/GenericEvent.java
index 9c35ef06e8..0f13b31c2e 100644
--- a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/GenericEvent.java
+++ b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/GenericEvent.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/RuleOkEvent.java b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/RuleOkEvent.java
index e1b8254377..e3ff70bef1 100644
--- a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/RuleOkEvent.java
+++ b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/RuleOkEvent.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/TransferFailedEvent.java b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/TransferFailedEvent.java
index 44db05454d..fa37dd667f 100644
--- a/src/main/java/it/reply/orchestrator/dto/messaging/rucio/TransferFailedEvent.java
+++ b/src/main/java/it/reply/orchestrator/dto/messaging/rucio/TransferFailedEvent.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/messaging/xdc/DidRegisteredEvent.java b/src/main/java/it/reply/orchestrator/dto/messaging/xdc/DidRegisteredEvent.java
index 0a51d9dd65..023185748e 100644
--- a/src/main/java/it/reply/orchestrator/dto/messaging/xdc/DidRegisteredEvent.java
+++ b/src/main/java/it/reply/orchestrator/dto/messaging/xdc/DidRegisteredEvent.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/messaging/xdc/GenericEvent.java b/src/main/java/it/reply/orchestrator/dto/messaging/xdc/GenericEvent.java
index 7949fec371..7d3c896d7f 100644
--- a/src/main/java/it/reply/orchestrator/dto/messaging/xdc/GenericEvent.java
+++ b/src/main/java/it/reply/orchestrator/dto/messaging/xdc/GenericEvent.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/monitoring/MonitoringResponse.java b/src/main/java/it/reply/orchestrator/dto/monitoring/MonitoringResponse.java
index 3ab12c6359..a51217931a 100644
--- a/src/main/java/it/reply/orchestrator/dto/monitoring/MonitoringResponse.java
+++ b/src/main/java/it/reply/orchestrator/dto/monitoring/MonitoringResponse.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/onedata/OneData.java b/src/main/java/it/reply/orchestrator/dto/onedata/OneData.java
index aede593c3c..795f77ff2f 100644
--- a/src/main/java/it/reply/orchestrator/dto/onedata/OneData.java
+++ b/src/main/java/it/reply/orchestrator/dto/onedata/OneData.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/onedata/ProviderDetails.java b/src/main/java/it/reply/orchestrator/dto/onedata/ProviderDetails.java
index 586ad05cda..d8b3cb9c5c 100644
--- a/src/main/java/it/reply/orchestrator/dto/onedata/ProviderDetails.java
+++ b/src/main/java/it/reply/orchestrator/dto/onedata/ProviderDetails.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/onedata/SpaceDetails.java b/src/main/java/it/reply/orchestrator/dto/onedata/SpaceDetails.java
index 97bef21107..2bc13242c8 100644
--- a/src/main/java/it/reply/orchestrator/dto/onedata/SpaceDetails.java
+++ b/src/main/java/it/reply/orchestrator/dto/onedata/SpaceDetails.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/onedata/Token.java b/src/main/java/it/reply/orchestrator/dto/onedata/Token.java
index a14b2896da..a5ee267937 100644
--- a/src/main/java/it/reply/orchestrator/dto/onedata/Token.java
+++ b/src/main/java/it/reply/orchestrator/dto/onedata/Token.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/onedata/Tokens.java b/src/main/java/it/reply/orchestrator/dto/onedata/Tokens.java
index c8d30c465e..9b37ab724c 100644
--- a/src/main/java/it/reply/orchestrator/dto/onedata/Tokens.java
+++ b/src/main/java/it/reply/orchestrator/dto/onedata/Tokens.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/onedata/UserSpaces.java b/src/main/java/it/reply/orchestrator/dto/onedata/UserSpaces.java
index 45fd690947..adeb08eafd 100644
--- a/src/main/java/it/reply/orchestrator/dto/onedata/UserSpaces.java
+++ b/src/main/java/it/reply/orchestrator/dto/onedata/UserSpaces.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/policies/GenericToscaPolicy.java b/src/main/java/it/reply/orchestrator/dto/policies/GenericToscaPolicy.java
index 19ab3179bd..cee76ce994 100644
--- a/src/main/java/it/reply/orchestrator/dto/policies/GenericToscaPolicy.java
+++ b/src/main/java/it/reply/orchestrator/dto/policies/GenericToscaPolicy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/policies/SlaPlacementPolicy.java b/src/main/java/it/reply/orchestrator/dto/policies/SlaPlacementPolicy.java
index 499cc6ddc6..eded1006c8 100644
--- a/src/main/java/it/reply/orchestrator/dto/policies/SlaPlacementPolicy.java
+++ b/src/main/java/it/reply/orchestrator/dto/policies/SlaPlacementPolicy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/policies/ToscaPolicy.java b/src/main/java/it/reply/orchestrator/dto/policies/ToscaPolicy.java
index 331e173155..df25b7b9ee 100644
--- a/src/main/java/it/reply/orchestrator/dto/policies/ToscaPolicy.java
+++ b/src/main/java/it/reply/orchestrator/dto/policies/ToscaPolicy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/policies/ToscaPolicyFactory.java b/src/main/java/it/reply/orchestrator/dto/policies/ToscaPolicyFactory.java
index ef1c57cc9f..5a25ce98f2 100644
--- a/src/main/java/it/reply/orchestrator/dto/policies/ToscaPolicyFactory.java
+++ b/src/main/java/it/reply/orchestrator/dto/policies/ToscaPolicyFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/ranker/CloudProviderRankerRequest.java b/src/main/java/it/reply/orchestrator/dto/ranker/CloudProviderRankerRequest.java
index 32608b66e2..63d6014d19 100644
--- a/src/main/java/it/reply/orchestrator/dto/ranker/CloudProviderRankerRequest.java
+++ b/src/main/java/it/reply/orchestrator/dto/ranker/CloudProviderRankerRequest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/ranker/Monitoring.java b/src/main/java/it/reply/orchestrator/dto/ranker/Monitoring.java
index f98f391a67..2209cd058b 100644
--- a/src/main/java/it/reply/orchestrator/dto/ranker/Monitoring.java
+++ b/src/main/java/it/reply/orchestrator/dto/ranker/Monitoring.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/ranker/MonitoringService.java b/src/main/java/it/reply/orchestrator/dto/ranker/MonitoringService.java
index 50b427c74c..069ad8e53a 100644
--- a/src/main/java/it/reply/orchestrator/dto/ranker/MonitoringService.java
+++ b/src/main/java/it/reply/orchestrator/dto/ranker/MonitoringService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/ranker/RankedCloudService.java b/src/main/java/it/reply/orchestrator/dto/ranker/RankedCloudService.java
index 8d8be5cf09..c262581f20 100644
--- a/src/main/java/it/reply/orchestrator/dto/ranker/RankedCloudService.java
+++ b/src/main/java/it/reply/orchestrator/dto/ranker/RankedCloudService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/request/DeploymentRequest.java b/src/main/java/it/reply/orchestrator/dto/request/DeploymentRequest.java
index 81cff1b271..909a80044f 100644
--- a/src/main/java/it/reply/orchestrator/dto/request/DeploymentRequest.java
+++ b/src/main/java/it/reply/orchestrator/dto/request/DeploymentRequest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -69,6 +70,9 @@ public class DeploymentRequest {
   @Builder.Default
   private boolean keepLastAttempt = false;
 
+  @Nullable
+  private String userGroup;
+
   @SuppressWarnings("null")
   @Deprecated
   protected DeploymentRequest() {
diff --git a/src/main/java/it/reply/orchestrator/dto/request/DeploymentScheduleRequest.java b/src/main/java/it/reply/orchestrator/dto/request/DeploymentScheduleRequest.java
index 71ad724ee8..89dacbccc8 100644
--- a/src/main/java/it/reply/orchestrator/dto/request/DeploymentScheduleRequest.java
+++ b/src/main/java/it/reply/orchestrator/dto/request/DeploymentScheduleRequest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -65,9 +66,10 @@ public DeploymentScheduleRequest(@NonNull String template,
       @NonNull Map<String, Object> parameters, @Nullable String callback,
       @Nullable Integer timeoutMins, @Nullable Integer providerTimeoutMins,
       @Nullable Integer maxProvidersRetry, boolean keepLastAttempt, @NonNull String fileExpression,
-      @NonNull String replicationExpression, @NonNull Integer numberOfReplicas) {
+      @NonNull String replicationExpression, @NonNull Integer numberOfReplicas,
+      @Nullable String group) {
     super(template, parameters, callback, timeoutMins, providerTimeoutMins, maxProvidersRetry,
-        keepLastAttempt);
+        keepLastAttempt, group);
     this.fileExpression = fileExpression;
     this.replicationExpression = replicationExpression;
     this.numberOfReplicas = numberOfReplicas;
diff --git a/src/main/java/it/reply/orchestrator/dto/security/AccessGrant.java b/src/main/java/it/reply/orchestrator/dto/security/AccessGrant.java
index 8fccda72ee..caa51bb927 100644
--- a/src/main/java/it/reply/orchestrator/dto/security/AccessGrant.java
+++ b/src/main/java/it/reply/orchestrator/dto/security/AccessGrant.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/security/GenericServiceCredential.java b/src/main/java/it/reply/orchestrator/dto/security/GenericServiceCredential.java
index 1b7c9c151d..861a1e1619 100644
--- a/src/main/java/it/reply/orchestrator/dto/security/GenericServiceCredential.java
+++ b/src/main/java/it/reply/orchestrator/dto/security/GenericServiceCredential.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/security/GenericServiceCredentialWithTenant.java b/src/main/java/it/reply/orchestrator/dto/security/GenericServiceCredentialWithTenant.java
index 3dd00a225a..d6930856d2 100644
--- a/src/main/java/it/reply/orchestrator/dto/security/GenericServiceCredentialWithTenant.java
+++ b/src/main/java/it/reply/orchestrator/dto/security/GenericServiceCredentialWithTenant.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/security/IamUserInfo.java b/src/main/java/it/reply/orchestrator/dto/security/IamUserInfo.java
index 9358434cdc..ae82f3e8ad 100644
--- a/src/main/java/it/reply/orchestrator/dto/security/IamUserInfo.java
+++ b/src/main/java/it/reply/orchestrator/dto/security/IamUserInfo.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/security/IndigoOAuth2Authentication.java b/src/main/java/it/reply/orchestrator/dto/security/IndigoOAuth2Authentication.java
index cb9e2fed25..a12d55fe38 100644
--- a/src/main/java/it/reply/orchestrator/dto/security/IndigoOAuth2Authentication.java
+++ b/src/main/java/it/reply/orchestrator/dto/security/IndigoOAuth2Authentication.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/security/Jackson2ScopeDeserializer.java b/src/main/java/it/reply/orchestrator/dto/security/Jackson2ScopeDeserializer.java
index 5f0e9d4951..7858ab2685 100644
--- a/src/main/java/it/reply/orchestrator/dto/security/Jackson2ScopeDeserializer.java
+++ b/src/main/java/it/reply/orchestrator/dto/security/Jackson2ScopeDeserializer.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/security/Jackson2ScopeSerializer.java b/src/main/java/it/reply/orchestrator/dto/security/Jackson2ScopeSerializer.java
index 75f81b3e94..ed965bc65f 100644
--- a/src/main/java/it/reply/orchestrator/dto/security/Jackson2ScopeSerializer.java
+++ b/src/main/java/it/reply/orchestrator/dto/security/Jackson2ScopeSerializer.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/security/ServiceCredential.java b/src/main/java/it/reply/orchestrator/dto/security/ServiceCredential.java
index ae99209b8f..c7bdab0858 100644
--- a/src/main/java/it/reply/orchestrator/dto/security/ServiceCredential.java
+++ b/src/main/java/it/reply/orchestrator/dto/security/ServiceCredential.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/security/TokenIntrospectionResponse.java b/src/main/java/it/reply/orchestrator/dto/security/TokenIntrospectionResponse.java
index abdbc503b6..71f7a73cb0 100644
--- a/src/main/java/it/reply/orchestrator/dto/security/TokenIntrospectionResponse.java
+++ b/src/main/java/it/reply/orchestrator/dto/security/TokenIntrospectionResponse.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/slam/Preference.java b/src/main/java/it/reply/orchestrator/dto/slam/Preference.java
index 0776e8263f..8e248a0c28 100644
--- a/src/main/java/it/reply/orchestrator/dto/slam/Preference.java
+++ b/src/main/java/it/reply/orchestrator/dto/slam/Preference.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/slam/PreferenceCustomer.java b/src/main/java/it/reply/orchestrator/dto/slam/PreferenceCustomer.java
index 86d9aa5834..29e1562d33 100644
--- a/src/main/java/it/reply/orchestrator/dto/slam/PreferenceCustomer.java
+++ b/src/main/java/it/reply/orchestrator/dto/slam/PreferenceCustomer.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/slam/Priority.java b/src/main/java/it/reply/orchestrator/dto/slam/Priority.java
index 6f29236e8f..72794fa0d7 100644
--- a/src/main/java/it/reply/orchestrator/dto/slam/Priority.java
+++ b/src/main/java/it/reply/orchestrator/dto/slam/Priority.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/slam/Restrictions.java b/src/main/java/it/reply/orchestrator/dto/slam/Restrictions.java
index db6b1fb7b6..8038a8a55f 100644
--- a/src/main/java/it/reply/orchestrator/dto/slam/Restrictions.java
+++ b/src/main/java/it/reply/orchestrator/dto/slam/Restrictions.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/slam/Service.java b/src/main/java/it/reply/orchestrator/dto/slam/Service.java
index a43cdeffb0..e8b20ac55c 100644
--- a/src/main/java/it/reply/orchestrator/dto/slam/Service.java
+++ b/src/main/java/it/reply/orchestrator/dto/slam/Service.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/slam/Sla.java b/src/main/java/it/reply/orchestrator/dto/slam/Sla.java
index 2ec6b373d6..9a4bca9f5d 100644
--- a/src/main/java/it/reply/orchestrator/dto/slam/Sla.java
+++ b/src/main/java/it/reply/orchestrator/dto/slam/Sla.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/slam/SlamPreferences.java b/src/main/java/it/reply/orchestrator/dto/slam/SlamPreferences.java
index fc25a4efdb..4f9e3603ab 100644
--- a/src/main/java/it/reply/orchestrator/dto/slam/SlamPreferences.java
+++ b/src/main/java/it/reply/orchestrator/dto/slam/SlamPreferences.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/slam/Target.java b/src/main/java/it/reply/orchestrator/dto/slam/Target.java
index 243dbd25a7..9da2332197 100644
--- a/src/main/java/it/reply/orchestrator/dto/slam/Target.java
+++ b/src/main/java/it/reply/orchestrator/dto/slam/Target.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/vault/TokenAuthenticationExtended.java b/src/main/java/it/reply/orchestrator/dto/vault/TokenAuthenticationExtended.java
index 59397d49cc..fa0984431c 100644
--- a/src/main/java/it/reply/orchestrator/dto/vault/TokenAuthenticationExtended.java
+++ b/src/main/java/it/reply/orchestrator/dto/vault/TokenAuthenticationExtended.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/vault/VaultSecret.java b/src/main/java/it/reply/orchestrator/dto/vault/VaultSecret.java
index 3f6de59d39..0f626e1777 100644
--- a/src/main/java/it/reply/orchestrator/dto/vault/VaultSecret.java
+++ b/src/main/java/it/reply/orchestrator/dto/vault/VaultSecret.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/vault/VaultTokenResponseExtended.java b/src/main/java/it/reply/orchestrator/dto/vault/VaultTokenResponseExtended.java
index 7d639ea1f5..81e94aea25 100644
--- a/src/main/java/it/reply/orchestrator/dto/vault/VaultTokenResponseExtended.java
+++ b/src/main/java/it/reply/orchestrator/dto/vault/VaultTokenResponseExtended.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/workflow/CloudServiceWf.java b/src/main/java/it/reply/orchestrator/dto/workflow/CloudServiceWf.java
index 9696318b81..2853991b79 100644
--- a/src/main/java/it/reply/orchestrator/dto/workflow/CloudServiceWf.java
+++ b/src/main/java/it/reply/orchestrator/dto/workflow/CloudServiceWf.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/dto/workflow/CloudServicesOrderedIterator.java b/src/main/java/it/reply/orchestrator/dto/workflow/CloudServicesOrderedIterator.java
index ba940efaad..a4e0daf0ea 100644
--- a/src/main/java/it/reply/orchestrator/dto/workflow/CloudServicesOrderedIterator.java
+++ b/src/main/java/it/reply/orchestrator/dto/workflow/CloudServicesOrderedIterator.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/dto/workflow/WorkflowListIterator.java b/src/main/java/it/reply/orchestrator/dto/workflow/WorkflowListIterator.java
index 786e517a7c..b56343d408 100644
--- a/src/main/java/it/reply/orchestrator/dto/workflow/WorkflowListIterator.java
+++ b/src/main/java/it/reply/orchestrator/dto/workflow/WorkflowListIterator.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/enums/DeploymentProvider.java b/src/main/java/it/reply/orchestrator/enums/DeploymentProvider.java
index eb927b73bf..58affd7fac 100644
--- a/src/main/java/it/reply/orchestrator/enums/DeploymentProvider.java
+++ b/src/main/java/it/reply/orchestrator/enums/DeploymentProvider.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/enums/DeploymentScheduleStatus.java b/src/main/java/it/reply/orchestrator/enums/DeploymentScheduleStatus.java
index 55d9c8c3a6..b940051c80 100644
--- a/src/main/java/it/reply/orchestrator/enums/DeploymentScheduleStatus.java
+++ b/src/main/java/it/reply/orchestrator/enums/DeploymentScheduleStatus.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/enums/DeploymentType.java b/src/main/java/it/reply/orchestrator/enums/DeploymentType.java
index b3faba1edc..a4baf89d2e 100644
--- a/src/main/java/it/reply/orchestrator/enums/DeploymentType.java
+++ b/src/main/java/it/reply/orchestrator/enums/DeploymentType.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/enums/NodeStates.java b/src/main/java/it/reply/orchestrator/enums/NodeStates.java
index 02acdc0401..04884c93d4 100644
--- a/src/main/java/it/reply/orchestrator/enums/NodeStates.java
+++ b/src/main/java/it/reply/orchestrator/enums/NodeStates.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/enums/PrivateNetworkType.java b/src/main/java/it/reply/orchestrator/enums/PrivateNetworkType.java
index d1bbaf63db..af3f1a4696 100644
--- a/src/main/java/it/reply/orchestrator/enums/PrivateNetworkType.java
+++ b/src/main/java/it/reply/orchestrator/enums/PrivateNetworkType.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019-2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/enums/ReplicationRuleStatus.java b/src/main/java/it/reply/orchestrator/enums/ReplicationRuleStatus.java
index 7ce98b98d3..dbb91d5984 100644
--- a/src/main/java/it/reply/orchestrator/enums/ReplicationRuleStatus.java
+++ b/src/main/java/it/reply/orchestrator/enums/ReplicationRuleStatus.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/enums/Status.java b/src/main/java/it/reply/orchestrator/enums/Status.java
index f500250dc7..bb0b72bfd4 100644
--- a/src/main/java/it/reply/orchestrator/enums/Status.java
+++ b/src/main/java/it/reply/orchestrator/enums/Status.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/enums/Task.java b/src/main/java/it/reply/orchestrator/enums/Task.java
index 05ffa26e63..099967d2c7 100644
--- a/src/main/java/it/reply/orchestrator/enums/Task.java
+++ b/src/main/java/it/reply/orchestrator/enums/Task.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/CustomOAuth2ExceptionRenderer.java b/src/main/java/it/reply/orchestrator/exception/CustomOAuth2ExceptionRenderer.java
index a67859e484..2e5dfe1060 100644
--- a/src/main/java/it/reply/orchestrator/exception/CustomOAuth2ExceptionRenderer.java
+++ b/src/main/java/it/reply/orchestrator/exception/CustomOAuth2ExceptionRenderer.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/GlobalControllerExceptionHandler.java b/src/main/java/it/reply/orchestrator/exception/GlobalControllerExceptionHandler.java
index 4fea50513a..438d6523f8 100644
--- a/src/main/java/it/reply/orchestrator/exception/GlobalControllerExceptionHandler.java
+++ b/src/main/java/it/reply/orchestrator/exception/GlobalControllerExceptionHandler.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/OrchestratorException.java b/src/main/java/it/reply/orchestrator/exception/OrchestratorException.java
index 3aedc06de4..171bb848af 100644
--- a/src/main/java/it/reply/orchestrator/exception/OrchestratorException.java
+++ b/src/main/java/it/reply/orchestrator/exception/OrchestratorException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/VaultJwtTokenExpiredException.java b/src/main/java/it/reply/orchestrator/exception/VaultJwtTokenExpiredException.java
index fcc5ac7483..39c214958b 100644
--- a/src/main/java/it/reply/orchestrator/exception/VaultJwtTokenExpiredException.java
+++ b/src/main/java/it/reply/orchestrator/exception/VaultJwtTokenExpiredException.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/exception/VaultSecretNotFoundException.java b/src/main/java/it/reply/orchestrator/exception/VaultSecretNotFoundException.java
index 82c5197c32..cf282d5a67 100644
--- a/src/main/java/it/reply/orchestrator/exception/VaultSecretNotFoundException.java
+++ b/src/main/java/it/reply/orchestrator/exception/VaultSecretNotFoundException.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/exception/VaultServiceNotAvailableException.java b/src/main/java/it/reply/orchestrator/exception/VaultServiceNotAvailableException.java
index 778e3680a3..44d2051e6e 100644
--- a/src/main/java/it/reply/orchestrator/exception/VaultServiceNotAvailableException.java
+++ b/src/main/java/it/reply/orchestrator/exception/VaultServiceNotAvailableException.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/exception/http/BadRequestException.java b/src/main/java/it/reply/orchestrator/exception/http/BadRequestException.java
index fe4b8611db..6f4a0b322a 100644
--- a/src/main/java/it/reply/orchestrator/exception/http/BadRequestException.java
+++ b/src/main/java/it/reply/orchestrator/exception/http/BadRequestException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/http/ConflictException.java b/src/main/java/it/reply/orchestrator/exception/http/ConflictException.java
index 19e6a09188..db4d523367 100644
--- a/src/main/java/it/reply/orchestrator/exception/http/ConflictException.java
+++ b/src/main/java/it/reply/orchestrator/exception/http/ConflictException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/http/ForbiddenException.java b/src/main/java/it/reply/orchestrator/exception/http/ForbiddenException.java
index e3c1d02ae7..de0c708bbb 100644
--- a/src/main/java/it/reply/orchestrator/exception/http/ForbiddenException.java
+++ b/src/main/java/it/reply/orchestrator/exception/http/ForbiddenException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/http/NotFoundException.java b/src/main/java/it/reply/orchestrator/exception/http/NotFoundException.java
index 8e40ba1cd7..f5c9e70fa5 100644
--- a/src/main/java/it/reply/orchestrator/exception/http/NotFoundException.java
+++ b/src/main/java/it/reply/orchestrator/exception/http/NotFoundException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/http/OrchestratorApiException.java b/src/main/java/it/reply/orchestrator/exception/http/OrchestratorApiException.java
index a60ab98be1..4fe574dee6 100644
--- a/src/main/java/it/reply/orchestrator/exception/http/OrchestratorApiException.java
+++ b/src/main/java/it/reply/orchestrator/exception/http/OrchestratorApiException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/service/BusinessWorkflowException.java b/src/main/java/it/reply/orchestrator/exception/service/BusinessWorkflowException.java
index 432323c569..c9b2c912a7 100644
--- a/src/main/java/it/reply/orchestrator/exception/service/BusinessWorkflowException.java
+++ b/src/main/java/it/reply/orchestrator/exception/service/BusinessWorkflowException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/service/DeploymentException.java b/src/main/java/it/reply/orchestrator/exception/service/DeploymentException.java
index 35b16cd84d..6b94191c71 100644
--- a/src/main/java/it/reply/orchestrator/exception/service/DeploymentException.java
+++ b/src/main/java/it/reply/orchestrator/exception/service/DeploymentException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/service/ToscaException.java b/src/main/java/it/reply/orchestrator/exception/service/ToscaException.java
index 7dcfef607b..6ff2ccf52c 100644
--- a/src/main/java/it/reply/orchestrator/exception/service/ToscaException.java
+++ b/src/main/java/it/reply/orchestrator/exception/service/ToscaException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/exception/service/WorkflowException.java b/src/main/java/it/reply/orchestrator/exception/service/WorkflowException.java
index 011fcbf921..cb94cbcb4b 100644
--- a/src/main/java/it/reply/orchestrator/exception/service/WorkflowException.java
+++ b/src/main/java/it/reply/orchestrator/exception/service/WorkflowException.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/function/RuntimeThrowingFunction.java b/src/main/java/it/reply/orchestrator/function/RuntimeThrowingFunction.java
index a22e7a43af..adf4522973 100644
--- a/src/main/java/it/reply/orchestrator/function/RuntimeThrowingFunction.java
+++ b/src/main/java/it/reply/orchestrator/function/RuntimeThrowingFunction.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/function/SerializableBiPredicate.java b/src/main/java/it/reply/orchestrator/function/SerializableBiPredicate.java
index 08fb59824f..204f8134a1 100644
--- a/src/main/java/it/reply/orchestrator/function/SerializableBiPredicate.java
+++ b/src/main/java/it/reply/orchestrator/function/SerializableBiPredicate.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/function/ThrowingConsumer.java b/src/main/java/it/reply/orchestrator/function/ThrowingConsumer.java
index 4e598dd9f6..de77f81dfe 100644
--- a/src/main/java/it/reply/orchestrator/function/ThrowingConsumer.java
+++ b/src/main/java/it/reply/orchestrator/function/ThrowingConsumer.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/function/ThrowingFunction.java b/src/main/java/it/reply/orchestrator/function/ThrowingFunction.java
index e75426c0fb..d50660ee77 100644
--- a/src/main/java/it/reply/orchestrator/function/ThrowingFunction.java
+++ b/src/main/java/it/reply/orchestrator/function/ThrowingFunction.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/function/ThrowingSupplier.java b/src/main/java/it/reply/orchestrator/function/ThrowingSupplier.java
index 30c3da1242..080c6107c0 100644
--- a/src/main/java/it/reply/orchestrator/function/ThrowingSupplier.java
+++ b/src/main/java/it/reply/orchestrator/function/ThrowingSupplier.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/function/ToscaFunction.java b/src/main/java/it/reply/orchestrator/function/ToscaFunction.java
index f0db242275..7cdd8b934d 100644
--- a/src/main/java/it/reply/orchestrator/function/ToscaFunction.java
+++ b/src/main/java/it/reply/orchestrator/function/ToscaFunction.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/resource/BaseResource.java b/src/main/java/it/reply/orchestrator/resource/BaseResource.java
index f10d32bde7..aecfd24f8c 100644
--- a/src/main/java/it/reply/orchestrator/resource/BaseResource.java
+++ b/src/main/java/it/reply/orchestrator/resource/BaseResource.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/resource/BaseResourceAssembler.java b/src/main/java/it/reply/orchestrator/resource/BaseResourceAssembler.java
index 9644ac3ee9..8314389af8 100644
--- a/src/main/java/it/reply/orchestrator/resource/BaseResourceAssembler.java
+++ b/src/main/java/it/reply/orchestrator/resource/BaseResourceAssembler.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/resource/CloudProviderEndpointResource.java b/src/main/java/it/reply/orchestrator/resource/CloudProviderEndpointResource.java
index 76e6b078c0..dd32a7b849 100644
--- a/src/main/java/it/reply/orchestrator/resource/CloudProviderEndpointResource.java
+++ b/src/main/java/it/reply/orchestrator/resource/CloudProviderEndpointResource.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/resource/DeploymentResource.java b/src/main/java/it/reply/orchestrator/resource/DeploymentResource.java
index 7918918918..49e008ce2f 100644
--- a/src/main/java/it/reply/orchestrator/resource/DeploymentResource.java
+++ b/src/main/java/it/reply/orchestrator/resource/DeploymentResource.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -60,6 +61,9 @@ public class DeploymentResource extends AbstractResource {
   @Nullable
   private String callback;
 
+  @Nullable
+  private String userGroup;
+
   @Nullable
   private String cloudProviderName;
 
@@ -73,7 +77,7 @@ public class DeploymentResource extends AbstractResource {
   protected DeploymentResource(@NonNull String uuid, @Nullable Date creationTime,
       @Nullable Date updateTime, @Nullable String physicalId, @Nullable Status status,
       @Nullable String statusReason, @Nullable Map<String, Object> outputs, @Nullable Task task,
-      @Nullable String callback, @Nullable String cloudProviderName,
+      @Nullable String callback, @Nullable String userGroup, @Nullable String cloudProviderName,
       @Nullable CloudProviderEndpointResource cloudProviderEndpoint,
       @Nullable OidcEntityId createdBy) {
     super(uuid, creationTime, updateTime, physicalId);
@@ -82,6 +86,7 @@ protected DeploymentResource(@NonNull String uuid, @Nullable Date creationTime,
     this.outputs = CommonUtils.notNullOrDefaultValue(outputs, HashMap::new);
     this.task = task;
     this.callback = callback;
+    this.userGroup = userGroup;
     this.cloudProviderName = cloudProviderName;
     this.cloudProviderEndpoint = cloudProviderEndpoint;
     this.createdBy = createdBy;
diff --git a/src/main/java/it/reply/orchestrator/resource/DeploymentResourceAssembler.java b/src/main/java/it/reply/orchestrator/resource/DeploymentResourceAssembler.java
index bd38bb5c4a..2c7cceabd2 100644
--- a/src/main/java/it/reply/orchestrator/resource/DeploymentResourceAssembler.java
+++ b/src/main/java/it/reply/orchestrator/resource/DeploymentResourceAssembler.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -83,6 +84,7 @@ protected DeploymentResource getDeploymentResource(Deployment entity, boolean ne
         .task(entity.getTask())
         .outputs(entity.getOutputs())
         .callback(entity.getCallback())
+        .userGroup(entity.getUserGroup())
         .build();
 
     Optional.ofNullable(entity.getOwner())
diff --git a/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleEventResource.java b/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleEventResource.java
index 908a532344..fc11430147 100644
--- a/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleEventResource.java
+++ b/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleEventResource.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleEventResourceAssembler.java b/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleEventResourceAssembler.java
index 4bc8c46a3d..0f1aa7e5ef 100644
--- a/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleEventResourceAssembler.java
+++ b/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleEventResourceAssembler.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleResource.java b/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleResource.java
index 2f78a0a08a..5f5a5296b2 100644
--- a/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleResource.java
+++ b/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleResource.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleResourceAssembler.java b/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleResourceAssembler.java
index dca24993ca..bee5765d84 100644
--- a/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleResourceAssembler.java
+++ b/src/main/java/it/reply/orchestrator/resource/DeploymentScheduleResourceAssembler.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/resource/common/AbstractResource.java b/src/main/java/it/reply/orchestrator/resource/common/AbstractResource.java
index 595c1e15c8..60db17946b 100644
--- a/src/main/java/it/reply/orchestrator/resource/common/AbstractResource.java
+++ b/src/main/java/it/reply/orchestrator/resource/common/AbstractResource.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/AbstractCmdbServiceImpl.java b/src/main/java/it/reply/orchestrator/service/AbstractCmdbServiceImpl.java
index 62cfb4c78a..ee1328122b 100644
--- a/src/main/java/it/reply/orchestrator/service/AbstractCmdbServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/AbstractCmdbServiceImpl.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/CallbackService.java b/src/main/java/it/reply/orchestrator/service/CallbackService.java
index b7d5d6eb6d..5cf2b5b92e 100644
--- a/src/main/java/it/reply/orchestrator/service/CallbackService.java
+++ b/src/main/java/it/reply/orchestrator/service/CallbackService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/CallbackServiceImpl.java b/src/main/java/it/reply/orchestrator/service/CallbackServiceImpl.java
index a8d29c96c3..4d7f86262d 100644
--- a/src/main/java/it/reply/orchestrator/service/CallbackServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/CallbackServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/CloudProviderEndpointServiceImpl.java b/src/main/java/it/reply/orchestrator/service/CloudProviderEndpointServiceImpl.java
index 4564ea50d4..cae92bf08e 100644
--- a/src/main/java/it/reply/orchestrator/service/CloudProviderEndpointServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/CloudProviderEndpointServiceImpl.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/CloudProviderRankerService.java b/src/main/java/it/reply/orchestrator/service/CloudProviderRankerService.java
index e3ceac32ec..fb406cce93 100644
--- a/src/main/java/it/reply/orchestrator/service/CloudProviderRankerService.java
+++ b/src/main/java/it/reply/orchestrator/service/CloudProviderRankerService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/CloudProviderRankerServiceImpl.java b/src/main/java/it/reply/orchestrator/service/CloudProviderRankerServiceImpl.java
index e9048e914b..6f69d3c907 100644
--- a/src/main/java/it/reply/orchestrator/service/CloudProviderRankerServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/CloudProviderRankerServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/CmdbService.java b/src/main/java/it/reply/orchestrator/service/CmdbService.java
index 51974ef0b6..f35e942d3f 100644
--- a/src/main/java/it/reply/orchestrator/service/CmdbService.java
+++ b/src/main/java/it/reply/orchestrator/service/CmdbService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/CmdbServiceLocalImpl.java b/src/main/java/it/reply/orchestrator/service/CmdbServiceLocalImpl.java
index dad758b580..10c75edb62 100644
--- a/src/main/java/it/reply/orchestrator/service/CmdbServiceLocalImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/CmdbServiceLocalImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/CmdbServiceV1Impl.java b/src/main/java/it/reply/orchestrator/service/CmdbServiceV1Impl.java
index 98818bc7be..87053545ec 100644
--- a/src/main/java/it/reply/orchestrator/service/CmdbServiceV1Impl.java
+++ b/src/main/java/it/reply/orchestrator/service/CmdbServiceV1Impl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,6 +31,7 @@
 import it.reply.orchestrator.exception.service.DeploymentException;
 import java.net.URI;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -263,7 +265,7 @@ public List<Tenant> getTenantsByService(String serviceId) {
     }
   }
 
-  @Override
+  /*  @Override
   public List<Tenant> getTenantsByOrganisation(String organisationId) {
 
     URI requestUri = UriComponentsBuilder
@@ -279,6 +281,31 @@ public List<Tenant> getTenantsByOrganisation(String organisationId) {
           "Error loading tenant list for organisation <" + organisationId + "> from CMDB.", ex);
     }
   }
+  */
+
+  /**
+   * Temporary hack: cmdbProperties.getTenantsByOrganizationIdPath() does not work with
+   * organization names that contain slash, e.g. kube/users. Therefore, as a workaround
+   * here we first get the full list of tenants and then we filter the list
+   */
+  @Override
+  public List<Tenant> getTenantsByOrganisation(String organisationId) {
+
+    URI requestUri = UriComponentsBuilder
+        .fromHttpUrl(cmdbProperties.getUrl() + cmdbProperties.getTenantsListPath())
+        .build()
+        .normalize()
+        .toUri();
+
+    try {
+      List<Tenant> tenants = getAll(requestUri, TENANTS_LIST_RESPONSE_TYPE);
+      return tenants.stream().filter(t -> Objects.nonNull(t.getIamOrganisation())
+                  && t.getIamOrganisation().equals(organisationId)).collect(Collectors.toList());
+    } catch (RestClientException ex) {
+      throw new DeploymentException(
+          "Error loading tenant list for organisation <" + organisationId + "> from CMDB.", ex);
+    }
+  }
 
   @Override
   public Tenant getTenantById(String tenantId) {
diff --git a/src/main/java/it/reply/orchestrator/service/ConfigurationService.java b/src/main/java/it/reply/orchestrator/service/ConfigurationService.java
index edb426c16d..3ee2cd52f3 100644
--- a/src/main/java/it/reply/orchestrator/service/ConfigurationService.java
+++ b/src/main/java/it/reply/orchestrator/service/ConfigurationService.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/ConfigurationServiceImpl.java b/src/main/java/it/reply/orchestrator/service/ConfigurationServiceImpl.java
index dc0ea1da85..c3890eadcf 100644
--- a/src/main/java/it/reply/orchestrator/service/ConfigurationServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/ConfigurationServiceImpl.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,7 @@
 import it.reply.orchestrator.config.properties.CprProperties;
 import it.reply.orchestrator.config.properties.ImProperties;
 import it.reply.orchestrator.config.properties.MonitoringProperties;
+import it.reply.orchestrator.config.properties.RucioProperties;
 import it.reply.orchestrator.config.properties.SlamProperties;
 import it.reply.orchestrator.config.properties.VaultProperties;
 import it.reply.orchestrator.dto.SystemEndpoints;
@@ -48,6 +50,9 @@ public class ConfigurationServiceImpl implements ConfigurationService {
   @Autowired
   private VaultProperties vaultProperties;
 
+  @Autowired
+  private RucioProperties rucioProperties;
+
   /**
    * Return the system configuration endpoints.
    * @return the configuration endpoints
@@ -61,6 +66,7 @@ public SystemEndpoints getConfiguration() {
         .imUrl(imProperties.getUrl())
         .monitoringUrl(monitoringProperties.getUrl())
         .vaultUrl(vaultProperties.getUrl())
+        .rucioUrl(rucioProperties.getUrl())
         .build();
   }
 
diff --git a/src/main/java/it/reply/orchestrator/service/DeploymentScheduleServiceImpl.java b/src/main/java/it/reply/orchestrator/service/DeploymentScheduleServiceImpl.java
index 81a65f499e..8de946b545 100644
--- a/src/main/java/it/reply/orchestrator/service/DeploymentScheduleServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/DeploymentScheduleServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/DeploymentService.java b/src/main/java/it/reply/orchestrator/service/DeploymentService.java
index 4e99efc862..fb83e65d92 100644
--- a/src/main/java/it/reply/orchestrator/service/DeploymentService.java
+++ b/src/main/java/it/reply/orchestrator/service/DeploymentService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +28,8 @@
 
 public interface DeploymentService {
 
-  public Page<Deployment> getDeployments(Pageable pageable, @Nullable String owner);
+  public Page<Deployment> getDeployments(Pageable pageable, @Nullable String owner,
+      @Nullable String userGroup);
 
   public Deployment getDeployment(String id);
 
diff --git a/src/main/java/it/reply/orchestrator/service/DeploymentServiceImpl.java b/src/main/java/it/reply/orchestrator/service/DeploymentServiceImpl.java
index 080f5a3355..d11ce89617 100644
--- a/src/main/java/it/reply/orchestrator/service/DeploymentServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/DeploymentServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -114,7 +115,7 @@ public class DeploymentServiceImpl implements DeploymentService {
 
   @Override
   @Transactional(readOnly = true)
-  public Page<Deployment> getDeployments(Pageable pageable, String owner) {
+  public Page<Deployment> getDeployments(Pageable pageable, String owner, String userGroup) {
     if (StringUtils.isEmpty(owner)) {
       if (isAdmin()) {
         OidcEntity requester = oauth2TokenService.generateOidcEntityFromCurrentAuth();
@@ -140,7 +141,11 @@ public Page<Deployment> getDeployments(Pageable pageable, String owner) {
     }
     if (oidcProperties.isEnabled()) {
       OidcEntity requester = oauth2TokenService.generateOidcEntityFromCurrentAuth();
-      return deploymentRepository.findAllByOwner(requester, ownerId, pageable);
+      if (StringUtils.isEmpty(userGroup)) {
+        return deploymentRepository.findAllByOwner(requester, ownerId, pageable);
+      } else {
+        return deploymentRepository.findAllByOwner(requester, ownerId, userGroup, pageable);
+      }
     } else {
       return deploymentRepository.findAllByOwner(ownerId, pageable);
     }
@@ -230,6 +235,7 @@ public Deployment createDeployment(DeploymentRequest request, OidcEntity owner,
     deployment.setTemplate(request.getTemplate());
     deployment.setParameters(request.getParameters());
     deployment.setCallback(request.getCallback());
+    deployment.setUserGroup(request.getUserGroup());
     deployment = deploymentRepository.save(deployment);
     MdcUtils.setDeploymentId(deployment.getId());
     LOG.debug("Creating deployment with template\n{}", request.getTemplate());
diff --git a/src/main/java/it/reply/orchestrator/service/DynafedServiceImpl.java b/src/main/java/it/reply/orchestrator/service/DynafedServiceImpl.java
index 8781e74656..fd4329adc0 100644
--- a/src/main/java/it/reply/orchestrator/service/DynafedServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/DynafedServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/IndigoInputsPreProcessorService.java b/src/main/java/it/reply/orchestrator/service/IndigoInputsPreProcessorService.java
index c5f937dd3a..4ed8a53207 100644
--- a/src/main/java/it/reply/orchestrator/service/IndigoInputsPreProcessorService.java
+++ b/src/main/java/it/reply/orchestrator/service/IndigoInputsPreProcessorService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/MonitoringService.java b/src/main/java/it/reply/orchestrator/service/MonitoringService.java
index 11a61ba9e5..4029a4f676 100644
--- a/src/main/java/it/reply/orchestrator/service/MonitoringService.java
+++ b/src/main/java/it/reply/orchestrator/service/MonitoringService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java b/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java
index fb58d8ee78..ab4d5daa3a 100644
--- a/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/MonitoringServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/OneDataService.java b/src/main/java/it/reply/orchestrator/service/OneDataService.java
index 8d449458f1..65ad26b1e8 100644
--- a/src/main/java/it/reply/orchestrator/service/OneDataService.java
+++ b/src/main/java/it/reply/orchestrator/service/OneDataService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/OneDataServiceImpl.java b/src/main/java/it/reply/orchestrator/service/OneDataServiceImpl.java
index cd4c7433d3..b4f235825c 100644
--- a/src/main/java/it/reply/orchestrator/service/OneDataServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/OneDataServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/ResourceService.java b/src/main/java/it/reply/orchestrator/service/ResourceService.java
index 3a191534c4..359461b3d9 100644
--- a/src/main/java/it/reply/orchestrator/service/ResourceService.java
+++ b/src/main/java/it/reply/orchestrator/service/ResourceService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/ResourceServiceImpl.java b/src/main/java/it/reply/orchestrator/service/ResourceServiceImpl.java
index 1d14f77cda..7810846c26 100644
--- a/src/main/java/it/reply/orchestrator/service/ResourceServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/ResourceServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/RucioService.java b/src/main/java/it/reply/orchestrator/service/RucioService.java
index d4c2fe84a4..108584aaf8 100644
--- a/src/main/java/it/reply/orchestrator/service/RucioService.java
+++ b/src/main/java/it/reply/orchestrator/service/RucioService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/SlamService.java b/src/main/java/it/reply/orchestrator/service/SlamService.java
index 63426bba70..7f24fd8037 100644
--- a/src/main/java/it/reply/orchestrator/service/SlamService.java
+++ b/src/main/java/it/reply/orchestrator/service/SlamService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,8 +20,10 @@
 import it.reply.orchestrator.dal.entity.OidcTokenId;
 import it.reply.orchestrator.dto.slam.SlamPreferences;
 
+import javax.annotation.Nullable;
+
 public interface SlamService {
 
-  public SlamPreferences getCustomerPreferences(OidcTokenId tokenId);
+  public SlamPreferences getCustomerPreferences(OidcTokenId tokenId, @Nullable String userGroup);
 
 }
diff --git a/src/main/java/it/reply/orchestrator/service/SlamServiceLocalImpl.java b/src/main/java/it/reply/orchestrator/service/SlamServiceLocalImpl.java
index 0819166159..eff08678ca 100644
--- a/src/main/java/it/reply/orchestrator/service/SlamServiceLocalImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/SlamServiceLocalImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +29,10 @@
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
+
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Service;
@@ -72,8 +77,9 @@ private Map<String, SlamPreferences> loadData() {
   }
 
   @Override
-  public SlamPreferences getCustomerPreferences(OidcTokenId tokenId) {
-    String slamCustomer = oauth2TokenService.getOrganization(tokenId);
+  public SlamPreferences getCustomerPreferences(OidcTokenId tokenId, @Nullable String userGroup) {
+    String slamCustomer = Optional.ofNullable(userGroup)
+        .orElse(oauth2TokenService.getOrganization(tokenId));
 
     return loadData().get(slamCustomer);
   }
diff --git a/src/main/java/it/reply/orchestrator/service/SlamServiceV1Impl.java b/src/main/java/it/reply/orchestrator/service/SlamServiceV1Impl.java
index bbaabd8cd4..544be29261 100644
--- a/src/main/java/it/reply/orchestrator/service/SlamServiceV1Impl.java
+++ b/src/main/java/it/reply/orchestrator/service/SlamServiceV1Impl.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,9 @@
 import it.reply.orchestrator.service.security.OAuth2TokenService;
 
 import java.net.URI;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
 
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.http.HttpHeaders;
@@ -64,9 +67,10 @@ public SlamServiceV1Impl(
   }
 
   @Override
-  public SlamPreferences getCustomerPreferences(OidcTokenId tokenId) {
+  public SlamPreferences getCustomerPreferences(OidcTokenId tokenId, @Nullable String userGroup) {
 
-    String slamCustomer = oauth2TokenService.getOrganization(tokenId);
+    String slamCustomer = Optional.ofNullable(userGroup)
+        .orElse(oauth2TokenService.getOrganization(tokenId));
 
     URI requestUri = UriComponentsBuilder
         .fromHttpUrl(slamProperties.getUrl() + slamProperties.getCustomerPreferencesPath())
diff --git a/src/main/java/it/reply/orchestrator/service/TemplateService.java b/src/main/java/it/reply/orchestrator/service/TemplateService.java
index 7d68c08d96..0533d72847 100644
--- a/src/main/java/it/reply/orchestrator/service/TemplateService.java
+++ b/src/main/java/it/reply/orchestrator/service/TemplateService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/TemplateServiceImpl.java b/src/main/java/it/reply/orchestrator/service/TemplateServiceImpl.java
index 2592857825..ffa6f47d8b 100644
--- a/src/main/java/it/reply/orchestrator/service/TemplateServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/TemplateServiceImpl.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/ToscaService.java b/src/main/java/it/reply/orchestrator/service/ToscaService.java
index 2b10968783..eefb570909 100644
--- a/src/main/java/it/reply/orchestrator/service/ToscaService.java
+++ b/src/main/java/it/reply/orchestrator/service/ToscaService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/ToscaServiceImpl.java b/src/main/java/it/reply/orchestrator/service/ToscaServiceImpl.java
index 58d86edde6..d54eb00d7f 100644
--- a/src/main/java/it/reply/orchestrator/service/ToscaServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/ToscaServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/VaultService.java b/src/main/java/it/reply/orchestrator/service/VaultService.java
index f1766fdf2f..74c4deb014 100644
--- a/src/main/java/it/reply/orchestrator/service/VaultService.java
+++ b/src/main/java/it/reply/orchestrator/service/VaultService.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/VaultServiceImpl.java b/src/main/java/it/reply/orchestrator/service/VaultServiceImpl.java
index c703f9cd16..17d0569be5 100644
--- a/src/main/java/it/reply/orchestrator/service/VaultServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/VaultServiceImpl.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/commands/BaseDeployCommand.java b/src/main/java/it/reply/orchestrator/service/commands/BaseDeployCommand.java
index 236d948c76..c80fa7fbc3 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/BaseDeployCommand.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/BaseDeployCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/BaseJavaDelegate.java b/src/main/java/it/reply/orchestrator/service/commands/BaseJavaDelegate.java
index fb91ccf05d..f86b72cc90 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/BaseJavaDelegate.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/BaseJavaDelegate.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/BaseRankCloudProvidersCommand.java b/src/main/java/it/reply/orchestrator/service/commands/BaseRankCloudProvidersCommand.java
index b942227345..0c5b58f202 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/BaseRankCloudProvidersCommand.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/BaseRankCloudProvidersCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/BaseWorkflowCommand.java b/src/main/java/it/reply/orchestrator/service/commands/BaseWorkflowCommand.java
index ebae263a09..b0d05b5860 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/BaseWorkflowCommand.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/BaseWorkflowCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/CheckMainReplicationRule.java b/src/main/java/it/reply/orchestrator/service/commands/CheckMainReplicationRule.java
index 81af339e66..e818335bc0 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/CheckMainReplicationRule.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/CheckMainReplicationRule.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/CheckTempReplicationRule.java b/src/main/java/it/reply/orchestrator/service/commands/CheckTempReplicationRule.java
index fe2c662a68..71e7ddcb4b 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/CheckTempReplicationRule.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/CheckTempReplicationRule.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/CleanFailedDeployment.java b/src/main/java/it/reply/orchestrator/service/commands/CleanFailedDeployment.java
index 90a1b6b7f1..3cb7bdd0c8 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/CleanFailedDeployment.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/CleanFailedDeployment.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/CleanFailedUpdate.java b/src/main/java/it/reply/orchestrator/service/commands/CleanFailedUpdate.java
index a39d4c4f39..30a624f1ae 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/CleanFailedUpdate.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/CleanFailedUpdate.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/CreateMainReplicationRule.java b/src/main/java/it/reply/orchestrator/service/commands/CreateMainReplicationRule.java
index 3efdd7d2b9..f9df801913 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/CreateMainReplicationRule.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/CreateMainReplicationRule.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/CreateTempReplicationRule.java b/src/main/java/it/reply/orchestrator/service/commands/CreateTempReplicationRule.java
index 7dd062120a..cc1aef8078 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/CreateTempReplicationRule.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/CreateTempReplicationRule.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/DeleteTempReplicationRule.java b/src/main/java/it/reply/orchestrator/service/commands/DeleteTempReplicationRule.java
index a7f21be53d..5c72d6e509 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/DeleteTempReplicationRule.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/DeleteTempReplicationRule.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/commands/Deploy.java b/src/main/java/it/reply/orchestrator/service/commands/Deploy.java
index e7e65c3bb8..f4c52df986 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/Deploy.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/Deploy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/FinalizeDeploy.java b/src/main/java/it/reply/orchestrator/service/commands/FinalizeDeploy.java
index 6b94bb51e4..90b28c01eb 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/FinalizeDeploy.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/FinalizeDeploy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/FinalizeUndeploy.java b/src/main/java/it/reply/orchestrator/service/commands/FinalizeUndeploy.java
index 1c6dc42ee7..ac595c9ac3 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/FinalizeUndeploy.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/FinalizeUndeploy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataDeploy.java b/src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataDeploy.java
index 1922b9d8e1..c5d8632e00 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataDeploy.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataDeploy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,6 +27,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -49,8 +51,11 @@ public void execute(DelegateExecution execution,
 
     Map<String, Set<String>> servicesWithSla = new HashMap<>();
 
-    String organisation = oauth2TokenService.getOrganization(
-        rankCloudProvidersMessage.getRequestedWithToken());
+    //String organisation = oauth2TokenService.getOrganization(
+    //    rankCloudProvidersMessage.getRequestedWithToken());
+    String organisation = Optional.ofNullable(getDeployment(rankCloudProvidersMessage)
+        .getUserGroup()).orElse(oauth2TokenService.getOrganization(rankCloudProvidersMessage
+            .getRequestedWithToken()));
 
     rankCloudProvidersMessage
         .getSlamPreferences()
diff --git a/src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataUpdate.java b/src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataUpdate.java
index e418b2db52..002df38a01 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataUpdate.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/GetCmdbDataUpdate.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
 import it.reply.orchestrator.service.security.OAuth2TokenService;
 import it.reply.orchestrator.utils.WorkflowConstants;
 
+import java.util.Optional;
 import java.util.Set;
 
 import java.util.stream.Collectors;
@@ -51,8 +52,10 @@ public void execute(DelegateExecution execution, DeploymentMessage deploymentMes
     CloudProviderEndpoint cloudProviderEndpoint = deployment.getCloudProviderEndpoint();
     String cloudProviderId = deployment.getCloudProviderName();
     Set<String> serviceWithSla = Sets.newHashSet(cloudProviderEndpoint.getCpComputeServiceId());
-    String organisation = oauth2TokenService.getOrganization(
-        deploymentMessage.getRequestedWithToken());
+    //String organisation = oauth2TokenService.getOrganization(
+    //    deploymentMessage.getRequestedWithToken());
+    String organisation = Optional.ofNullable(deployment.getUserGroup())
+           .orElse(oauth2TokenService.getOrganization(deploymentMessage.getRequestedWithToken()));
     CloudProvider cloudProvider = cmdbService
         .fillCloudProviderInfo(cloudProviderId, serviceWithSla, organisation);
 
diff --git a/src/main/java/it/reply/orchestrator/service/commands/GetDynafedData.java b/src/main/java/it/reply/orchestrator/service/commands/GetDynafedData.java
index de5f3289d3..5c38c2eea3 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/GetDynafedData.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/GetDynafedData.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/GetMonitoringData.java b/src/main/java/it/reply/orchestrator/service/commands/GetMonitoringData.java
index ece11e23a2..eb2957237c 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/GetMonitoringData.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/GetMonitoringData.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/GetOneDataData.java b/src/main/java/it/reply/orchestrator/service/commands/GetOneDataData.java
index 9397f1c209..217b9a55a9 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/GetOneDataData.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/GetOneDataData.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/GetProvidersRank.java b/src/main/java/it/reply/orchestrator/service/commands/GetProvidersRank.java
index cba4386d5d..aa013bbca4 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/GetProvidersRank.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/GetProvidersRank.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/GetSlam.java b/src/main/java/it/reply/orchestrator/service/commands/GetSlam.java
index 14313dfba7..af61fdf370 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/GetSlam.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/GetSlam.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,8 @@ public void execute(DelegateExecution execution,
     OidcTokenId requestedWithToken = rankCloudProvidersMessage.getRequestedWithToken();
 
     rankCloudProvidersMessage.setSlamPreferences(slamService
-        .getCustomerPreferences(requestedWithToken));
+        .getCustomerPreferences(requestedWithToken, getDeployment(rankCloudProvidersMessage)
+            .getUserGroup()));
 
   }
 
diff --git a/src/main/java/it/reply/orchestrator/service/commands/HandleError.java b/src/main/java/it/reply/orchestrator/service/commands/HandleError.java
index 2bfa4e8ed5..5b353f19c5 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/HandleError.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/HandleError.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/HandleTimeout.java b/src/main/java/it/reply/orchestrator/service/commands/HandleTimeout.java
index 5ade7e1dd8..1f98955edb 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/HandleTimeout.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/HandleTimeout.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/Notify.java b/src/main/java/it/reply/orchestrator/service/commands/Notify.java
index f0f19d5dbe..8fc79a3538 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/Notify.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/Notify.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/PollDeploy.java b/src/main/java/it/reply/orchestrator/service/commands/PollDeploy.java
index 01a614aae9..f016fdd952 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/PollDeploy.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/PollDeploy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/PollUndeploy.java b/src/main/java/it/reply/orchestrator/service/commands/PollUndeploy.java
index cc53a9e875..09fc1448cc 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/PollUndeploy.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/PollUndeploy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/PrefilterCloudProviders.java b/src/main/java/it/reply/orchestrator/service/commands/PrefilterCloudProviders.java
index 1a65e0f901..c2c70ea704 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/PrefilterCloudProviders.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/PrefilterCloudProviders.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/commands/ProviderTimeout.java b/src/main/java/it/reply/orchestrator/service/commands/ProviderTimeout.java
index 413adc99c6..516f396bef 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/ProviderTimeout.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/ProviderTimeout.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2015-2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/commands/Undeploy.java b/src/main/java/it/reply/orchestrator/service/commands/Undeploy.java
index 1936bc7d82..80fc3a2fcf 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/Undeploy.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/Undeploy.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/Update.java b/src/main/java/it/reply/orchestrator/service/commands/Update.java
index dd6d033066..290465c9c1 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/Update.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/Update.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/commands/UpdateDeployment.java b/src/main/java/it/reply/orchestrator/service/commands/UpdateDeployment.java
index e6ad731b2f..2deef5fcd4 100644
--- a/src/main/java/it/reply/orchestrator/service/commands/UpdateDeployment.java
+++ b/src/main/java/it/reply/orchestrator/service/commands/UpdateDeployment.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -75,7 +76,7 @@ public void execute(DelegateExecution execution, DeploymentMessage deploymentMes
     if (!servicesIt.hasNext()) {
       if (servicesIt.getSize() == 0) {
         throw new BusinessWorkflowException(ErrorCode.RUNTIME_ERROR,
-            "No cloud providers available to deploy");
+            "No cloud provider meets the deployment requirements");
       } else {
         servicesIt.reset();
         String causes = CommonUtils
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/AbstractDeploymentProviderService.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/AbstractDeploymentProviderService.java
index ce8b8a5314..d87abe4063 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/AbstractDeploymentProviderService.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/AbstractDeploymentProviderService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/AbstractMesosDeploymentService.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/AbstractMesosDeploymentService.java
index 35e084adf4..356f13ff5a 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/AbstractMesosDeploymentService.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/AbstractMesosDeploymentService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceImpl.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceImpl.java
index 9c26528e04..2b7bdbfb28 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/CredentialProviderService.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/CredentialProviderService.java
index 0e93707e31..f70b7814d6 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/CredentialProviderService.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/CredentialProviderService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/CredentialProviderServiceImpl.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/CredentialProviderServiceImpl.java
index 88e1ed79b4..bb6c99a08a 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/CredentialProviderServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/CredentialProviderServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentProviderService.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentProviderService.java
index faab352fe5..c7cb37a7fc 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentProviderService.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentProviderService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentProviderServiceRegistry.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentProviderServiceRegistry.java
index cf0dfc7b13..42545dbd68 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentProviderServiceRegistry.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentProviderServiceRegistry.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelper.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelper.java
index 6efc260b5f..ae40742014 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelper.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelper.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelperImpl.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelperImpl.java
index 54b7ecedf9..f148eebaf2 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelperImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelperImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/ImServiceImpl.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/ImServiceImpl.java
index dfef04c408..464f71d5b0 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/ImServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/ImServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/KubernetesServiceImpl.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/KubernetesServiceImpl.java
index 1bcbb296d9..dbb2cde1fb 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/KubernetesServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/KubernetesServiceImpl.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -201,7 +201,10 @@ public boolean doDeploy(DeploymentMessage deploymentMessage) {
     deployment.setEndpoint(name);
     CloudProviderEndpoint chosenCloudProviderEndpoint = deploymentMessage
             .getChosenCloudProviderEndpoint();
-    String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+    //String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+
+    String namespace = Optional.ofNullable(deployment.getUserGroup())
+                       .orElse(oauth2TokenService.getOrganization(requestedWithToken));
 
     V1HelmRelease helmRelease = new V1HelmRelease()
         .apiVersion("helm.fluxcd.io/v1")
@@ -227,7 +230,9 @@ public boolean isDeployed(DeploymentMessage deploymentMessage) {
     final OidcTokenId requestedWithToken = deploymentMessage.getRequestedWithToken();
     Deployment deployment = getDeployment(deploymentMessage);
     String name = deployment.getEndpoint();
-    String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+    //String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+    String namespace = Optional.ofNullable(deployment.getUserGroup())
+                       .orElse(oauth2TokenService.getOrganization(requestedWithToken));
     V1HelmRelease helmRelease = null;
     try {
       helmRelease = this.executeWithHelmClientForResult(chosenCloudProviderEndpoint,
@@ -300,7 +305,9 @@ public boolean doUpdate(DeploymentMessage deploymentMessage, String template) {
     deployment.setEndpoint(name);
     CloudProviderEndpoint chosenCloudProviderEndpoint = deploymentMessage
             .getChosenCloudProviderEndpoint();
-    String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+    //String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+    String namespace = Optional.ofNullable(deployment.getUserGroup())
+                       .orElse(oauth2TokenService.getOrganization(requestedWithToken));
 
     try {
       this.executeWithHelmClientForResult(chosenCloudProviderEndpoint, requestedWithToken,
@@ -330,7 +337,9 @@ public boolean doUndeploy(DeploymentMessage deploymentMessage) {
     final OidcTokenId requestedWithToken = deploymentMessage.getRequestedWithToken();
     String name = deployment.getId();
     CloudProviderEndpoint chosenCloudProviderEndpoint = deployment.getCloudProviderEndpoint();
-    String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+    //String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+    String namespace = Optional.ofNullable(deployment.getUserGroup())
+                       .orElse(oauth2TokenService.getOrganization(requestedWithToken));
     try {
       this.executeWithHelmClientForResult(chosenCloudProviderEndpoint, requestedWithToken,
           client -> client.delete(namespace, name));
@@ -349,7 +358,9 @@ public boolean isUndeployed(DeploymentMessage deploymentMessage) {
     final OidcTokenId requestedWithToken = deploymentMessage.getRequestedWithToken();
     String name = deployment.getId();
     CloudProviderEndpoint chosenCloudProviderEndpoint = deployment.getCloudProviderEndpoint();
-    String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+    //String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+    String namespace = Optional.ofNullable(deployment.getUserGroup())
+                       .orElse(oauth2TokenService.getOrganization(requestedWithToken));
     try {
       this.executeWithHelmClientForResult(chosenCloudProviderEndpoint, requestedWithToken,
           client -> client.get(namespace, name));
@@ -386,7 +397,10 @@ public void finalizeDeploy(DeploymentMessage deploymentMessage) {
       final OidcTokenId requestedWithToken = deploymentMessage.getRequestedWithToken();
 
       String name = deployment.getEndpoint();
-      String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+      //String namespace = oauth2TokenService.getOrganization(requestedWithToken);
+      String namespace = Optional.ofNullable(deployment.getUserGroup())
+                       .orElse(oauth2TokenService.getOrganization(requestedWithToken));
+
       String labelSelector = String.format("app.kubernetes.io/instance=%s-%s", namespace, name);
       Map<String, NodeTemplate> nodes = Optional
           .ofNullable(ar.getTopology())
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/MarathonServiceImpl.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/MarathonServiceImpl.java
index 74dc766116..4f6a8d2a15 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/MarathonServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/MarathonServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/QcgServiceImpl.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/QcgServiceImpl.java
index efd17872f3..4ce87cd4ec 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/QcgServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/QcgServiceImpl.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019-2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ChronosClientFactory.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ChronosClientFactory.java
index cf26985f7b..682f792386 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ChronosClientFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ChronosClientFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactory.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactory.java
index b33dd8e310..df935b3931 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactory.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/KubernetesClientFactory.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/KubernetesClientFactory.java
index c2a5a894d0..69afdaf6f2 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/KubernetesClientFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/KubernetesClientFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/MarathonClientFactory.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/MarathonClientFactory.java
index ed1488fba3..e50f3ca3f0 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/MarathonClientFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/MarathonClientFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/MesosFrameworkClientFactory.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/MesosFrameworkClientFactory.java
index 286f2b441a..44d8c55b25 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/MesosFrameworkClientFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/MesosFrameworkClientFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/QcgClientFactory.java b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/QcgClientFactory.java
index 5f270b6009..d32b7d3dfa 100644
--- a/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/QcgClientFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/deployment/providers/factory/QcgClientFactory.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019-2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/messaging/RucioEventHandlerService.java b/src/main/java/it/reply/orchestrator/service/messaging/RucioEventHandlerService.java
index 7a9b9a409e..01cc48d4be 100644
--- a/src/main/java/it/reply/orchestrator/service/messaging/RucioEventHandlerService.java
+++ b/src/main/java/it/reply/orchestrator/service/messaging/RucioEventHandlerService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/messaging/RucioMessageHandler.java b/src/main/java/it/reply/orchestrator/service/messaging/RucioMessageHandler.java
index 930909c81f..85fb7a102a 100644
--- a/src/main/java/it/reply/orchestrator/service/messaging/RucioMessageHandler.java
+++ b/src/main/java/it/reply/orchestrator/service/messaging/RucioMessageHandler.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/messaging/RucioMessageHandlerFactory.java b/src/main/java/it/reply/orchestrator/service/messaging/RucioMessageHandlerFactory.java
index 837c51cc6e..a9cf51bf09 100644
--- a/src/main/java/it/reply/orchestrator/service/messaging/RucioMessageHandlerFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/messaging/RucioMessageHandlerFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/messaging/StompTcpClientSpecFactory.java b/src/main/java/it/reply/orchestrator/service/messaging/StompTcpClientSpecFactory.java
index a878df0314..eeaa763554 100644
--- a/src/main/java/it/reply/orchestrator/service/messaging/StompTcpClientSpecFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/messaging/StompTcpClientSpecFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/messaging/XdcEventHandlerService.java b/src/main/java/it/reply/orchestrator/service/messaging/XdcEventHandlerService.java
index 94a7d24f48..377b005903 100644
--- a/src/main/java/it/reply/orchestrator/service/messaging/XdcEventHandlerService.java
+++ b/src/main/java/it/reply/orchestrator/service/messaging/XdcEventHandlerService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/messaging/XdcMessageHandler.java b/src/main/java/it/reply/orchestrator/service/messaging/XdcMessageHandler.java
index b293235a66..d8106f90ea 100644
--- a/src/main/java/it/reply/orchestrator/service/messaging/XdcMessageHandler.java
+++ b/src/main/java/it/reply/orchestrator/service/messaging/XdcMessageHandler.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/messaging/XdcMessageHandlerFactory.java b/src/main/java/it/reply/orchestrator/service/messaging/XdcMessageHandlerFactory.java
index 4f3c413f01..f37c2c85f5 100644
--- a/src/main/java/it/reply/orchestrator/service/messaging/XdcMessageHandlerFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/messaging/XdcMessageHandlerFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/messaging/XdcStompClient.java b/src/main/java/it/reply/orchestrator/service/messaging/XdcStompClient.java
index 772e6c91f3..ea69b7c104 100644
--- a/src/main/java/it/reply/orchestrator/service/messaging/XdcStompClient.java
+++ b/src/main/java/it/reply/orchestrator/service/messaging/XdcStompClient.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/security/CustomOAuth2Template.java b/src/main/java/it/reply/orchestrator/service/security/CustomOAuth2Template.java
index d14f7c4a5e..c1f8bcddbe 100644
--- a/src/main/java/it/reply/orchestrator/service/security/CustomOAuth2Template.java
+++ b/src/main/java/it/reply/orchestrator/service/security/CustomOAuth2Template.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/security/CustomOAuth2TemplateFactory.java b/src/main/java/it/reply/orchestrator/service/security/CustomOAuth2TemplateFactory.java
index e6b2c435d3..90eb17eae7 100644
--- a/src/main/java/it/reply/orchestrator/service/security/CustomOAuth2TemplateFactory.java
+++ b/src/main/java/it/reply/orchestrator/service/security/CustomOAuth2TemplateFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/security/CustomUserInfoFetcher.java b/src/main/java/it/reply/orchestrator/service/security/CustomUserInfoFetcher.java
index 757532f198..a7bd060de7 100644
--- a/src/main/java/it/reply/orchestrator/service/security/CustomUserInfoFetcher.java
+++ b/src/main/java/it/reply/orchestrator/service/security/CustomUserInfoFetcher.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/security/OAuth2ConfigurationsService.java b/src/main/java/it/reply/orchestrator/service/security/OAuth2ConfigurationsService.java
index 06138aa893..cb561bedb7 100644
--- a/src/main/java/it/reply/orchestrator/service/security/OAuth2ConfigurationsService.java
+++ b/src/main/java/it/reply/orchestrator/service/security/OAuth2ConfigurationsService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/security/OAuth2TokenCacheService.java b/src/main/java/it/reply/orchestrator/service/security/OAuth2TokenCacheService.java
index 76cea8c519..aeb5a25304 100644
--- a/src/main/java/it/reply/orchestrator/service/security/OAuth2TokenCacheService.java
+++ b/src/main/java/it/reply/orchestrator/service/security/OAuth2TokenCacheService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/service/security/OAuth2TokenService.java b/src/main/java/it/reply/orchestrator/service/security/OAuth2TokenService.java
index 7e6b7916d7..f931faa5a5 100644
--- a/src/main/java/it/reply/orchestrator/service/security/OAuth2TokenService.java
+++ b/src/main/java/it/reply/orchestrator/service/security/OAuth2TokenService.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/service/security/UserInfoIntrospectingTokenService.java b/src/main/java/it/reply/orchestrator/service/security/UserInfoIntrospectingTokenService.java
index 50bc45c2e6..ae0b87460e 100644
--- a/src/main/java/it/reply/orchestrator/service/security/UserInfoIntrospectingTokenService.java
+++ b/src/main/java/it/reply/orchestrator/service/security/UserInfoIntrospectingTokenService.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/tosca/NormativeLaxImportParser.java b/src/main/java/it/reply/orchestrator/tosca/NormativeLaxImportParser.java
index f9ecb0f26a..9c8a6bf6c9 100644
--- a/src/main/java/it/reply/orchestrator/tosca/NormativeLaxImportParser.java
+++ b/src/main/java/it/reply/orchestrator/tosca/NormativeLaxImportParser.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/tosca/RemoteRepositoryServiceImpl.java b/src/main/java/it/reply/orchestrator/tosca/RemoteRepositoryServiceImpl.java
index 264381fb5b..1349dea2ab 100644
--- a/src/main/java/it/reply/orchestrator/tosca/RemoteRepositoryServiceImpl.java
+++ b/src/main/java/it/reply/orchestrator/tosca/RemoteRepositoryServiceImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/tosca/TemplateParser.java b/src/main/java/it/reply/orchestrator/tosca/TemplateParser.java
index e36c950893..c2e6ccfbbf 100644
--- a/src/main/java/it/reply/orchestrator/tosca/TemplateParser.java
+++ b/src/main/java/it/reply/orchestrator/tosca/TemplateParser.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/CommonUtils.java b/src/main/java/it/reply/orchestrator/utils/CommonUtils.java
index dd0ca5c320..603a1bfee4 100644
--- a/src/main/java/it/reply/orchestrator/utils/CommonUtils.java
+++ b/src/main/java/it/reply/orchestrator/utils/CommonUtils.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/EnumUtils.java b/src/main/java/it/reply/orchestrator/utils/EnumUtils.java
index d24baa07ec..7faa175e64 100644
--- a/src/main/java/it/reply/orchestrator/utils/EnumUtils.java
+++ b/src/main/java/it/reply/orchestrator/utils/EnumUtils.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/JsonUtils.java b/src/main/java/it/reply/orchestrator/utils/JsonUtils.java
index e5de9878e2..fb5c718910 100644
--- a/src/main/java/it/reply/orchestrator/utils/JsonUtils.java
+++ b/src/main/java/it/reply/orchestrator/utils/JsonUtils.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/JwtUtils.java b/src/main/java/it/reply/orchestrator/utils/JwtUtils.java
index a693449e87..8e183487c7 100644
--- a/src/main/java/it/reply/orchestrator/utils/JwtUtils.java
+++ b/src/main/java/it/reply/orchestrator/utils/JwtUtils.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/MdcUtils.java b/src/main/java/it/reply/orchestrator/utils/MdcUtils.java
index 4b2cc6176a..669ae7e8b6 100644
--- a/src/main/java/it/reply/orchestrator/utils/MdcUtils.java
+++ b/src/main/java/it/reply/orchestrator/utils/MdcUtils.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/Named.java b/src/main/java/it/reply/orchestrator/utils/Named.java
index 8f8f0b05b0..9da59453e1 100644
--- a/src/main/java/it/reply/orchestrator/utils/Named.java
+++ b/src/main/java/it/reply/orchestrator/utils/Named.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/OneDataUtils.java b/src/main/java/it/reply/orchestrator/utils/OneDataUtils.java
index 0129a33e27..53687848c3 100644
--- a/src/main/java/it/reply/orchestrator/utils/OneDataUtils.java
+++ b/src/main/java/it/reply/orchestrator/utils/OneDataUtils.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/it/reply/orchestrator/utils/ToscaConstants.java b/src/main/java/it/reply/orchestrator/utils/ToscaConstants.java
index 956321d7df..4fd89719ec 100644
--- a/src/main/java/it/reply/orchestrator/utils/ToscaConstants.java
+++ b/src/main/java/it/reply/orchestrator/utils/ToscaConstants.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/ToscaUtils.java b/src/main/java/it/reply/orchestrator/utils/ToscaUtils.java
index f0c00eeaed..205746bca8 100644
--- a/src/main/java/it/reply/orchestrator/utils/ToscaUtils.java
+++ b/src/main/java/it/reply/orchestrator/utils/ToscaUtils.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/WorkflowConstants.java b/src/main/java/it/reply/orchestrator/utils/WorkflowConstants.java
index 2e51572c1d..c37911a376 100644
--- a/src/main/java/it/reply/orchestrator/utils/WorkflowConstants.java
+++ b/src/main/java/it/reply/orchestrator/utils/WorkflowConstants.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/utils/WorkflowUtil.java b/src/main/java/it/reply/orchestrator/utils/WorkflowUtil.java
index b642dcbfd8..893024df36 100644
--- a/src/main/java/it/reply/orchestrator/utils/WorkflowUtil.java
+++ b/src/main/java/it/reply/orchestrator/utils/WorkflowUtil.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/workflow/CustomFailedJobCommandFactory.java b/src/main/java/it/reply/orchestrator/workflow/CustomFailedJobCommandFactory.java
index 0487edee11..a1ef0698f8 100644
--- a/src/main/java/it/reply/orchestrator/workflow/CustomFailedJobCommandFactory.java
+++ b/src/main/java/it/reply/orchestrator/workflow/CustomFailedJobCommandFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/workflow/CustomJobRetryCmd.java b/src/main/java/it/reply/orchestrator/workflow/CustomJobRetryCmd.java
index 476190a851..303cb48f70 100644
--- a/src/main/java/it/reply/orchestrator/workflow/CustomJobRetryCmd.java
+++ b/src/main/java/it/reply/orchestrator/workflow/CustomJobRetryCmd.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/workflow/HistoryJobMessageListener.java b/src/main/java/it/reply/orchestrator/workflow/HistoryJobMessageListener.java
index 437a509186..98fbd0e48b 100644
--- a/src/main/java/it/reply/orchestrator/workflow/HistoryJobMessageListener.java
+++ b/src/main/java/it/reply/orchestrator/workflow/HistoryJobMessageListener.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/workflow/JobMessageListener.java b/src/main/java/it/reply/orchestrator/workflow/JobMessageListener.java
index e601131538..333909e993 100644
--- a/src/main/java/it/reply/orchestrator/workflow/JobMessageListener.java
+++ b/src/main/java/it/reply/orchestrator/workflow/JobMessageListener.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/java/it/reply/orchestrator/workflow/MessageBasedJobManager.java b/src/main/java/it/reply/orchestrator/workflow/MessageBasedJobManager.java
index d105e79b5f..a60004c28d 100644
--- a/src/main/java/it/reply/orchestrator/workflow/MessageBasedJobManager.java
+++ b/src/main/java/it/reply/orchestrator/workflow/MessageBasedJobManager.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/main/resources/db/changelog/0010_orchestrator-deployment-usergroup-2401.yaml b/src/main/resources/db/changelog/0010_orchestrator-deployment-usergroup-2401.yaml
new file mode 100644
index 0000000000..e3e873b1e9
--- /dev/null
+++ b/src/main/resources/db/changelog/0010_orchestrator-deployment-usergroup-2401.yaml
@@ -0,0 +1,13 @@
+databaseChangeLog:
+- changeSet:
+    id: 0010_orchestrator-deployment-usergroup-2401
+    author: m.perniola
+    comment: >
+      Add field user_group to table deployment to store user group info
+    changes:
+    - addColumn:
+        columns:
+        - column:
+            name: user_group
+            type: VARCHAR(255)
+        tableName: deployment
diff --git a/src/main/resources/db/changelog/db.orchestrator.changelog-master.yaml b/src/main/resources/db/changelog/db.orchestrator.changelog-master.yaml
index 218aa5bfb7..b84591fb03 100644
--- a/src/main/resources/db/changelog/db.orchestrator.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.orchestrator.changelog-master.yaml
@@ -11,3 +11,6 @@ databaseChangeLog:
   - include:
     - file: 0009_orchestrator-deployment-schedule-2301.yaml
       relativeToChangelogFile: true
+  - include:
+    - file: 0010_orchestrator-deployment-usergroup-2401.yaml
+      relativeToChangelogFile: true
diff --git a/src/test/java/it/reply/orchestrator/IntegrationTest.java b/src/test/java/it/reply/orchestrator/IntegrationTest.java
index f7a78d42b5..06ebe1221d 100644
--- a/src/test/java/it/reply/orchestrator/IntegrationTest.java
+++ b/src/test/java/it/reply/orchestrator/IntegrationTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/annotation/SpringTestProfile.java b/src/test/java/it/reply/orchestrator/annotation/SpringTestProfile.java
index e6470c7cad..c88b749ce0 100644
--- a/src/test/java/it/reply/orchestrator/annotation/SpringTestProfile.java
+++ b/src/test/java/it/reply/orchestrator/annotation/SpringTestProfile.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/config/specific/ToscaParserAwareTest.java b/src/test/java/it/reply/orchestrator/config/specific/ToscaParserAwareTest.java
index 194fe0f2a0..e9e5d34cea 100644
--- a/src/test/java/it/reply/orchestrator/config/specific/ToscaParserAwareTest.java
+++ b/src/test/java/it/reply/orchestrator/config/specific/ToscaParserAwareTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/config/specific/WebAppConfigurationAwareIT.java b/src/test/java/it/reply/orchestrator/config/specific/WebAppConfigurationAwareIT.java
index 4e03255e15..be0b2c2574 100644
--- a/src/test/java/it/reply/orchestrator/config/specific/WebAppConfigurationAwareIT.java
+++ b/src/test/java/it/reply/orchestrator/config/specific/WebAppConfigurationAwareIT.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/controller/ConfigurationControllerTest.java b/src/test/java/it/reply/orchestrator/controller/ConfigurationControllerTest.java
index aaabe7ee2b..1106d7874e 100644
--- a/src/test/java/it/reply/orchestrator/controller/ConfigurationControllerTest.java
+++ b/src/test/java/it/reply/orchestrator/controller/ConfigurationControllerTest.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/it/reply/orchestrator/controller/ControllerTestUtils.java b/src/test/java/it/reply/orchestrator/controller/ControllerTestUtils.java
index 1ed08ef440..a74bd1ee8b 100644
--- a/src/test/java/it/reply/orchestrator/controller/ControllerTestUtils.java
+++ b/src/test/java/it/reply/orchestrator/controller/ControllerTestUtils.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/controller/DeploymentControllerTest.java b/src/test/java/it/reply/orchestrator/controller/DeploymentControllerTest.java
index c2b1f9f5f9..85c386d98e 100644
--- a/src/test/java/it/reply/orchestrator/controller/DeploymentControllerTest.java
+++ b/src/test/java/it/reply/orchestrator/controller/DeploymentControllerTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -138,7 +139,7 @@ public void getDeployments() throws Exception {
     deployments.get(0).setStatusReason("Some reason");
     deployments.get(1).setStatus(Status.CREATE_COMPLETE);
     Pageable pageable = ControllerTestUtils.createDefaultPageable();
-    Mockito.when(deploymentService.getDeployments(pageable, ownerIdString))
+    Mockito.when(deploymentService.getDeployments(pageable, ownerIdString, null))
         .thenReturn(new PageImpl<Deployment>(deployments, pageable, deployments.size()));
 
     mockMvc
@@ -178,7 +179,7 @@ public void getPagedDeployments() throws Exception {
     List<Deployment> deployments = ControllerTestUtils.createDeployments(5);
     Pageable pageable =
         new PageRequest(1, 2, new Sort(Direction.DESC, "createdAt"));
-    Mockito.when(deploymentService.getDeployments(pageable, null))
+    Mockito.when(deploymentService.getDeployments(pageable, null, null))
         .thenReturn(new PageImpl<Deployment>(deployments, pageable, deployments.size()));
 
     mockMvc
@@ -203,7 +204,7 @@ public void deploymentsPagination() throws Exception {
 
     List<Deployment> deployments = ControllerTestUtils.createDeployments(5);
     Pageable pageable = ControllerTestUtils.createDefaultPageable();
-    Mockito.when(deploymentService.getDeployments(pageable, null))
+    Mockito.when(deploymentService.getDeployments(pageable, null, null))
         .thenReturn(new PageImpl<Deployment>(deployments, pageable, deployments.size()));
 
     mockMvc
diff --git a/src/test/java/it/reply/orchestrator/controller/DeploymentScheduleControllerTest.java b/src/test/java/it/reply/orchestrator/controller/DeploymentScheduleControllerTest.java
index 68ed62134d..90c723e722 100644
--- a/src/test/java/it/reply/orchestrator/controller/DeploymentScheduleControllerTest.java
+++ b/src/test/java/it/reply/orchestrator/controller/DeploymentScheduleControllerTest.java
@@ -1,6 +1,6 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
- * Copyright © 2020-2021 I.N.F.N.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/it/reply/orchestrator/controller/MiscControllerIT.java b/src/test/java/it/reply/orchestrator/controller/MiscControllerIT.java
index 6b46f77203..deff5ad3ec 100644
--- a/src/test/java/it/reply/orchestrator/controller/MiscControllerIT.java
+++ b/src/test/java/it/reply/orchestrator/controller/MiscControllerIT.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/controller/ResourceControllerTest.java b/src/test/java/it/reply/orchestrator/controller/ResourceControllerTest.java
index d9aaef7539..fffdb159bd 100644
--- a/src/test/java/it/reply/orchestrator/controller/ResourceControllerTest.java
+++ b/src/test/java/it/reply/orchestrator/controller/ResourceControllerTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/controller/TemplateControllerTest.java b/src/test/java/it/reply/orchestrator/controller/TemplateControllerTest.java
index 106bd9fad8..3ef45d9b1e 100644
--- a/src/test/java/it/reply/orchestrator/controller/TemplateControllerTest.java
+++ b/src/test/java/it/reply/orchestrator/controller/TemplateControllerTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/dal/ResourceRepositoryIT.java b/src/test/java/it/reply/orchestrator/dal/ResourceRepositoryIT.java
index 3c0eb305c8..a5a12c5ce8 100644
--- a/src/test/java/it/reply/orchestrator/dal/ResourceRepositoryIT.java
+++ b/src/test/java/it/reply/orchestrator/dal/ResourceRepositoryIT.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/dal/util/StrongSequentialUuidGeneratorTest.java b/src/test/java/it/reply/orchestrator/dal/util/StrongSequentialUuidGeneratorTest.java
index 24b42f3e59..ec47a2ced3 100644
--- a/src/test/java/it/reply/orchestrator/dal/util/StrongSequentialUuidGeneratorTest.java
+++ b/src/test/java/it/reply/orchestrator/dal/util/StrongSequentialUuidGeneratorTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/dto/security/AccessGrantTest.java b/src/test/java/it/reply/orchestrator/dto/security/AccessGrantTest.java
index aee8fbe871..abf14e13ea 100644
--- a/src/test/java/it/reply/orchestrator/dto/security/AccessGrantTest.java
+++ b/src/test/java/it/reply/orchestrator/dto/security/AccessGrantTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/dto/workflow/WorkflowListIteratorTest.java b/src/test/java/it/reply/orchestrator/dto/workflow/WorkflowListIteratorTest.java
index 5399a7e616..3a0a13ee4d 100644
--- a/src/test/java/it/reply/orchestrator/dto/workflow/WorkflowListIteratorTest.java
+++ b/src/test/java/it/reply/orchestrator/dto/workflow/WorkflowListIteratorTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/CallbackServiceTest.java b/src/test/java/it/reply/orchestrator/service/CallbackServiceTest.java
index c4480a2a54..29b78a31f8 100644
--- a/src/test/java/it/reply/orchestrator/service/CallbackServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/CallbackServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/CloudProviderEndpointServiceTest.java b/src/test/java/it/reply/orchestrator/service/CloudProviderEndpointServiceTest.java
index a280ebdf86..2016699222 100644
--- a/src/test/java/it/reply/orchestrator/service/CloudProviderEndpointServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/CloudProviderEndpointServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/CloudProviderRankerServiceTest.java b/src/test/java/it/reply/orchestrator/service/CloudProviderRankerServiceTest.java
index c9c8cdcb17..deec48126d 100644
--- a/src/test/java/it/reply/orchestrator/service/CloudProviderRankerServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/CloudProviderRankerServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/CmdbServiceIT.java b/src/test/java/it/reply/orchestrator/service/CmdbServiceIT.java
index e4329948bb..7162d88dcf 100644
--- a/src/test/java/it/reply/orchestrator/service/CmdbServiceIT.java
+++ b/src/test/java/it/reply/orchestrator/service/CmdbServiceIT.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/ConfigurationServiceTest.java b/src/test/java/it/reply/orchestrator/service/ConfigurationServiceTest.java
index 54ce3ac30b..61f835c357 100644
--- a/src/test/java/it/reply/orchestrator/service/ConfigurationServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/ConfigurationServiceTest.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,7 @@
 import it.reply.orchestrator.config.properties.CprProperties;
 import it.reply.orchestrator.config.properties.ImProperties;
 import it.reply.orchestrator.config.properties.MonitoringProperties;
+import it.reply.orchestrator.config.properties.RucioProperties;
 import it.reply.orchestrator.config.properties.SlamProperties;
 import it.reply.orchestrator.config.properties.VaultProperties;
 import it.reply.orchestrator.dto.SystemEndpoints;
@@ -48,6 +50,7 @@ public class ConfigurationServiceTest {
   private static final URI IM_URL = URI.create("https://im.test.it");
   private static final URI MONITORING_URL = URI.create("https://monitoring.test.it");
   private static final URI VAULT_URL = URI.create("https://vault.test.it:8200");
+  private static final URI RUCIO_URL = URI.create("https://rucio.test.it:8100");
 
   @Rule
   public MockitoRule rule = MockitoJUnit.rule();
@@ -73,6 +76,9 @@ public class ConfigurationServiceTest {
   @Mock
   private VaultProperties vaultProperties;
 
+  @Mock
+  private RucioProperties rucioProperties;
+
   @Before
   public void setup() {
     when(cmdbProperties.getUrl()).thenReturn(CMDB_URL);
@@ -81,6 +87,7 @@ public void setup() {
     when(monitoringProperties.getUrl()).thenReturn(MONITORING_URL);
     when(slamProperties.getUrl()).thenReturn(SLAM_URL);
     when(vaultProperties.getUrl()).thenReturn(VAULT_URL);
+    when(rucioProperties.getUrl()).thenReturn(RUCIO_URL);
   }
 
   @Test
@@ -101,6 +108,7 @@ private SystemEndpoints createTestEndpoint() {
       .imUrl(IM_URL)
       .monitoringUrl(MONITORING_URL)
       .vaultUrl(VAULT_URL)
+      .rucioUrl(RUCIO_URL)
       .build();
   }
 
diff --git a/src/test/java/it/reply/orchestrator/service/DeploymentServiceTest.java b/src/test/java/it/reply/orchestrator/service/DeploymentServiceTest.java
index d269f31ff1..137bf1a9af 100644
--- a/src/test/java/it/reply/orchestrator/service/DeploymentServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/DeploymentServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -122,6 +123,8 @@ public class DeploymentServiceTest {
   @Autowired
   private ObjectMapper objectMapper;
 
+  private static final String nodeTypeCompute = "tosca.nodes.indigo.Compute";
+
   @Test
   public void getDeploymentsSuccessful() throws Exception {
     List<Deployment> deployments = ControllerTestUtils.createDeployments(5);
@@ -130,7 +133,7 @@ public void getDeploymentsSuccessful() throws Exception {
         .when(deploymentRepository.findAllByOwner((OidcEntityId)null, (Pageable) null))
         .thenReturn(new PageImpl<Deployment>(deployments));
 
-    Page<Deployment> pagedDeployment = deploymentService.getDeployments(null, null);
+    Page<Deployment> pagedDeployment = deploymentService.getDeployments(null, null, null);
 
     assertThat(pagedDeployment.getContent()).isEqualTo(deployments);
 
@@ -145,7 +148,7 @@ public void getDeploymentsPagedSuccessful() throws Exception {
         .when(deploymentRepository.findAllByOwner((OidcEntityId)null,pageable))
         .thenReturn(new PageImpl<Deployment>(deployments));
 
-    Page<Deployment> pagedDeployment = deploymentService.getDeployments(pageable, null);
+    Page<Deployment> pagedDeployment = deploymentService.getDeployments(pageable, null, null);
 
     assertThat(pagedDeployment.getContent()).isEqualTo(deployments);
     assertThat(pagedDeployment.getNumberOfElements()).isEqualTo(10);
@@ -253,7 +256,6 @@ public void createComputeDeploymentSuccessful() throws Exception {
 
     String nodeName1 = "server1";
     String nodeName2 = "server2";
-    String nodeType = "tosca.nodes.indigo.Compute";
 
     DeploymentRequest deploymentRequest = DeploymentRequest
         .builder()
@@ -264,7 +266,7 @@ public void createComputeDeploymentSuccessful() throws Exception {
 
     NodeTemplate nt = new NodeTemplate();
     nt.setCapabilities(capabilities);
-    nt.setType(nodeType);
+    nt.setType(nodeTypeCompute);
     nt.setName(nodeName1);
 
     Map<String, NodeTemplate> nts = Maps.newHashMap();
@@ -272,7 +274,7 @@ public void createComputeDeploymentSuccessful() throws Exception {
 
     nt = new NodeTemplate();
     nt.setCapabilities(capabilities);
-    nt.setType(nodeType);
+    nt.setType(nodeTypeCompute);
     nt.setName(nodeName2);
     nts.put(nodeName2, nt);
 
@@ -284,7 +286,7 @@ public void createComputeDeploymentSuccessful() throws Exception {
         .extracting(Resource::getToscaNodeName)
         .containsExactlyInAnyOrder(nodeName1, nodeName2);
     assertThat(returneDeployment.getResources()).allSatisfy(resource -> {
-      assertThat(resource.getToscaNodeType()).isEqualTo(nodeType);
+      assertThat(resource.getToscaNodeType()).isEqualTo(nodeTypeCompute);
       assertThat(resource.getState()).isEqualTo(NodeStates.INITIAL);
     });
 
@@ -310,7 +312,7 @@ public void createComputeScalableDeploymentSuccessful() throws Exception {
 
     NodeTemplate nt = new NodeTemplate();
     nt.setCapabilities(capabilities);
-    nt.setType("tosca.nodes.indigo.Compute");
+    nt.setType(nodeTypeCompute);
 
     Map<String, NodeTemplate> nts = Maps.newHashMap();
     nts.put("server", nt);
@@ -328,7 +330,6 @@ public void createComputeScalableWithCountDeploymentSuccessful() throws Exceptio
         .build();
 
     String nodeName = "server";
-    String nodeType = "tosca.nodes.indigo.Compute";
 
     Capability capability = new Capability();
     capability.setProperties(Maps.newHashMap());
@@ -340,7 +341,7 @@ public void createComputeScalableWithCountDeploymentSuccessful() throws Exceptio
 
     NodeTemplate nt = new NodeTemplate();
     nt.setCapabilities(capabilities);
-    nt.setType(nodeType);
+    nt.setType(nodeTypeCompute);
     nt.setName(nodeName);
 
     Map<String, NodeTemplate> nts = Maps.newHashMap();
@@ -351,7 +352,7 @@ public void createComputeScalableWithCountDeploymentSuccessful() throws Exceptio
     assertThat(returneDeployment.getResources()).hasSize(2);
     assertThat(returneDeployment.getResources()).allSatisfy(resource -> {
       assertThat(resource.getToscaNodeName()).isEqualTo(nodeName);
-      assertThat(resource.getToscaNodeType()).isEqualTo(nodeType);
+      assertThat(resource.getToscaNodeType()).isEqualTo(nodeTypeCompute);
     });
 
     returneDeployment
@@ -626,20 +627,19 @@ public void updateDeploymentSuccess(Status status) throws Exception {
   private static Map<String, NodeTemplate> getNodeTemplates() {
     String nodeName1 = "server1";
     String nodeName2 = "server2";
-    String nodeType = "tosca.nodes.indigo.Compute";
 
     Map<String, Capability> capabilities = Maps.newHashMap();
 
     NodeTemplate nt = new NodeTemplate();
     nt.setCapabilities(capabilities);
-    nt.setType(nodeType);
+    nt.setType(nodeTypeCompute);
 
     Map<String, NodeTemplate> nts = Maps.newHashMap();
     nts.put(nodeName1, nt);
 
     nt = new NodeTemplate();
     nt.setCapabilities(capabilities);
-    nt.setType(nodeType);
+    nt.setType(nodeTypeCompute);
     nts.put(nodeName2, nt);
     return nts;
   }
diff --git a/src/test/java/it/reply/orchestrator/service/DynafedServiceTest.java b/src/test/java/it/reply/orchestrator/service/DynafedServiceTest.java
index 4fc7ae7e11..c9e4db4d87 100644
--- a/src/test/java/it/reply/orchestrator/service/DynafedServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/DynafedServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/OneDataServiceTest.java b/src/test/java/it/reply/orchestrator/service/OneDataServiceTest.java
index 84c972ef86..1666c5e104 100644
--- a/src/test/java/it/reply/orchestrator/service/OneDataServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/OneDataServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/ResourceServiceTest.java b/src/test/java/it/reply/orchestrator/service/ResourceServiceTest.java
index 9510b42b76..5e4aff033a 100644
--- a/src/test/java/it/reply/orchestrator/service/ResourceServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/ResourceServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/SlamServiceIT.java b/src/test/java/it/reply/orchestrator/service/SlamServiceIT.java
index a7a1cede3b..2bbd68c91c 100644
--- a/src/test/java/it/reply/orchestrator/service/SlamServiceIT.java
+++ b/src/test/java/it/reply/orchestrator/service/SlamServiceIT.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,7 +40,7 @@ public class SlamServiceIT extends WebAppConfigurationAwareIT {
   @Test
   @Ignore
   public void getPreferencesTest() throws Exception {
-    SlamPreferences pref = service.getCustomerPreferences(null);
+    SlamPreferences pref = service.getCustomerPreferences(null, null);
     assertEquals("4401ac5dc8cfbbb737b0a02575ee3b58", pref.getSla().get(0).getId());
   }
 
diff --git a/src/test/java/it/reply/orchestrator/service/TemplateServiceTest.java b/src/test/java/it/reply/orchestrator/service/TemplateServiceTest.java
index bde2b8e6d3..03967c7cc6 100644
--- a/src/test/java/it/reply/orchestrator/service/TemplateServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/TemplateServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/ToscaServiceTest.java b/src/test/java/it/reply/orchestrator/service/ToscaServiceTest.java
index dc0f4b70ed..3701662e85 100644
--- a/src/test/java/it/reply/orchestrator/service/ToscaServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/ToscaServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/VaultServiceTest.java b/src/test/java/it/reply/orchestrator/service/VaultServiceTest.java
index 25d64a306b..de3149af0f 100644
--- a/src/test/java/it/reply/orchestrator/service/VaultServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/VaultServiceTest.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 - 2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/it/reply/orchestrator/service/commands/BaseDeployCommandTest.java b/src/test/java/it/reply/orchestrator/service/commands/BaseDeployCommandTest.java
index c4a3b1c281..082e99e611 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/BaseDeployCommandTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/BaseDeployCommandTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/BaseJavaDelegateTest.java b/src/test/java/it/reply/orchestrator/service/commands/BaseJavaDelegateTest.java
index 12b84a7333..3d62d140dd 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/BaseJavaDelegateTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/BaseJavaDelegateTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/BaseRankCloudProvidersCommandTest.java b/src/test/java/it/reply/orchestrator/service/commands/BaseRankCloudProvidersCommandTest.java
index e5e760023d..d1e0c3444c 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/BaseRankCloudProvidersCommandTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/BaseRankCloudProvidersCommandTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/BaseWorkflowCommandTest.java b/src/test/java/it/reply/orchestrator/service/commands/BaseWorkflowCommandTest.java
index ce549d531b..22d73c1f0c 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/BaseWorkflowCommandTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/BaseWorkflowCommandTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/DeployTest.java b/src/test/java/it/reply/orchestrator/service/commands/DeployTest.java
index a81625d307..a90a897e25 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/DeployTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/DeployTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/ExecutionEntityBuilder.java b/src/test/java/it/reply/orchestrator/service/commands/ExecutionEntityBuilder.java
index fdcd14573d..6ae67e9291 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/ExecutionEntityBuilder.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/ExecutionEntityBuilder.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/GetCmdbDataDeployTest.java b/src/test/java/it/reply/orchestrator/service/commands/GetCmdbDataDeployTest.java
index 2c15014ef9..5e2fb1dba5 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/GetCmdbDataDeployTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/GetCmdbDataDeployTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +18,17 @@
 package it.reply.orchestrator.service.commands;
 
 import it.reply.orchestrator.config.properties.CmdbProperties;
+import it.reply.orchestrator.controller.ControllerTestUtils;
+import it.reply.orchestrator.dal.entity.Deployment;
 import it.reply.orchestrator.dal.entity.OidcEntityId;
 import it.reply.orchestrator.dal.entity.OidcTokenId;
+import it.reply.orchestrator.dal.repository.DeploymentRepository;
+import it.reply.orchestrator.dto.deployment.DeploymentMessage;
+import it.reply.orchestrator.enums.DeploymentProvider;
 import it.reply.orchestrator.service.CmdbServiceV1Impl;
 import it.reply.orchestrator.service.security.OAuth2TokenService;
 import it.reply.orchestrator.util.IntegrationTestUtil;
+import it.reply.orchestrator.util.TestUtil;
 
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
@@ -35,7 +42,6 @@
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-
 public class GetCmdbDataDeployTest extends BaseRankCloudProvidersCommandTest<GetCmdbDataDeploy> {
 
   private static final String oidcSubject = "55555555-6666-7777-8888-999999999990";
@@ -52,6 +58,9 @@ public class GetCmdbDataDeployTest extends BaseRankCloudProvidersCommandTest<Get
   @Mock
   private OAuth2TokenService oauth2TokenService;
 
+  @Mock
+  private DeploymentRepository deploymentRepository;
+
   public GetCmdbDataDeployTest() {
     super(new GetCmdbDataDeploy());
   }
@@ -68,6 +77,13 @@ public void setup() {
     when(oauth2TokenService
         .getOrganization(eq(oidcTokenId)))
         .thenReturn("8a5377c6-a7f4-4d1c-a4cd-074ab92b6035");
+
+    Deployment deployment = ControllerTestUtils.createDeployment("mmd34483-d937-4578-bfdb-ebe196bf82dd");
+    DeploymentMessage generateDeployDm = TestUtil.generateDeployDm(deployment);
+    deployment.setDeploymentProvider(DeploymentProvider.IM);
+
+    when(deploymentRepository.findOne(generateDeployDm.getDeploymentId()))
+        .thenReturn(deployment);
   }
 
   @Test
@@ -181,7 +197,6 @@ public void doexecuteSuccesfully() throws Exception {
     Assertions
         .assertThatCode(() -> execute(serializedRankCloudProvidersMessage))
         .doesNotThrowAnyException();
-
   }
 
 }
diff --git a/src/test/java/it/reply/orchestrator/service/commands/GetMonitoringDataTest.java b/src/test/java/it/reply/orchestrator/service/commands/GetMonitoringDataTest.java
index 9a6958cb52..7af368c5a7 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/GetMonitoringDataTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/GetMonitoringDataTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/GetProvidersRankTest.java b/src/test/java/it/reply/orchestrator/service/commands/GetProvidersRankTest.java
index db374186fe..c82a97bbbf 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/GetProvidersRankTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/GetProvidersRankTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/GetSlamTest.java b/src/test/java/it/reply/orchestrator/service/commands/GetSlamTest.java
index ad1698b606..261dec3d37 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/GetSlamTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/GetSlamTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,11 +19,17 @@
 
 import it.reply.orchestrator.config.properties.OidcProperties;
 import it.reply.orchestrator.config.properties.SlamProperties;
+import it.reply.orchestrator.controller.ControllerTestUtils;
+import it.reply.orchestrator.dal.entity.Deployment;
+import it.reply.orchestrator.dal.repository.DeploymentRepository;
 import it.reply.orchestrator.dal.repository.OidcEntityRepository;
+import it.reply.orchestrator.dto.deployment.DeploymentMessage;
+import it.reply.orchestrator.enums.DeploymentProvider;
 import it.reply.orchestrator.function.ThrowingFunction;
 import it.reply.orchestrator.service.SlamServiceV1Impl;
 import it.reply.orchestrator.service.security.OAuth2TokenService;
 import it.reply.orchestrator.util.IntegrationTestUtil;
+import it.reply.orchestrator.util.TestUtil;
 
 import java.net.URI;
 
@@ -50,6 +57,9 @@ public class GetSlamTest extends BaseRankCloudProvidersCommandTest<GetSlam> {
   @Mock
   private OidcEntityRepository entityRepository;
 
+  @Mock
+  private DeploymentRepository deploymentRepository;
+
   public GetSlamTest() {
     super(new GetSlam());
   }
@@ -60,9 +70,18 @@ public GetSlamTest() {
   @Before
   public void setup() throws Exception {
     slamProperties.setUrl(URI.create("https://www.example.com"));
+
     when(oauth2TokenService.executeWithClientForResult(any(), any(), any()))
         .thenAnswer(y -> ((ThrowingFunction) y.getArguments()[1]).apply("token"));
+
     when(oauth2TokenService.getOrganization(any())).thenReturn("indigo-dc");
+
+    Deployment deployment = ControllerTestUtils.createDeployment("mmd34483-d937-4578-bfdb-ebe196bf82dd");
+    DeploymentMessage generateDeployDm = TestUtil.generateDeployDm(deployment);
+    deployment.setDeploymentProvider(DeploymentProvider.IM);
+
+    when(deploymentRepository.findOne(generateDeployDm.getDeploymentId()))
+        .thenReturn(deployment);
   }
 
   @Test
diff --git a/src/test/java/it/reply/orchestrator/service/commands/NotifyTest.java b/src/test/java/it/reply/orchestrator/service/commands/NotifyTest.java
index a832bf76be..72dd587843 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/NotifyTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/NotifyTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/PollDeployTest.java b/src/test/java/it/reply/orchestrator/service/commands/PollDeployTest.java
index 639cee4cf5..34d31187ed 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/PollDeployTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/PollDeployTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/PollUndeployTest.java b/src/test/java/it/reply/orchestrator/service/commands/PollUndeployTest.java
index 37d9da59f0..fb3b15415e 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/PollUndeployTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/PollUndeployTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/PrefilterCloudProvidersTest.java b/src/test/java/it/reply/orchestrator/service/commands/PrefilterCloudProvidersTest.java
index b80c379d4f..c40d9c6305 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/PrefilterCloudProvidersTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/PrefilterCloudProvidersTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/ProviderTimeoutTest.java b/src/test/java/it/reply/orchestrator/service/commands/ProviderTimeoutTest.java
index 73dd6ffd6d..db852836f9 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/ProviderTimeoutTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/ProviderTimeoutTest.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/it/reply/orchestrator/service/commands/UndeployTest.java b/src/test/java/it/reply/orchestrator/service/commands/UndeployTest.java
index 2ae15cb673..1695356bdf 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/UndeployTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/UndeployTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/UpdateDeploymentTest.java b/src/test/java/it/reply/orchestrator/service/commands/UpdateDeploymentTest.java
index 388abe6a72..f89619b1b7 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/UpdateDeploymentTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/UpdateDeploymentTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/commands/UpdateTest.java b/src/test/java/it/reply/orchestrator/service/commands/UpdateTest.java
index 0761e40473..4738597747 100644
--- a/src/test/java/it/reply/orchestrator/service/commands/UpdateTest.java
+++ b/src/test/java/it/reply/orchestrator/service/commands/UpdateTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceTest.java b/src/test/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceTest.java
index 93bdd10d4d..94e91fc7ce 100644
--- a/src/test/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/deployment/providers/ChronosServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelperTest.java b/src/test/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelperTest.java
index 1b0fe20675..2477a0d259 100644
--- a/src/test/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelperTest.java
+++ b/src/test/java/it/reply/orchestrator/service/deployment/providers/DeploymentStatusHelperTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/deployment/providers/ImServiceTest.java b/src/test/java/it/reply/orchestrator/service/deployment/providers/ImServiceTest.java
index e40d589f19..aac3d82bc7 100644
--- a/src/test/java/it/reply/orchestrator/service/deployment/providers/ImServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/deployment/providers/ImServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/deployment/providers/MarathonServiceTest.java b/src/test/java/it/reply/orchestrator/service/deployment/providers/MarathonServiceTest.java
index faf07920df..466a7a2e69 100644
--- a/src/test/java/it/reply/orchestrator/service/deployment/providers/MarathonServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/deployment/providers/MarathonServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/deployment/providers/QcgServiceTest.java b/src/test/java/it/reply/orchestrator/service/deployment/providers/QcgServiceTest.java
index 14abd5ab99..74bff319bc 100644
--- a/src/test/java/it/reply/orchestrator/service/deployment/providers/QcgServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/deployment/providers/QcgServiceTest.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2019-2020 I.N.F.N.
+ * Copyright © 2015-2021 I.N.F.N.
+ * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactoryTest.java b/src/test/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactoryTest.java
index cd118a440f..7285221582 100644
--- a/src/test/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactoryTest.java
+++ b/src/test/java/it/reply/orchestrator/service/deployment/providers/factory/ImClientFactoryTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/deployment/providers/factory/MarathonClientFactoryTest.java b/src/test/java/it/reply/orchestrator/service/deployment/providers/factory/MarathonClientFactoryTest.java
index 7a0126a5f8..923cb6ce98 100644
--- a/src/test/java/it/reply/orchestrator/service/deployment/providers/factory/MarathonClientFactoryTest.java
+++ b/src/test/java/it/reply/orchestrator/service/deployment/providers/factory/MarathonClientFactoryTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/security/GenericCredentialProviderTest.java b/src/test/java/it/reply/orchestrator/service/security/GenericCredentialProviderTest.java
index 86cb3b7a36..a2e93721d6 100644
--- a/src/test/java/it/reply/orchestrator/service/security/GenericCredentialProviderTest.java
+++ b/src/test/java/it/reply/orchestrator/service/security/GenericCredentialProviderTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/security/IamUserInfoFetcherTest.java b/src/test/java/it/reply/orchestrator/service/security/IamUserInfoFetcherTest.java
index 61d6b9b04c..c7454ce1d0 100644
--- a/src/test/java/it/reply/orchestrator/service/security/IamUserInfoFetcherTest.java
+++ b/src/test/java/it/reply/orchestrator/service/security/IamUserInfoFetcherTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/security/OAuth2TokenServiceTest.java b/src/test/java/it/reply/orchestrator/service/security/OAuth2TokenServiceTest.java
index 69da949502..57436baac4 100644
--- a/src/test/java/it/reply/orchestrator/service/security/OAuth2TokenServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/security/OAuth2TokenServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/service/security/UserInfoIntrospectingTokenServiceTest.java b/src/test/java/it/reply/orchestrator/service/security/UserInfoIntrospectingTokenServiceTest.java
index 38209985ab..319aae61a7 100644
--- a/src/test/java/it/reply/orchestrator/service/security/UserInfoIntrospectingTokenServiceTest.java
+++ b/src/test/java/it/reply/orchestrator/service/security/UserInfoIntrospectingTokenServiceTest.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/java/it/reply/orchestrator/util/IntegrationTestUtil.java b/src/test/java/it/reply/orchestrator/util/IntegrationTestUtil.java
index bd7c90f50e..4fa1d4b83f 100644
--- a/src/test/java/it/reply/orchestrator/util/IntegrationTestUtil.java
+++ b/src/test/java/it/reply/orchestrator/util/IntegrationTestUtil.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -277,7 +278,14 @@ public static void mockCmdb(MockRestServiceServer mockServer, URI baseUrl) throw
     // Tenants: Organization 8a5377c6-a7f4-4d1c-a4cd-074ab92b6035
     mockServer
         .expect(requestTo(baseUrl
-            + "/tenant/filters/iam_organisation/8a5377c6-a7f4-4d1c-a4cd-074ab92b6035?include_docs=true"))
+            /**
+             * Temporary hack: cmdbProperties.getTenantsByOrganizationIdPath() does not work with
+             * organization names that contain slash, e.g. kube/users. Therefore, as a workaround
+             * here we first get the full list of tenants and then we filter the list
+             * refer: CmdbServiceV1Impl.java line: 268
+             */
+            //+ "/tenant/filters/iam_organisation/8a5377c6-a7f4-4d1c-a4cd-074ab92b6035?include_docs=true"))
+            + "/tenant/list?include_docs=true"))
         .andExpect(method(HttpMethod.GET))
         .andRespond(withSuccess(
             "{\n" +
@@ -335,7 +343,13 @@ public static void mockCmdb(MockRestServiceServer mockServer, URI baseUrl) throw
             "  ]\n" +
             "}",
             MediaType.APPLICATION_JSON));
-
+    /**
+     * Temporary hack: cmdbProperties.getTenantsByOrganizationIdPath() does not work with
+     * organization names that contain slash, e.g. kube/users. Therefore, as a workaround
+     * here we first get the full list of tenants and then we filter the list
+     * refer: CmdbServiceV1Impl.java line: 268
+     */
+    /*
     // Images: Tenant 8a5377c6-a7f4-4d1c-a4cd-074ab92b6035 on provider-RECAS-BARI
     mockServer
         .expect(requestTo(baseUrl
@@ -511,7 +525,7 @@ public static void mockCmdb(MockRestServiceServer mockServer, URI baseUrl) throw
             "  ]\n" +
             "}",
             MediaType.APPLICATION_JSON));
-
+     */
     // Provider: provider-UPV-GRyCAP
     mockServer.expect(requestTo(baseUrl + "/provider/id/provider-UPV-GRyCAP?include_docs=true"))
         .andExpect(method(HttpMethod.GET))
@@ -668,7 +682,14 @@ public static void mockCmdb(MockRestServiceServer mockServer, URI baseUrl) throw
     // Tenants: Organization deep-hdc
     mockServer
         .expect(requestTo(baseUrl
-            + "/tenant/filters/iam_organisation/8a5377c6-a7f4-4d1c-a4cd-074ab92b6035?include_docs=true"))
+            /**
+             * Temporary hack: cmdbProperties.getTenantsByOrganizationIdPath() does not work with
+             * organization names that contain slash, e.g. kube/users. Therefore, as a workaround
+             * here we first get the full list of tenants and then we filter the list
+             * refer: CmdbServiceV1Impl.java line: 268
+             */
+            //+ "/tenant/filters/iam_organisation/8a5377c6-a7f4-4d1c-a4cd-074ab92b6035?include_docs=true"))
+            + "/tenant/list?include_docs=true"))
         .andExpect(method(HttpMethod.GET))
         .andRespond(withSuccess(
             "{}",
diff --git a/src/test/java/it/reply/orchestrator/util/TestUtil.java b/src/test/java/it/reply/orchestrator/util/TestUtil.java
index 7dd03f83ed..c8ba7c66f5 100644
--- a/src/test/java/it/reply/orchestrator/util/TestUtil.java
+++ b/src/test/java/it/reply/orchestrator/util/TestUtil.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2015-2021 I.N.F.N.
  * Copyright © 2015-2020 Santer Reply S.p.A.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/test/resources/tosca/tosca_hybrid_before_create.yaml b/src/test/resources/tosca/tosca_hybrid_before_create.yaml
index 97fc457e71..984aeaf486 100644
--- a/src/test/resources/tosca/tosca_hybrid_before_create.yaml
+++ b/src/test/resources/tosca/tosca_hybrid_before_create.yaml
@@ -1,8 +1,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/devel/custom_types.yaml
-
+  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/master/custom_types.yaml
 description: >
   TOSCA test for launching a Virtual Elastic Cluster. It will launch
   a single front-end that will be in change of managing the elasticity
diff --git a/src/test/resources/tosca/tosca_hybrid_before_create1.yaml b/src/test/resources/tosca/tosca_hybrid_before_create1.yaml
index dbff0e80d4..14da387663 100644
--- a/src/test/resources/tosca/tosca_hybrid_before_create1.yaml
+++ b/src/test/resources/tosca/tosca_hybrid_before_create1.yaml
@@ -1,7 +1,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/devel/custom_types.yaml
+  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/master/custom_types.yaml
 
 description: >
   TOSCA test for launching a Virtual Elastic Cluster. It will launch
diff --git a/src/test/resources/tosca/tosca_hybrid_before_create2.yaml b/src/test/resources/tosca/tosca_hybrid_before_create2.yaml
index 4f7ac042ff..ba07c38861 100644
--- a/src/test/resources/tosca/tosca_hybrid_before_create2.yaml
+++ b/src/test/resources/tosca/tosca_hybrid_before_create2.yaml
@@ -1,7 +1,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/devel/custom_types.yaml
+  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/master/custom_types.yaml
 
 description: >
   TOSCA test for launching a Virtual Elastic Cluster. It will launch
diff --git a/src/test/resources/tosca/tosca_hybrid_before_update.yaml b/src/test/resources/tosca/tosca_hybrid_before_update.yaml
index 04964f0138..52d66c43b3 100644
--- a/src/test/resources/tosca/tosca_hybrid_before_update.yaml
+++ b/src/test/resources/tosca/tosca_hybrid_before_update.yaml
@@ -1,7 +1,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/devel/custom_types.yaml
+  - indigo_custom_types: https://raw.githubusercontent.com/indigo-dc/tosca-types/master/custom_types.yaml
 
 description: >
   TOSCA test for launching a Virtual Elastic Cluster. It will launch
diff --git a/tools/maven-license-plugin/APACHE-2-header.tmpl b/tools/maven-license-plugin/APACHE-2-header.tmpl
index e328c6ec33..9a4f40f983 100644
--- a/tools/maven-license-plugin/APACHE-2-header.tmpl
+++ b/tools/maven-license-plugin/APACHE-2-header.tmpl
@@ -1,4 +1,5 @@
-Copyright © ${license.git.copyrightYears} ${owner}
+Copyright © 2015-2021 I.N.F.N.
+Copyright © 2015-2020 Santer Reply S.p.A.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.