diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat
index e928f65a1f..806b42538a 100644
--- a/Dockerfile.tomcat
+++ b/Dockerfile.tomcat
@@ -1,4 +1,4 @@
-FROM registry.hub.docker.com/entando/entando-tomcat-base:7.5.0
+FROM registry.hub.docker.com/entando/entando-tomcat-base:v7.5.1-ESB-1170-PR-37-BB-release-2F-7.5
 ARG VERSION
 
 ### Required OpenShift Labels
diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorAttribute.jsp
index 3be99dec90..4e3af19cd7 100644
--- a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorAttribute.jsp
+++ b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorAttribute.jsp
@@ -1,10 +1,10 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <s:if test="#lang.default">
-	<s:property value="%{#attribute.getText()}" />
+	<s:property value="%{#attribute.getText()}" escapeHtml="true" />
 </s:if>
 <s:else>
 	<s:if test="#attributeTracer.listElement">
-		<s:property value="%{#attribute.getText()}" />
+		<s:property value="%{#attribute.getText()}" escapeHtml="true" />
 	</s:if>
 	<s:else>
 		<s:text name="EntityAttribute.monolang.defaultValue" />
diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorMapAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorMapAttribute.jsp
index 0033664720..75d0facaeb 100644
--- a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorMapAttribute.jsp
+++ b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/enumeratorMapAttribute.jsp
@@ -2,16 +2,16 @@
 <s:if test="#lang.default">
     <s:if test="%{null == #attribute.getMapKey()}" >&ndash;</s:if>
     <s:else>
-        <p><label><s:text name="label.key" /></label>:&#32;<s:property value="%{#attribute.getMapKey()}" /></p>
-        <p><label><s:text name="label.value" /></label>:&#32;<s:property value="%{#attribute.getMapValue()}" /></p>
+        <p><label><s:text name="label.key" /></label>:&#32;<s:property value="#attribute.getMapKey()" escapeHtml="true" /></p>
+        <p><label><s:text name="label.value" /></label>:&#32;<s:property value="#attribute.getMapValue()" escapeHtml="true" /></p>
     </s:else>
 </s:if>
 <s:else>
 	<s:if test="#attributeTracer.listElement">
             <s:if test="%{null == #attribute.getMapKey()}" >&ndash;</s:if>
             <s:else>
-                <p><label><s:text name="label.key" /></label>:&#32;<s:property value="%{#attribute.getMapKey()}" /></p>
-                <p><label><s:text name="label.value" /></label>:&#32;<s:property value="%{#attribute.getMapValue()}" /></p>
+                <p><label><s:text name="label.key" /></label>:&#32;<s:property value="#attribute.getMapKey()" escapeHtml="true" /></p>
+                <p><label><s:text name="label.value" /></label>:&#32;<s:property value="#attribute.getMapValue()" escapeHtml="true" /></p>
             </s:else>
 	</s:if>
 	<s:else>
diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/hypertextAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/hypertextAttribute.jsp
index 394fe9f80a..549bcd3623 100644
--- a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/hypertextAttribute.jsp
+++ b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/hypertextAttribute.jsp
@@ -1,2 +1,2 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<s:property value="#attribute.getTextForLang(#lang.code)" escapeHtml="false" />
\ No newline at end of file
+<s:property value="#attribute.getTextForLang(#lang.code)" escapeHtml="true" />
\ No newline at end of file
diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/longtextAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/longtextAttribute.jsp
index ee76188e58..e6617303ad 100644
--- a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/longtextAttribute.jsp
+++ b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/longtextAttribute.jsp
@@ -1,2 +1,2 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<s:property value="%{#attribute.getTextForLang(#lang.code)}" />
\ No newline at end of file
+<s:property value="#attribute.getTextForLang(#lang.code)" escapeHtml="true" />
\ No newline at end of file
diff --git a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/textAttribute.jsp b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/textAttribute.jsp
index ee76188e58..e6617303ad 100644
--- a/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/textAttribute.jsp
+++ b/admin-console/src/main/webapp/WEB-INF/apsadmin/jsp/entity/view/textAttribute.jsp
@@ -1,2 +1,2 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
-<s:property value="%{#attribute.getTextForLang(#lang.code)}" />
\ No newline at end of file
+<s:property value="#attribute.getTextForLang(#lang.code)" escapeHtml="true" />
\ No newline at end of file
diff --git a/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/contentDetails.jsp b/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/contentDetails.jsp
index 4a66793978..ba3692bf19 100644
--- a/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/contentDetails.jsp
+++ b/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/contentDetails.jsp
@@ -328,7 +328,7 @@
                                                                         </s:if>
                                                                         <s:else>
                                                                             <div class="text-muted">
-                                                                                <s:property value="#attribute.getText()" />
+                                                                                <s:property value="#attribute.getText()" escapeHtml="true" />
                                                                             </div>
                                                                         </s:else>
                                                                     </s:else>
diff --git a/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/imageAttribute.jsp b/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/imageAttribute.jsp
index 8066909fd7..fd303a5a11 100644
--- a/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/imageAttribute.jsp
+++ b/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/imageAttribute.jsp
@@ -9,7 +9,7 @@
         <img
             class="img-thumbnail"
             src="<s:property value="#defaultResource.getImagePath('1')"/>"
-            alt="<s:property value="#defaultResource.descr"/>" />
+            alt="<s:property value="#defaultResource.descr"/>" escapeHtml="true" />
         <span class="sr-only">
             <abbr
                 title="<s:text name="label.img.text.long" />">
@@ -27,7 +27,7 @@
     </s:if>
     <s:else>
         <s:if test="#currentResource != null">
-            <img class="img-thumbnail" src="<s:property value="#currentResource.getImagePath('1')"/>" alt="<s:property value="#currentResource.descr"/>" />
+            <img class="img-thumbnail" src="<s:property value="#currentResource.getImagePath('1')"/>" alt="<s:property value="#currentResource.descr" escapeHtml="true" />" />
             <span class="sr-only">
                 <abbr title="<s:text name="label.img.text.long" />"> <s:text name="label.img.text.short" /></abbr>:&#32;
             </span>
@@ -36,7 +36,7 @@
             <img
                 class="img-thumbnail"
                 src="<s:property value="#defaultResource.getImagePath('1')"/>"
-                alt="<s:property value="#defaultResource.descr"/>" />
+                alt="<s:property value="#defaultResource.descr" escapeHtml="true" />" />
             <span class="sr-only">
                 <abbr
                     title="<s:text name="label.img.text.long" />">
diff --git a/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/linkAttribute.jsp b/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/linkAttribute.jsp
index 15362fb869..a8ba8ce976 100644
--- a/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/linkAttribute.jsp
+++ b/cms-plugin/src/main/webapp/WEB-INF/plugins/jacms/apsadmin/jsp/content/view/linkAttribute.jsp
@@ -42,10 +42,10 @@
 			<s:set var="linkDestination" value="%{getText('note.contentLinkTo') + ': ' + #linkToEdit.contentDestination + ' - ' + #linkedContent.descr + ', ' + getText('note.contentOnPageLinkTo') + ': ' + #linkedPage.titles[currentLang.code]}" />
 		</s:elseif>
 		<%-- link icon --%>
-			<a href="<s:property value="#linkToEdit.contentDestination" />" class="<s:property value="#statusIconVar" />" title="<s:property value="#linkDestination" />"><span class="sr-only"><s:property value="#linkDestination" /></span></a>
+			<a href="<s:property value="#linkToEdit.contentDestination" />" class="<s:property value="#statusIconVar" />" title="<s:property value="#linkDestination" escapeHtml="true" />"><span class="sr-only"><s:property value="#linkDestination" escapeHtml="true" /></span></a>
 		<%-- text of the link --%>
 			<s:if test="%{#attribute.getTextForLang(#lang.code)==null}">
-				<span class="text-muted">&#32;<s:property value="#attribute.getText()" /></span>
+				<span class="text-muted">&#32;<s:property value="#attribute.getText()" escapeHtml="true" /></span>
 			</s:if>
 			<s:else>
 				&#32;<s:include value="/WEB-INF/apsadmin/jsp/entity/view/textAttribute.jsp" />
diff --git a/engine/src/main/java/com/agiletec/aps/system/common/entity/ApsEntityManager.java b/engine/src/main/java/com/agiletec/aps/system/common/entity/ApsEntityManager.java
index 82ec4a72a1..970cba53fd 100644
--- a/engine/src/main/java/com/agiletec/aps/system/common/entity/ApsEntityManager.java
+++ b/engine/src/main/java/com/agiletec/aps/system/common/entity/ApsEntityManager.java
@@ -255,6 +255,7 @@ public void addEntityPrototype(IApsEntity entityType) throws EntException {
         if (null == entityType) {
             throw new EntException("Invalid entity type to add");
         }
+        this.sanitizeEntityTypeLabels(entityType);
         Map<String, IApsEntity> newEntityTypes = this.getEntityTypes();
         newEntityTypes.put(entityType.getTypeCode(), entityType);
         this.updateEntityPrototypes(newEntityTypes);
diff --git a/engine/src/main/java/org/entando/entando/ent/util/LabelSanitizer.java b/engine/src/main/java/org/entando/entando/ent/util/LabelSanitizer.java
index 507676d7e8..974bb480f4 100644
--- a/engine/src/main/java/org/entando/entando/ent/util/LabelSanitizer.java
+++ b/engine/src/main/java/org/entando/entando/ent/util/LabelSanitizer.java
@@ -32,7 +32,12 @@ private LabelSanitizer() {
      */
     public static String stripMarkup(String value) {
         return (value == null) ? null
-                : value.replace("<", "").replace(">", "").replace("\"", "");
+                : value.replace("<", "")
+                .replace(">", "")
+                .replace("\"", "")
+                .replace("&lt;", "")
+                .replace("&gt;", "")
+                .replace("&quot;", "");
     }
 
     /**