diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
index 04888a8..6ab460d 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
@@ -211,6 +211,9 @@ public class GrsfPublisherFisheryService {
 								else throw new Exception("Please check the license id!"); 
 
 							long version = record.getVersion() == null ? 1 : record.getVersion();
+							
+							// set the visibility of the datatest according the context
+							boolean publicDataset = context.equals((String)contextServlet.getInitParameter(HelperMethods.PUBLIC_CONTEX_KEY));
 
 							logger.info("Invoking creation method..");
 
@@ -230,7 +233,7 @@ public class GrsfPublisherFisheryService {
 									new ArrayList<String>(tags), 
 									customFields, 
 									resources, 
-									true); 
+									publicDataset); 
 
 							if(id != null){
 
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
index 45fc83f..a22abaf 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
@@ -201,6 +201,9 @@ public class GrsfPublisherStockService {
 								else throw new Exception("Please check the license id!"); 
 
 							long version = record.getVersion() == null ? 1 : record.getVersion();
+							
+							// set the visibility of the datatest according the context
+							boolean publicDataset = context.equals((String)contextServlet.getInitParameter(HelperMethods.PUBLIC_CONTEX_KEY));
 
 							logger.info("Invoking creation method..");
 
@@ -220,7 +223,7 @@ public class GrsfPublisherStockService {
 									new ArrayList<String>(tags), 
 									customFields, 
 									resources, 
-									true);
+									publicDataset);
 
 							if(id != null){