diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/services/publication-api/publication-api.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/services/publication-api/publication-api.py
index cc5c7e99fe2eb0518d370c82b61ccc04bee4cc2c..0ec4cd80f9645a1e8142849e708b846d16d74d44 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/services/publication-api/publication-api.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/services/publication-api/publication-api.py
@@ -63,13 +63,15 @@ def createDataSet(parameters, sessionToken, v3, sampleId):
     dataSetIds = v3.getDataSets(sessionToken, identifiers, DataSetFetchOptions()).keys()
     operationLog.debug('Found %d data sets.' % len(dataSetIds))
 
+    dataStoreCode = parameters.get('dataStoreCode')
+
     dataSetCreation = DataSetCreation()
     dataSetCreation.setAutoGeneratedCode(True)
     dataSetCreation.setTypeId(EntityTypePermId('PUBLICATION_DATA', EntityKind.DATA_SET))
     dataSetCreation.setSampleId(sampleId)
     dataSetCreation.setDataSetKind(DataSetKind.CONTAINER)
     dataSetCreation.setComponentIds(dataSetIds)
-    dataSetCreation.setDataStoreId(DataStorePermId('STANDARD'))
+    dataSetCreation.setDataStoreId(DataStorePermId(dataStoreCode))
     v3.createDataSets(sessionToken, [dataSetCreation])
 
 
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index b9f816840a1cef0a7b3966db54cb871d96a7c496..d136521ba3caa73942d63ff201322bf401ef10c2 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -327,10 +327,12 @@ function ServerFacade(openbisServer) {
 				"as/dto/datastore/id/DataStorePermId", "as/dto/service/execute/AggregationServiceExecutionOptions"],
 			function(ExecuteAggregationServiceOperation, AsynchronousOperationExecutionOptions, DssServicePermId, DataStorePermId,
 					 AggregationServiceExecutionOptions) {
-				var dataStoreId = new DataStorePermId("STANDARD");
+				var dataStoreCode = profile.getDefaultDataStoreCode();
+				var dataStoreId = new DataStorePermId(dataStoreCode);
 				var dssServicePermId = new DssServicePermId(serviceId, dataStoreId);
 				var options = new AggregationServiceExecutionOptions();
 
+				options.withParameter("dataStoreCode", dataStoreCode);
 				options.withParameter("sessionToken", parameters["sessionToken"]);
 
 				options.withParameter("entities", parameters["entities"]);