Apache Archiva Main site deployment
diff --git a/ci-management.html b/ci-management.html
index fb87c9f..08e6ec6 100644
--- a/ci-management.html
+++ b/ci-management.html
@@ -17,7 +17,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">CI Management</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/developers/building.html b/developers/building.html
index 33bbe56..d479a67 100644
--- a/developers/building.html
+++ b/developers/building.html
@@ -18,7 +18,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -33,7 +33,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -138,8 +138,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -148,7 +148,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Building Archiva</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/developers/how-we-do-things.html b/developers/how-we-do-things.html
index c3d3c26..c10855a 100644
--- a/developers/how-we-do-things.html
+++ b/developers/how-we-do-things.html
@@ -18,7 +18,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -33,7 +33,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -138,8 +138,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -148,7 +148,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">How We Do Things</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/developers/publishing-site.html b/developers/publishing-site.html
index 092f169..129b913 100644
--- a/developers/publishing-site.html
+++ b/developers/publishing-site.html
@@ -17,7 +17,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active "></li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/developers/releasing.html b/developers/releasing.html
index ad4a807..7da171c 100644
--- a/developers/releasing.html
+++ b/developers/releasing.html
@@ -18,7 +18,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -33,7 +33,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -138,8 +138,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -148,7 +148,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Archiva release process</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/download.html b/download.html
index 256c33f..776a333 100644
--- a/download.html
+++ b/download.html
@@ -17,7 +17,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Download Apache Archiva</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/errors/404.html b/errors/404.html
index 5643b6e..0b44a82 100644
--- a/errors/404.html
+++ b/errors/404.html
@@ -17,7 +17,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Page Not found</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/get-involved.html b/get-involved.html
index d04f7de..0c6b926 100644
--- a/get-involved.html
+++ b/get-involved.html
@@ -18,7 +18,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -33,7 +33,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -138,8 +138,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -148,7 +148,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Archiva Community - Get Involved</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/index.html b/index.html
index f610f34..232705c 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 <link rel="stylesheet" href="css/jquery.fancybox.2.1.5.css" type="text/css" media="screen" /><script src="js/index.js" type="text/javascript"></script><script src="js/fancybox.js" type="text/javascript"></script><script src="js/jquery.fancybox.pack.2.1.5.js" type="text/javascript"></script><script src="js/jquery.mousewheel-3.0.6.pack.js" type="text/javascript"></script>
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -33,7 +33,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -138,8 +138,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -148,7 +148,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">The Build Artifact Repository Manager</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/issue-management.html b/issue-management.html
index 7b8966e..830f664 100644
--- a/issue-management.html
+++ b/issue-management.html
@@ -17,7 +17,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Issue Management</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/jsui/generics-js.html b/jsui/generics-js.html
index 052abf5..bf63a95 100644
--- a/jsui/generics-js.html
+++ b/jsui/generics-js.html
@@ -18,7 +18,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -33,7 +33,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -138,8 +138,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -148,7 +148,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Generics Javascript</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/jsui/i18n.html b/jsui/i18n.html
index b868923..4b2d9e2 100644
--- a/jsui/i18n.html
+++ b/jsui/i18n.html
@@ -19,7 +19,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -34,7 +34,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -139,8 +139,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -149,7 +149,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">i18n</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/jsui/index.html b/jsui/index.html
index 6fde875..99190ad 100644
--- a/jsui/index.html
+++ b/jsui/index.html
@@ -18,7 +18,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -33,7 +33,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -138,8 +138,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -148,7 +148,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Archiva Javascript application General design</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/jsui/knockout-binding.html b/jsui/knockout-binding.html
index f5c9330..8381406 100644
--- a/jsui/knockout-binding.html
+++ b/jsui/knockout-binding.html
@@ -19,7 +19,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -34,7 +34,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -139,8 +139,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -149,7 +149,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Knockout binding</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/jsui/rest.html b/jsui/rest.html
index ee868de..78eb42e 100644
--- a/jsui/rest.html
+++ b/jsui/rest.html
@@ -19,7 +19,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -34,7 +34,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -139,8 +139,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -149,7 +149,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">REST Services</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/jsui/template-loading.html b/jsui/template-loading.html
index a18f88b..759cda2 100644
--- a/jsui/template-loading.html
+++ b/jsui/template-loading.html
@@ -19,7 +19,7 @@
     <script src="../js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -34,7 +34,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -139,8 +139,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="../index.html" id="bannerLeft"><img src="../images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -149,7 +149,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="../" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Javascript template loading</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/known-issues.html b/known-issues.html
index 1eab752..22d8b1a 100644
--- a/known-issues.html
+++ b/known-issues.html
@@ -18,7 +18,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -33,7 +33,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -138,8 +138,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -148,7 +148,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Known Issues and Errata</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/licenses.html b/licenses.html
index cab6013..972b62c 100644
--- a/licenses.html
+++ b/licenses.html
@@ -17,7 +17,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Project Licenses</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/mailing-lists.html b/mailing-lists.html
index 6e39a1f..16bf65f 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -17,7 +17,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Project Mailing Lists</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/privacy-policy.html b/privacy-policy.html
index 69e1e29..e6258f9 100644
--- a/privacy-policy.html
+++ b/privacy-policy.html
@@ -19,7 +19,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -34,7 +34,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -139,8 +139,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -149,7 +149,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Privacy Policy</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/project-info.html b/project-info.html
index f5e48ee..12beb32 100644
--- a/project-info.html
+++ b/project-info.html
@@ -17,7 +17,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Project Information</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/scm.html b/scm.html
index ba24ed0..62dbc38 100644
--- a/scm.html
+++ b/scm.html
@@ -17,7 +17,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Source Code Management</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/security.html b/security.html
index abdf9e5..b07ec59 100644
--- a/security.html
+++ b/security.html
@@ -17,7 +17,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Security Vulnerabilities</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/team.html b/team.html
index 17fe506..368d017 100644
--- a/team.html
+++ b/team.html
@@ -17,7 +17,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -32,7 +32,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -137,8 +137,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -147,7 +147,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Project Team</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>
diff --git a/versions.html b/versions.html
index ccc600f..1132eec 100644
--- a/versions.html
+++ b/versions.html
@@ -19,7 +19,7 @@
     <script src="./js/apache-maven-fluido-1.11.0-SNAPSHOT.min.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
 
-    <![CDATA[<!-- Matomo -->
+    <!-- Matomo -->
     <script>
         var _paq = window._paq = window._paq || [];
                 _paq.push(['disableCookies']);
@@ -34,7 +34,7 @@
             g.async=true; g.src=u+'/matomo.js'; s.parentNode.insertBefore(g,s);
         })();
     </script>
-    <!-- End Matomo Code -->]]>
+    <!-- End Matomo Code -->
   </head>
   <body class="topBarEnabled">
     <a href="https://github.com/apache/archiva">
@@ -139,8 +139,8 @@
     <div class="container">
       <header>
         <div id="banner">
-          <div class="pull-left"><a href="http://archiva.apache.org/index.html" id="bannerLeft"><img src="http://archiva.apache.org/images/archiva.png"  alt="Apache Archiva"/></a></div>
-          <div class="pull-right"><a href="http://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
+          <div class="pull-left"><a href="index.html" id="bannerLeft"><img src="images/archiva.png"  alt="Apache Archiva"/></a></div>
+          <div class="pull-right"><a href="https://www.apache.org/" id="bannerRight"><img src="https://www.apache.org/images/asf_logo_wide_2016.png"  alt="Apache Software Foundation"/></a></div>
           <div class="clear"><hr/></div>
         </div>
 
@@ -149,7 +149,7 @@
       <li class=""><a href="https://www.apache.org" class="externalLink" title="Apache">Apache</a><span class="divider">/</span></li>
       <li class=""><a href="./" title="Archiva">Archiva</a><span class="divider">/</span></li>
     <li class="active ">Documentation - All Versions</li>
-        <li id="publishDate" class="pull-right">Last Published: 20 Apr 2022</li>
+        <li id="publishDate" class="pull-right">Last Published: 21 Apr 2022</li>
           </ul>
         </div>
       </header>