diff --git a/README.md b/README.md
index 54cc7bb0f..7b491f841 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ It provides the basic structure, tools, and functionality to build an instance o
 2. **admin-console**, includes tools to manage administrative core features and WCMS functionality
 3. **portal-ui**, provides tools to create interactive web apps UI/UX
 
-The Entando platform **v5.1.0-SNAPSHOT** project includes also the following Github projects:
+The Entando platform **v5.1.0** project includes also the following Github projects:
 
 * **entando-components**: https://github.com/entando/entando-components. Entando platform relies on a number of components or extensions that add functionality not included with the standard Entando platform. There are two types of components: Plugins and Bundles. Plugins extend the functionality of Entando engine, admin-console and portal-ui; Bundles extend the functionality of UI/UX Applications.
 
diff --git a/admin-console/pom.xml b/admin-console/pom.xml
index 6fe37a483..dc1ff9863 100644
--- a/admin-console/pom.xml
+++ b/admin-console/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>entando-core</artifactId>
         <groupId>org.entando.entando</groupId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
     </parent>
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-admin-console</artifactId>
-    <version>5.1.0-SNAPSHOT</version>
+    <version>5.1.0</version>
     <packaging>war</packaging>
     <name>Entando Core: Administration Console</name>
     <description>Entando Administration Console: an agile, modern and user-centric open source Portal platform.</description>
@@ -233,12 +233,12 @@
         <dependency>
             <groupId>org.entando.entando</groupId>
             <artifactId>entando-engine</artifactId>
-            <version>5.1.0-SNAPSHOT</version>
+            <version>5.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.entando.entando</groupId>
             <artifactId>entando-engine</artifactId>
-            <version>5.1.0-SNAPSHOT</version>
+            <version>5.1.0</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/engine/pom.xml b/engine/pom.xml
index 71df9dd2b..a7643f1b4 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>entando-core</artifactId>
         <groupId>org.entando.entando</groupId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
     </parent>
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-engine</artifactId>
     <packaging>jar</packaging>
-    <version>5.1.0-SNAPSHOT</version>
+    <version>5.1.0</version>
     <name>Entando Core: Engine</name>
     <description>Entando Engine: an agile, modern and user-centric open source Portal platform.</description>
     <url>http://www.entando.com/</url>
diff --git a/engine/src/main/java/com/agiletec/aps/system/services/pagemodel/PageModelDOM.java b/engine/src/main/java/com/agiletec/aps/system/services/pagemodel/PageModelDOM.java
index 3e792ed61..d2b65b59c 100644
--- a/engine/src/main/java/com/agiletec/aps/system/services/pagemodel/PageModelDOM.java
+++ b/engine/src/main/java/com/agiletec/aps/system/services/pagemodel/PageModelDOM.java
@@ -109,6 +109,10 @@ private Element buildSketchXML(Frame frame) {
 	private void decodeDOM(String xmlText) throws ApsSystemException {
 		SAXBuilder builder = new SAXBuilder();
 		builder.setValidation(false);
+		builder.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+		builder.setFeature("http://xml.org/sax/features/external-general-entities", false);
+		builder.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+		builder.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
 		StringReader reader = new StringReader(xmlText);
 		try {
 			_doc = builder.build(reader);
diff --git a/pom.xml b/pom.xml
index 9473762c1..d25d4da3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-core</artifactId>
-    <version>5.1.0-SNAPSHOT</version>
+    <version>5.1.0</version>
     <packaging>pom</packaging>
     <name>Entando Core</name>
     <description>Entando Core: an agile, modern and user-centric open source Portal platform.</description>
diff --git a/portal-ui/pom.xml b/portal-ui/pom.xml
index 06a4a65dc..1680d443c 100644
--- a/portal-ui/pom.xml
+++ b/portal-ui/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <artifactId>entando-core</artifactId>
         <groupId>org.entando.entando</groupId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0</version>
     </parent>
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-portal-ui</artifactId>
-    <version>5.1.0-SNAPSHOT</version>
+    <version>5.1.0</version>
     <packaging>war</packaging>
     <name>Entando Core: Portal UI</name>
     <description>Entando Portal UI: an agile, modern and user-centric open source Portal platform.</description>
@@ -232,12 +232,12 @@
         <dependency>
             <groupId>org.entando.entando</groupId>
             <artifactId>entando-engine</artifactId>
-            <version>5.1.0-SNAPSHOT</version>
+            <version>5.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.entando.entando</groupId>
             <artifactId>entando-engine</artifactId>
-            <version>5.1.0-SNAPSHOT</version>
+            <version>5.1.0</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -247,18 +247,18 @@
         <dependency>
             <groupId>org.entando.entando</groupId>
             <artifactId>entando-admin-console</artifactId>
-            <version>5.1.0-SNAPSHOT</version>
+            <version>5.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.entando.entando</groupId>
             <artifactId>entando-admin-console</artifactId>
-            <version>5.1.0-SNAPSHOT</version>
+            <version>5.1.0</version>
             <type>war</type>
         </dependency>
         <dependency>
             <groupId>org.entando.entando</groupId>
             <artifactId>entando-admin-console</artifactId>
-            <version>5.1.0-SNAPSHOT</version>
+            <version>5.1.0</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>