diff -r da975b1f188d -r 87328572e36f src/main/webapp/WEB-INF/jsp/version-form.jsp
--- a/src/main/webapp/WEB-INF/jsp/version-form.jsp	Wed Aug 18 12:47:32 2021 +0200
+++ b/src/main/webapp/WEB-INF/jsp/version-form.jsp	Wed Aug 18 14:57:45 2021 +0200
@@ -47,17 +47,17 @@
             </td>
         </tr>
         <tr>
-            <th><fmt:message key="version"/></th>
-            <td><input name="name" type="text" maxlength="20" required value="<c:out value="${version.name}"/>" /></td>
+            <th><label for="version-name"><fmt:message key="version"/></label></th>
+            <td><input id="version-name" name="name" type="text" maxlength="20" required value="<c:out value="${version.name}"/>" /></td>
         </tr>
         <tr title="<fmt:message key="node.tooltip"/>">
-            <th><fmt:message key="node"/></th>
-            <td><input name="node" type="text" maxlength="20" value="<c:out value="${version.node}"/>" /></td>
+            <th><label for="version-node"><fmt:message key="node"/></label></th>
+            <td><input id="version-node" name="node" type="text" maxlength="20" value="<c:out value="${version.node}"/>" /></td>
         </tr>
         <tr>
-            <th><fmt:message key="version.status"/></th>
+            <th><label for="version-status"><fmt:message key="version.status"/></label></th>
             <td>
-                <select name="status" required>
+                <select id="version-status" name="status" required>
                     <c:forEach var="elem" items="${viewmodel.versionStatus}">
                         <option
                                 <c:if test="${elem eq version.status}">selected</c:if> value="${elem}"><fmt:message
@@ -67,9 +67,21 @@
             </td>
         </tr>
         <tr title="<fmt:message key="ordinal.tooltip" />">
-            <th><fmt:message key="ordinal"/></th>
+            <th><label for="version-ordinal"><fmt:message key="ordinal"/></label></th>
+            <td>
+                <input id="version-ordinal" name="ordinal" type="number" value="${version.ordinal}"/>
+            </td>
+        </tr>
+        <tr>
+            <th><label for="version-release"><fmt:message key="version.release"/></label></th>
             <td>
-                <input name="ordinal" type="number" value="${version.ordinal}"/>
+                <input id="version-release" name="release" type="date" value="<fmt:formatDate value="${version.release}" pattern="YYYY-MM-dd" />"/>
+            </td>
+        </tr>
+        <tr>
+            <th><label for="version-eol"><fmt:message key="version.eol"/></label></th>
+            <td>
+                <input id="version-eol" name="eol" type="date" value="<fmt:formatDate value="${version.eol}" pattern="YYYY-MM-dd" />"/>
             </td>
         </tr>
         </tbody>