diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java
index f80a1a0d2fd0f8d5fcb391bb786e6c60e78bbce3..30cd204e6ce91e174d84f8bfb7449f44fa45e191 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/DataSet.java
@@ -1027,7 +1027,7 @@ public class DataSet implements Serializable, ICodeHolder, IEntityTypeHolder, IE
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -1146,7 +1146,7 @@ public class DataSet implements Serializable, ICodeHolder, IEntityTypeHolder, IE
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                  .reduce((a,b) -> a + ", " + b)
                  .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java
index 38b6660f86c84154b449753a257c3bdb19c032d4..5474de75cd41fe01cf740bb1b5983cb13da56782 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/create/DataSetCreation.java
@@ -346,7 +346,7 @@ public class DataSetCreation implements ICreation, ICreationIdHolder, IObjectCre
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -465,7 +465,7 @@ public class DataSetCreation implements ICreation, ICreationIdHolder, IObjectCre
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                 .reduce((a,b) -> a + ", " + b)
                 .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java
index 5cad0dfc228daf1e54b8b52c4e3da61b5c7eea9f..81b69d88e0878b8c62b753c3eedca96defdd1817 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/dataset/update/DataSetUpdate.java
@@ -364,7 +364,7 @@ public class DataSetUpdate implements IUpdate, IObjectUpdate<IDataSetId>, IPrope
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -483,7 +483,7 @@ public class DataSetUpdate implements IUpdate, IObjectUpdate<IDataSetId>, IPrope
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                 .reduce((a,b) -> a + ", " + b)
                 .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java
index 3ad1fb011b697278e19ee85fee1d1cd19618d19d..c5d48c8628e3e0b610db85427a43e01fcb7082ac 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/Experiment.java
@@ -711,7 +711,7 @@ public class Experiment implements Serializable, IAttachmentsHolder, ICodeHolder
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -830,7 +830,7 @@ public class Experiment implements Serializable, IAttachmentsHolder, ICodeHolder
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                  .reduce((a,b) -> a + ", " + b)
                  .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java
index 48a4f10a3f4ae534fbc815bd054dace8ebfd759f..a3537b93f47f9a60cc36448312c1fc17c92858c2 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/create/ExperimentCreation.java
@@ -199,7 +199,7 @@ public class ExperimentCreation implements ICreation, IObjectCreation, ICreation
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -318,7 +318,7 @@ public class ExperimentCreation implements ICreation, IObjectCreation, ICreation
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                 .reduce((a,b) -> a + ", " + b)
                 .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java
index 540cac7cc5a64bbce1854a21c24fcc897a10ec05..eb09ed062d50a2d95069ae643f167b2524940b53 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/experiment/update/ExperimentUpdate.java
@@ -241,7 +241,7 @@ public class ExperimentUpdate implements IUpdate, IObjectUpdate<IExperimentId>,
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -360,7 +360,7 @@ public class ExperimentUpdate implements IUpdate, IObjectUpdate<IExperimentId>,
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                 .reduce((a,b) -> a + ", " + b)
                 .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java
index d0ca1b5536cd5a15ae01e9cd1a71c71ec26a65c2..00bc64275af06e693ddd603ac125fa9c118f6c4f 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/Material.java
@@ -377,7 +377,7 @@ public class Material implements Serializable, ICodeHolder, IEntityTypeHolder, I
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -496,7 +496,7 @@ public class Material implements Serializable, ICodeHolder, IEntityTypeHolder, I
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                  .reduce((a,b) -> a + ", " + b)
                  .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java
index 1b4e04c55fe24198cff33befaeea6bff7baf7ab8..eab2d2336d75017fb77a3130335190262bbf978b 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/create/MaterialCreation.java
@@ -185,7 +185,7 @@ public class MaterialCreation implements ICreation, IObjectCreation, ICreationId
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -304,7 +304,7 @@ public class MaterialCreation implements ICreation, IObjectCreation, ICreationId
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                 .reduce((a,b) -> a + ", " + b)
                 .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java
index c72a84aa3a36d7fa5f11289feeb3d6c319fa173e..56735bf8ad34e3246bb33f6d6a427bf346fd47b3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/material/update/MaterialUpdate.java
@@ -169,7 +169,7 @@ public class MaterialUpdate implements IUpdate, IObjectUpdate<IMaterialId>, IPro
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -288,7 +288,7 @@ public class MaterialUpdate implements IUpdate, IObjectUpdate<IMaterialId>, IPro
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                 .reduce((a,b) -> a + ", " + b)
                 .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java
index 42445d6c2aed52563ee768a045681397dde919b3..8cd3bbe21fb71415bfade76f3a29f5aa28b20aa3 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/Sample.java
@@ -1026,7 +1026,7 @@ public class Sample implements Serializable, IAttachmentsHolder, ICodeHolder, ID
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -1145,7 +1145,7 @@ public class Sample implements Serializable, IAttachmentsHolder, ICodeHolder, ID
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                  .reduce((a,b) -> a + ", " + b)
                  .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
index 5c27f7f80415e3d2a3270c19ba22160595d08d39..808b41f2279f2776fdd09e160b485f3484976fee 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/create/SampleCreation.java
@@ -317,7 +317,7 @@ public class SampleCreation implements ICreation, ICreationIdHolder, IProperties
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -436,7 +436,7 @@ public class SampleCreation implements ICreation, ICreationIdHolder, IProperties
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                 .reduce((a,b) -> a + ", " + b)
                 .get();
         setProperty(propertyName, value);
diff --git a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java
index 332292dc3cfd6f5256cbfec5aaff413685b72b09..5b4203cef3d5c95940dc5df8d98881e3586ae05d 100644
--- a/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java
+++ b/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/sample/update/SampleUpdate.java
@@ -397,7 +397,7 @@ public class SampleUpdate implements IUpdate, IPropertiesHolder, IObjectUpdate<I
     @Override
     public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)
     {
-        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ"));
+        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX"));
         setProperty(propertyName, value);
     }
 
@@ -516,7 +516,7 @@ public class SampleUpdate implements IUpdate, IPropertiesHolder, IObjectUpdate<I
     public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)
     {
         String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)
-                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssZ")))
+                .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")))
                 .reduce((a,b) -> a + ", " + b)
                 .get();
         setProperty(propertyName, value);
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/AbstractGenerator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/AbstractGenerator.java
index 41c3ae298476871a5321557bb96ffa88287dbe83..ee783ed39f6b687e32c7e12b02b52bdf70ec4b59 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/AbstractGenerator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/AbstractGenerator.java
@@ -227,7 +227,7 @@ public class AbstractGenerator
         gen.addAdditionalMethod("@Override\n"
                 + "    public void setTimestampProperty(String propertyName, ZonedDateTime propertyValue)\n"
                 + "    {\n"
-                + "        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern(\"yyyy-MM-dd HH:mm:ssZ\"));\n"
+                + "        String value = (propertyValue == null) ? null : propertyValue.format(DateTimeFormatter.ofPattern(\"yyyy-MM-dd HH:mm:ssX\"));\n"
                 + "        setProperty(propertyName, value);\n"
                 + "    }");
 
@@ -334,7 +334,7 @@ public class AbstractGenerator
                 + "    public void setTimestampArrayProperty(String propertyName, ZonedDateTime[] propertyValue)\n"
                 + "    {\n"
                 + "        String value = (propertyValue == null) ? null : Arrays.stream(propertyValue)\n"
-                + "                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern(\"yyyy-MM-dd HH:mm:ssZ\")))\n"
+                + "                 .map(dateTime -> dateTime.format(DateTimeFormatter.ofPattern(\"yyyy-MM-dd HH:mm:ssX\")))\n"
                 + "                 .reduce((a,b) -> a + \", \" + b)\n"
                 + "                 .get();\n"
                 + "        setProperty(propertyName, value);\n"
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java
index b01adf815f08c19b99cd6ff13650f4f6cac2a0fb..829583087ee6a204abb10180051544414830064a 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/helper/generators/DtoGenerator.java
@@ -328,7 +328,7 @@ public class DtoGenerator
     public void generateDTO() throws FileNotFoundException
     {
         generateDTO(
-                "/home/alaskowski/openbis/api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/" + subPackage.replaceAll(
+                "../api-openbis-java/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/" + subPackage.replaceAll(
                         "\\.", "/") + "/" + className
                         + ".java");
     }
@@ -336,7 +336,7 @@ public class DtoGenerator
     public void generateDTOJS() throws FileNotFoundException
     {
         generateDTOJS(
-                "/home/alaskowski/openbis/api-openbis-javascript/src/v3/as/dto/" + className.toLowerCase() + "/" + className + ".js");
+                "../test-api-openbis-javascript/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/dto/" + className + ".js");
     }
 
     private void generateDTO(String file) throws FileNotFoundException