diff --git a/distribution/src/main/release/server/docs/licenses/licenses-console.xml b/distribution/src/main/release/server/docs/licenses/licenses-console.xml
deleted file mode 100644
index 5ee51d29240..00000000000
--- a/distribution/src/main/release/server/docs/licenses/licenses-console.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<licenseSummary>
-  <dependencies>
-    <dependency>
-      <packageName>angular</packageName>
-      <version>1.5.11</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>angular-drag-and-drop-lists</packageName>
-      <version>2.0.11</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>angular-local-storage</packageName>
-      <version>0.5.0</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>angular-patternfly</packageName>
-      <version>1.5.11</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>angular-sanitize</packageName>
-      <version>1.5.11</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>angular-translate</packageName>
-      <version>2.11.1</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>angular-translate-loader-static-files</packageName>
-      <version>2.11.1</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>angular-ui-bootstrap</packageName>
-      <version>2.2.0</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>angular-ui-router</packageName>
-      <version>0.3.1</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>angularjs-dropdown-multiselect</packageName>
-      <version>2.0.0-beta.10</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>bootstrap-css</packageName>
-      <version>3.0.0</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>bootstrap</packageName>
-      <version>3.3.7</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>c3</packageName>
-      <version>0.4.11</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-  	<dependency>
-      <packageName>c3-angular</packageName>
-      <version>3.5.17</version>
-      <licenses>
-        <license>
-          <name>The 3-Clause BSD License</name>
-          <url>https://opensource.org/licenses/BSD-3-Clause</url>
-        </license>
-      </licenses>
-    </dependency>
-
-	<dependency>
-      <packageName>d3</packageName>
-      <version>1.0.1</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>deepmerge</packageName>
-      <version>1.3.2</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>http-proxy</packageName>
-      <version>1.14.0</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>jquery</packageName>
-      <version>3.1.0</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>jquery-match-height</packageName>
-      <version>0.7.2</version>
-      <licenses>
-        <license>
-          <name>The MIT License</name>
-          <url>https://opensource.org/licenses/MIT</url>
-        </license>
-      </licenses>
-    </dependency>
-
-    <dependency>
-      <packageName>patternfly</packageName>
-      <version>4.0.0</version>
-      <licenses>
-        <license>
-          <name>The Apache Software License, Version 2.0</name>
-          <url>https://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-      </licenses>
-    </dependency>
-  </dependencies>
-</licenseSummary>
diff --git a/distribution/src/main/resources/template/licenses-overwrite.xml b/distribution/src/main/resources/template/licenses-overwrite.xml
new file mode 100644
index 00000000000..f9debbfa40a
--- /dev/null
+++ b/distribution/src/main/resources/template/licenses-overwrite.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Manually collected licenses when the automatic report tool is unable to find the licenses -->
+<licenseSummary>
+  <dependencies>
+    <dependency>
+      <groupId>io.reactivex.rxjava3</groupId>
+      <artifactId>rxjava</artifactId>
+      <version/>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <groupId>org.reactivestreams</groupId>
+      <artifactId>reactive-streams</artifactId>
+      <version/>
+      <licenses>
+        <license>
+          <name>CC0</name>
+          <url>http://creativecommons.org/publicdomain/zero/1.0/</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <packageName>json-schema</packageName>
+      <version/>
+      <licenses>
+        <license>
+          <name>Academic Free License v2.1</name>
+          <url>http://opensource.linux-mirror.org/licenses/afl-2.1.txt</url>
+        </license>
+        <license>
+          <name>BSD 3-clause "New" or "Revised" License</name>
+          <url>http://www.opensource.org/licenses/BSD-3-Clause</url>
+        </license>
+      </licenses>
+    </dependency>
+    <dependency>
+      <packageName>bootstrap-datepicker</packageName>
+      <version/>
+      <licenses>
+        <license>
+          <name>Apache License 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+        </license>
+      </licenses>
+    </dependency>
+  </dependencies>
+</licenseSummary>
diff --git a/server/runtime/build.xml b/server/runtime/build.xml
index 834eb1b7194..945670aef67 100644
--- a/server/runtime/build.xml
+++ b/server/runtime/build.xml
@@ -57,6 +57,17 @@
             <pathelement path="${plugin_classpath}"/>
          </classpath>
       </java>
+      <java classname="org.infinispan.tools.licenses.LicenseReplacer">
+         <arg value="-i"/>
+         <arg value="${licenses.template.dir}/licenses-overwrite.xml"/>
+         <arg value="-l"/>
+         <arg value="${output.dir}/docs/licenses/licenses.xml"/>
+         <arg value="-o"/>
+         <arg value="${output.dir}/docs/licenses/licenses.xml"/>
+         <classpath>
+            <pathelement path="${plugin_classpath}"/>
+         </classpath>
+      </java>
       <copy todir="${output.dir}/docs/licenses/">
          <fileset dir="${licenses.data.dir}">
             <include name="apache license 2.0.txt"/>