diff --git a/SOL002/VNFConfiguration-API/environment/variables.txt b/SOL002/VNFConfiguration-API/environment/variables.txt
index c07ffa6c0036c3ee42ede3c381512ef35f98c39c..f76515b1c27206f4ca76e2d12920665b21956031 100644
--- a/SOL002/VNFConfiguration-API/environment/variables.txt
+++ b/SOL002/VNFConfiguration-API/environment/variables.txt
@@ -19,8 +19,4 @@ ${apiRoot}        /
 ${apiName}        vnfconfig
 ${apiMajorVersion}     v1
 
-${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
-
-
-
-
+${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
\ No newline at end of file
diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index 56cdb9f9c9443569da694080860f182ecb8781aa..bd9262424ba6df3a3836010320f4f8364c9c3e36 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -93,14 +93,14 @@ ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
  
-@{VDU_IDs}
-@{VNF_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
-@{externalCP_IDs}
-@{InstantiationLevel_IDs}
+${VDU_IDs}
+${VNF_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${Storage_IDs}
+${internalCP_IDs}
+${externalCP_IDs}
+${InstantiationLevel_IDs}
 
 ${Descriptor_ID}
 ${Provider}
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index bf398e841add112e8a28d28606c1b3908714d3fe..6c2e4ee1129740a5b17c18cc9b9482d2c8ac3bff 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -116,14 +116,14 @@ ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
  
-@{VDU_IDs}
-@{VNF_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
-@{externalCP_IDs}
-@{InstantiationLevel_IDs}
+${VDU_IDs}
+${VNF_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${Storage_IDs}
+${internalCP_IDs}
+${externalCP_IDs}
+${InstantiationLevel_IDs}
 
 ${Descriptor_ID}
 ${Provider}
diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index 1355aa15903c689bc10816a60754684e14160fdb..fc30e979ab3956d4d385209467b3f53647e19393 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -52,11 +52,11 @@ ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
  
-@{VDU_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{externalCP_IDs}
-@{Compute_IDs}
+${VDU_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${externalCP_IDs}
+${Compute_IDs}
 
 ${Descriptor_ID}
 ${Provider}
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 6cb07cd188cb691189a83afd42cc22296cb0c19a..0971b545c0cf0a03343aacf99782943300b74572 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -92,18 +92,18 @@ ${tosca_type_NS}    tosca.nodes.nfv.NS
 ${tosca_type_NsVirtualLink}    tosca.nodes.nfv.NsVirtualLink
 ${tosca_type_NsCP}    tosca.nodes.nfv.Cp
   
-@{VDU_IDs}
-@{VNF_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
-@{externalCP_IDs}
-@{InstantiationLevel_IDs}
-
-@{NS_VirtualLink_IDs}
-@{NsCP_IDs}
-@{SAP_IDs}
+${VDU_IDs}
+${VNF_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${Storage_IDs}
+${internalCP_IDs}
+${externalCP_IDs}
+${InstantiationLevel_IDs}
+
+${NS_VirtualLink_IDs}
+${NsCP_IDs}
+${SAP_IDs}
 
 ${NS_DescriptorID}
 ${Designer}
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index f6dd5c0e8ec828b2d89a4fb963960490e18984d6..a88c75a861776165e2c1c373c37b8d4a10861891 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -99,14 +99,14 @@ ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
   
-@{VDU_IDs}
-@{VNF_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
-@{externalCP_IDs}
-@{InstantiationLevel_IDs}
+${VDU_IDs}
+${VNF_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${Storage_IDs}
+${internalCP_IDs}
+${externalCP_IDs}
+${InstantiationLevel_IDs}
 
 ${Descriptor_ID}
 ${Provider}