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 421e4f34063b349eb18f719fe953e1db48b8caba..9b40f88b5ae22975a9a0b5ad56748d15e6926d32 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
@@ -184,9 +184,11 @@ public class KubernetesService extends DomainModelDefinition
 		.resourceSpecification( rSpecRef )
 		.resourceVersion( this.version);
 		
-		
-		String firstToken = this.fullResourceName.substring(  0, this.fullResourceName.indexOf('@') );
-		String cprefix = this.kind + "." + firstToken + ".";
+		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());