diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesConfigMap.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesConfigMap.java
index f5127f7f73e2f7a6164472ca8e10b6e9b581a94d..a6045073f845cd399691cc01794f23b80d5dee37 100644
--- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesConfigMap.java
+++ b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesConfigMap.java
@@ -169,6 +169,13 @@ public class KubernetesConfigMap extends DomainModelDefinition
 		.resourceSpecification( rSpecRef )
 		.resourceVersion( this.version);
 		
+	      String cprefix = "";
+	        if ( this.name.indexOf('@')>0) {
+	            String firstToken = this.name.substring(  0, this.name.indexOf('@') );
+	            cprefix = this.kind + "." + firstToken + ".";         
+	        }
+	        
+	        
 		rs.addResourceCharacteristicItemShort("clusterMasterURL", this.clusterMasterURL, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue());
@@ -176,8 +183,8 @@ public class KubernetesConfigMap extends DomainModelDefinition
 		rs.addResourceCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("metadata", this.metadata, EValueType.OBJECT.getValue());
-		rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("json", this.json, EValueType.TEXT.getValue());
+		//rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());
+		rs.addResourceCharacteristicItemShort(cprefix + "json", this.json, EValueType.TEXT.getValue());
         rs.addResourceCharacteristicItemShort("data", this.dataObj, EValueType.OBJECT.getValue());
 		
 
diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java
index 011790d27ecd8c1829fdabb3267dd5fa6c2fa4ef..8a0903b1a6601c6db27170851b72716e2e5fdb76 100644
--- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java
+++ b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesSecret.java
@@ -169,6 +169,13 @@ public class KubernetesSecret extends DomainModelDefinition
 		.resourceSpecification( rSpecRef )
 		.resourceVersion( this.version);
 		
+        String cprefix = "";
+        if ( this.name.indexOf('@')>0) {
+            String firstToken = this.name.substring(  0, this.name.indexOf('@') );
+            cprefix = this.kind + "." + firstToken + ".";         
+        }
+        
+        
 		rs.addResourceCharacteristicItemShort("clusterMasterURL", this.clusterMasterURL, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("currentContextCluster", this.currentContextCluster, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("fullResourceName", this.fullResourceName, EValueType.TEXT.getValue());
@@ -176,8 +183,8 @@ public class KubernetesSecret extends DomainModelDefinition
 		rs.addResourceCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("metadata", this.metadata, EValueType.OBJECT.getValue());
-		rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());
-		rs.addResourceCharacteristicItemShort("json", this.json, EValueType.TEXT.getValue());
+		//rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());
+		rs.addResourceCharacteristicItemShort(cprefix + "json", this.json, EValueType.TEXT.getValue());
         rs.addResourceCharacteristicItemShort("data", this.dataObj, EValueType.OBJECT.getValue());
 		
 
diff --git a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesService.java b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesService.java
index 9b40f88b5ae22975a9a0b5ad56748d15e6926d32..38b0b3354dc808be28b4e9141c4d942f0e7a1402 100644
--- a/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesService.java
+++ b/src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesService.java
@@ -197,7 +197,7 @@ public class KubernetesService extends DomainModelDefinition
 		rs.addResourceCharacteristicItemShort("apiGroup", this.apiGroup, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("UID", this.UID, EValueType.TEXT.getValue());
 		rs.addResourceCharacteristicItemShort("metadata", this.metadata, EValueType.OBJECT.getValue());
-		rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());
+		//rs.addResourceCharacteristicItemShort("yaml", this.yaml, EValueType.TEXT.getValue());
         rs.addResourceCharacteristicItemShort(cprefix + "json", this.json, EValueType.TEXT.getValue());
         rs.addResourceCharacteristicItemShort("spec", this.specObj, EValueType.OBJECT.getValue());
         rs.addResourceCharacteristicItemShort("status", this.statusObj, EValueType.OBJECT.getValue());