diff --git a/pom.xml b/pom.xml
index 312230a..368ded1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>org.gcube.spatial.data</groupId>
 	<artifactId>geonetwork</artifactId>
-	<version>3.2.3-SNAPSHOT</version>
+	<version>3.4.0-SNAPSHOT</version>
 	<name>geonetwork</name>
 
 	<properties>
diff --git a/src/main/java/org/gcube/spatial/data/geonetwork/iso/tpl/keys/KeywordSet.java b/src/main/java/org/gcube/spatial/data/geonetwork/iso/tpl/keys/KeywordSet.java
index f7e4497..1b1e73c 100644
--- a/src/main/java/org/gcube/spatial/data/geonetwork/iso/tpl/keys/KeywordSet.java
+++ b/src/main/java/org/gcube/spatial/data/geonetwork/iso/tpl/keys/KeywordSet.java
@@ -40,4 +40,11 @@ public class KeywordSet {
 	public void addKeyword(String toAdd) {
 		this.values.add(toAdd);
 	}
+
+	public KeywordSet(Set<String> values) {
+		super();
+		this.values = values;
+	}
+	
+	
 }
diff --git a/src/test/java/org/gcube/spatial/data/geonetwork/test/EnvironmentMetaConstantsTest.java b/src/test/java/org/gcube/spatial/data/geonetwork/test/EnvironmentMetaConstantsTest.java
index d095bee..afaf424 100644
--- a/src/test/java/org/gcube/spatial/data/geonetwork/test/EnvironmentMetaConstantsTest.java
+++ b/src/test/java/org/gcube/spatial/data/geonetwork/test/EnvironmentMetaConstantsTest.java
@@ -4,7 +4,7 @@ import java.util.Date;
 
 import org.gcube.spatial.data.geonetwork.iso.EnvironmentConfiguration;
 import org.gcube.spatial.data.geonetwork.iso.GcubeISOMetadata;
-import org.gcube.spatial.data.geonetwork.iso.tpl.keys.Thesaurus;
+import org.gcube.spatial.data.geonetwork.iso.Thesaurus;
 import org.gcube.spatial.data.geonetwork.utils.ScopeUtils;
 import org.geotoolkit.metadata.iso.extent.DefaultExtent;
 import org.opengis.metadata.citation.PresentationForm;
diff --git a/src/test/java/org/gcube/spatial/data/geonetwork/test/TrueMarbleMeta.java b/src/test/java/org/gcube/spatial/data/geonetwork/test/TrueMarbleMeta.java
index ab66396..f6b223e 100644
--- a/src/test/java/org/gcube/spatial/data/geonetwork/test/TrueMarbleMeta.java
+++ b/src/test/java/org/gcube/spatial/data/geonetwork/test/TrueMarbleMeta.java
@@ -102,7 +102,7 @@ public class TrueMarbleMeta {
 		
 		desc.setAbstractField("My Abstract Field");
 		
-		desc.getCredits().add("Fatto io");		
+		desc.addCredits("Fatto io");		
 		
 		desc.setCreationTime(new GregorianCalendar().getTime());
 		VectorRepresentation representation=new VectorRepresentation(
@@ -116,8 +116,10 @@ public class TrueMarbleMeta {
 				Collections.singleton("Species distribution"),
 				Thesaurus.INSPIRE_THEMES));
 		
+		desc.addKeywordSet(new KeywordSet(Collections.singleton("My keyword")));
 		
-		desc.setPublicationTime(desc.getCreationTime());
+		
+		desc.setPublicationTime(new GregorianCalendar(1990, 2, 14).getTime());
 		desc.setPurpose("Just for fun");
 		desc.setTitle("Il mio bel titolone");
 		desc.setUUIDIdentifier(UUID.randomUUID().toString());
diff --git a/src/xmlTemplates/BaseTemplate.ftlx b/src/xmlTemplates/BaseTemplate.ftlx
index d4a97be..6698728 100644
--- a/src/xmlTemplates/BaseTemplate.ftlx
+++ b/src/xmlTemplates/BaseTemplate.ftlx
@@ -39,7 +39,7 @@
 						<!-- PUBLICATION TIME -->
 	
 	<gmd:dateStamp>
-		<gco:DateTime>${.now?iso_utc}</gco:DateTime>
+		<gco:DateTime>${publicationTime?datetime?iso_utc!.now?iso_utc}</gco:DateTime>
 	</gmd:dateStamp>
 	
 	<gmd:metadataStandardName>