diff --git a/rules/rules-reviewed/eap6/glassfish/xml-glassfish.windup.xml b/rules/rules-reviewed/eap6/glassfish/xml-glassfish.windup.xml
index 357f361e2..c855024fd 100644
--- a/rules/rules-reviewed/eap6/glassfish/xml-glassfish.windup.xml
+++ b/rules/rules-reviewed/eap6/glassfish/xml-glassfish.windup.xml
@@ -28,7 +28,7 @@
                   <classification issue-display-mode="all" title="Glassfish Web Descriptor" effort="3" category-id="mandatory">
                      <description> Glassfish specific web descriptor file that is by convention named glassfish-web.xml. It is used to configure web application properties likes cache, session configuration, JNDI name binding etc.</description>
                      <link
-                        href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html"
+                        href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html"
                         title="JBoss EAP web descriptor" />
                      <tag>configuration</tag>
                   </classification>
diff --git a/rules/rules-reviewed/eap6/java-ee/xml-webservices.windup.xml b/rules/rules-reviewed/eap6/java-ee/xml-webservices.windup.xml
index 719ff916c..604c2cafb 100644
--- a/rules/rules-reviewed/eap6/java-ee/xml-webservices.windup.xml
+++ b/rules/rules-reviewed/eap6/java-ee/xml-webservices.windup.xml
@@ -110,7 +110,7 @@
                     <hint title="Use of Web Service Handler2" effort="0" category-id="optional">
                         <message>JBoss EAP developer documentation describes JAX-WS Web Services Common API.</message>
                         <link
-                            href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/sect-JAX-WS_Development_Reference.html#JAX-WS_Common_API_Reference"
+                            href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Development_Guide/sect-JAX-WS_Development_Reference.html#JAX-WS_Common_API_Reference"
                             title="JBoss EAP 6 - JAX-WS Web Services Common API">JBoss EAP 6 - JAX-WS Web Services Common API</link>
                         <link
                             href="https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.1/html-single/developing_web_services_applications/#jax_ws_common_api_reference"
@@ -142,7 +142,7 @@
                     <hint title="Use of Web Service Handler2" effort="0" category-id="optional">
                         <message>JBoss EAP developer documentation about JAX-WS Web Services Endpoints</message>
                         <link
-                            href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Endpoints.html"
+                            href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Endpoints.html"
                             title="JBoss EAP 6 -  JAX-WS Web Services Endpoints">JBoss EAP 6 - JAX-WS Web Service Endpoints</link>
                         <link
                             href="https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.1/html-single/developing_web_services_applications/#jax_ws_web_service_endpoints"
diff --git a/rules/rules-reviewed/eap6/jboss-eap5/jboss-eap5-java.windup.xml b/rules/rules-reviewed/eap6/jboss-eap5/jboss-eap5-java.windup.xml
index 902d15556..9e5ec4042 100644
--- a/rules/rules-reviewed/eap6/jboss-eap5/jboss-eap5-java.windup.xml
+++ b/rules/rules-reviewed/eap6/jboss-eap5/jboss-eap5-java.windup.xml
@@ -50,7 +50,7 @@
                       Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.
                       ]]>
                     </message>
-                    <link title="JBoss EAP 6 - Messaging Configuration" href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Administration_and_Configuration_Guide/sect-Configuration1.html#Configure_the_JMS_Server1"/>
+                    <link title="JBoss EAP 6 - Messaging Configuration" href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Administration_and_Configuration_Guide/sect-Configuration1.html#Configure_the_JMS_Server1"/>
                     <link title="JavaEE 6 - JMS Interfaces" href="https://docs.oracle.com/javaee/6/api/javax/jms/package-summary.html#package_description" />
                     <tag>jms</tag>
                 </hint>
diff --git a/rules/rules-reviewed/eap6/jboss-eap5/jboss-eap5-xml.windup.xml b/rules/rules-reviewed/eap6/jboss-eap5/jboss-eap5-xml.windup.xml
index 6ff1d1713..924be76cd 100644
--- a/rules/rules-reviewed/eap6/jboss-eap5/jboss-eap5-xml.windup.xml
+++ b/rules/rules-reviewed/eap6/jboss-eap5/jboss-eap5-xml.windup.xml
@@ -200,7 +200,7 @@
             <perform>
                 <classification issue-display-mode="detail-only" title="JBoss 5 classloader configuration (jboss-classloading.xml)" effort="0" category-id="mandatory">
                     <description>The `jboss-classloading.xml` file allows customization of classloading in JBoss EAP 5.</description>
-                    <link title="JBoss EAP 6 Class Loading and Modules" href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/chap-Class_Loading_and_Modules.html"/>
+                    <link title="JBoss EAP 6 Class Loading and Modules" href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Development_Guide/chap-Class_Loading_and_Modules.html"/>
                     <link title="JBoss EAP 5 Class Loading and Modules" href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/5/html/Microcontainer_User_Guide/sect-JBoss_Microcontainer_User_Guide-The_ClassLoading_Layer-ClassLoading.html"/>
                     <tag>classloading</tag>
                 </classification>
@@ -211,7 +211,7 @@
                         Learn how to divide your application's dependencies into modules
                         and what dependencies and APIs are available automatically.
                     </message>
-                    <link title="JBoss EAP 6 Class Loading and Modules" href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/chap-Class_Loading_and_Modules.html"/>
+                    <link title="JBoss EAP 6 Class Loading and Modules" href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Development_Guide/chap-Class_Loading_and_Modules.html"/>
                     <link title="JBoss EAP 5 Class Loading and Modules" href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/5/html/Microcontainer_User_Guide/sect-JBoss_Microcontainer_User_Guide-The_ClassLoading_Layer-ClassLoading.html"/>
                     <tag>classloading</tag>
                     <tag>jboss-eap5</tag>
@@ -230,7 +230,7 @@
                         and classloading of deployments.
                     </description>
                     <!-- TODO: There's no such page for EAP 5. -->
-                    <link title="Class Loading and Modules" href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/chap-Class_Loading_and_Modules.html"/>
+                    <link title="Class Loading and Modules" href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Development_Guide/chap-Class_Loading_and_Modules.html"/>
                     <tag>classloading</tag>
                     <tag>jboss-eap5</tag>
                 </classification>
diff --git a/rules/rules-reviewed/eap6/jboss-eap5/resteasy.windup.xml b/rules/rules-reviewed/eap6/jboss-eap5/resteasy.windup.xml
index 6a2cae0c4..0b78f28b7 100644
--- a/rules/rules-reviewed/eap6/jboss-eap5/resteasy.windup.xml
+++ b/rules/rules-reviewed/eap6/jboss-eap5/resteasy.windup.xml
@@ -22,7 +22,7 @@
                     <message>Use of `org.jboss.resteasy.plugins.cache.server.SimpleServerCache` is not supported in JBoss EAP 6.</message>
                     <link href="https://access.redhat.com/solutions/2982101" title="How to implement JAX-RS RestEASY client and server caching in EAP 6?" />
                     <link title="JBoss EAP 6 - JAX-RS and RESTEasy Changes"
-                        href="https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/6/html-single/migration_guide/#sect-JAX-RS_and_RESTEasy_Changes" />
+                        href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#Configure_JAX-RS_and_RESTEasy_Changes1" />
                     <link title="RestEasy javadoc for SimpleServerCache" href="https://docs.jboss.org/resteasy/docs/2.3.3.Final/javadocs/org/jboss/resteasy/plugins/cache/server/SimpleServerCache.html" />
                     <link title="JBoss EAP 5 - Local Server-Side Response Cache" href="https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html/resteasy_reference_guide/server_cache" />
                     <tag>resteasy</tag>
diff --git a/rules/rules-reviewed/eap6/jonas/xml-jonas.windup.xml b/rules/rules-reviewed/eap6/jonas/xml-jonas.windup.xml
index e7419d1dc..22d09f8b5 100644
--- a/rules/rules-reviewed/eap6/jonas/xml-jonas.windup.xml
+++ b/rules/rules-reviewed/eap6/jonas/xml-jonas.windup.xml
@@ -26,7 +26,7 @@
                 <iteration>
                     <classification issue-display-mode="all" title="JOnAS Web Descriptor" effort="3" category-id="mandatory">
                         <description> JOnAS web descriptor is a file that is by convention named jonas-web.xml. It is JOnAS specific configuration file used to map JNDI name to bean reference name, bind virtual host address, specify root url for binding the application etc. This file is not supported in JBoss EAP 6 and needs to be migrated to web.xml or JBoss-specific jboss-web.xml.</description>
-                        <link href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html" title="JBoss EAP web descriptor"/>
+                        <link href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html" title="JBoss EAP web descriptor"/>
                         <tag>configuration</tag>
                         <tag>jonas</tag>
                     </classification>
diff --git a/rules/rules-reviewed/eap6/jrun/xml-jrun.windup.xml b/rules/rules-reviewed/eap6/jrun/xml-jrun.windup.xml
index 5309d212e..5d1b32da5 100644
--- a/rules/rules-reviewed/eap6/jrun/xml-jrun.windup.xml
+++ b/rules/rules-reviewed/eap6/jrun/xml-jrun.windup.xml
@@ -29,7 +29,7 @@
                 <iteration>
                     <classification issue-display-mode="all" title="JRun Web App descriptor" effort="3" category-id="mandatory">
                         <description> JRun web descriptor is a file that is by convention named jrun-web. It is JRun specific configuration file used to configure JRun server. This file is not supported in JBoss EAP 6 and needs to be migrated to web.xml or JBoss-specific jboss-web.xml</description>
-                        <link href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html" title="JBoss EAP web descriptor"/>
+                        <link href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html" title="JBoss EAP web descriptor"/>
                         <tag>configuration</tag>
                         <tag>jrun</tag>
                     </classification>
diff --git a/rules/rules-reviewed/eap6/orion/xml-orion.windup.xml b/rules/rules-reviewed/eap6/orion/xml-orion.windup.xml
index 53cf15ce4..2e6799772 100644
--- a/rules/rules-reviewed/eap6/orion/xml-orion.windup.xml
+++ b/rules/rules-reviewed/eap6/orion/xml-orion.windup.xml
@@ -49,7 +49,7 @@
                 <iteration>
                     <classification issue-display-mode="all" title="Oracle Application Platform Web Descriptor" effort="3" category-id="mandatory">
                         <description> Oracle Application Platform Web Descriptor configuriation is defined in files by convention named global-web-application.xml and orion-web.xml. It is Orion specific configuration file that besides supporting the standard web.xml features also adds additional support for featuers like buffering, servlet chaining, locales, virtual directories. This file is not supported in JBoss EAP 6 and needs to be migrated to web.xml or JBoss-specific jboss-web.xml</description>
-                        <link href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html" title="JBoss EAP web descriptor"/>
+                        <link href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html" title="JBoss EAP web descriptor"/>
                         <tag>configuration</tag>
                         <tag>orion</tag>
                     </classification>
diff --git a/rules/rules-reviewed/eap6/resin/xml-resin.windup.xml b/rules/rules-reviewed/eap6/resin/xml-resin.windup.xml
index 849b22a92..9d61bec32 100644
--- a/rules/rules-reviewed/eap6/resin/xml-resin.windup.xml
+++ b/rules/rules-reviewed/eap6/resin/xml-resin.windup.xml
@@ -32,7 +32,7 @@
                         </description>
                         <link
                             title="JBoss EAP web descriptor"
-                            href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html"
+                            href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Security_Guide/jboss-webxml_Configuration_Reference.html"
                             />
                         <tag>configuration</tag>
                         <tag>resin</tag>
diff --git a/rules/rules-reviewed/eap7/weblogic/weblogic-webservices.windup.xml b/rules/rules-reviewed/eap7/weblogic/weblogic-webservices.windup.xml
index 341a6e7dd..98ba8b7e9 100644
--- a/rules/rules-reviewed/eap7/weblogic/weblogic-webservices.windup.xml
+++ b/rules/rules-reviewed/eap7/weblogic/weblogic-webservices.windup.xml
@@ -50,11 +50,11 @@
                       <![CDATA[
                       The [WebLogic proprietary Asynchronous Web Service Client API](https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm) should be replaced using calls to the JAX-WS asynchronous API.
 
-                      More information is available in the [JAX-WS Web Service Clients](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Clients.html).
+                      More information is available in the [JAX-WS Web Service Clients](https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Clients.html).
                       ]]>
                     </message>
                     <link href="https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm" title="WebLogic Asynchronous Execution Documentation"/>
-                    <link href="https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Clients.html" title="JAX-WS Web Service Clients"/>
+                    <link href="https://docs.redhat.com/en/documentation/red_hat_jboss_enterprise_application_platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Clients.html" title="JAX-WS Web Service Clients"/>
                     <tag>webservice</tag>
                     <tag>client</tag>
                     <tag>weblogic</tag>