diff --git a/aggregation/navbar.html b/aggregation/navbar.html
index 3eecd8863d..28b446fcf3 100644
--- a/aggregation/navbar.html
+++ b/aggregation/navbar.html
@@ -6,4 +6,5 @@
Server Development
Authorization Services
Upgrading
+ Release Notes
diff --git a/release_notes/docinfo-footer.html b/release_notes/docinfo-footer.html
new file mode 120000
index 0000000000..a39d3bd0f6
--- /dev/null
+++ b/release_notes/docinfo-footer.html
@@ -0,0 +1 @@
+../aggregation/navbar.html
\ No newline at end of file
diff --git a/release_notes/docinfo.html b/release_notes/docinfo.html
new file mode 120000
index 0000000000..14514f94d2
--- /dev/null
+++ b/release_notes/docinfo.html
@@ -0,0 +1 @@
+../aggregation/navbar-head.html
\ No newline at end of file
diff --git a/release_notes/index.adoc b/release_notes/index.adoc
index cbad61ed90..e7333e64fa 100644
--- a/release_notes/index.adoc
+++ b/release_notes/index.adoc
@@ -1,6 +1,5 @@
:toc:
:toclevels: 0
-:numbered:
:linkattrs:
include::topics/templates/document-attributes-community.adoc[]
diff --git a/release_notes/master.adoc b/release_notes/master.adoc
index 7071671398..69b0a476d4 100644
--- a/release_notes/master.adoc
+++ b/release_notes/master.adoc
@@ -1,6 +1,5 @@
:toc:
-:toclevels: 1
-:numbered:
+:toclevels: 0
:linkattrs:
include::topics/templates/document-attributes-product.adoc[]
diff --git a/release_notes/pom.xml b/release_notes/pom.xml
index 785e1dfb8e..d0aec3c01f 100644
--- a/release_notes/pom.xml
+++ b/release_notes/pom.xml
@@ -15,21 +15,15 @@
-
- org.keycloak.documentation
- header-maven-plugin
-
-
- add-file-headers
-
-
-
org.asciidoctor
asciidoctor-maven-plugin
asciidoc-to-html
+
+ ${basedir}
+
diff --git a/release_notes/topics.adoc b/release_notes/topics.adoc
index 0728d82bed..9163e349e5 100644
--- a/release_notes/topics.adoc
+++ b/release_notes/topics.adoc
@@ -1 +1,15 @@
-include::topics/4_0_0_final.adoc[leveloffset=0]
\ No newline at end of file
+ifeval::[{project_community}==true]
+== {project_name_full} 4.0.0.Final
+include::topics/4_0_0_final.adoc[leveloffset=2]
+include::topics/4_0_0_beta3.adoc[leveloffset=2]
+endif::[]
+
+ifeval::[{project_product}==true]
+== {project_name_full} 2
+include::topics/4_0_0_final.adoc[leveloffset=2]
+endif::[]
+
+ifeval::[{project_product}==true]
+== {project_name_full} 1
+include::topics/4_0_0_beta3.adoc[leveloffset=2]
+endif::[]
\ No newline at end of file
diff --git a/release_notes/topics/4_0_0_beta3.adoc b/release_notes/topics/4_0_0_beta3.adoc
new file mode 100644
index 0000000000..72bd7959ab
--- /dev/null
+++ b/release_notes/topics/4_0_0_beta3.adoc
@@ -0,0 +1,49 @@
+= Authorization Services
+
+== UMA 2.0
+
+UMA 2.0 is now supported for Authorization Services, including support for users to manage user access through
+the account management console. There are also other additions and improvements to authorization services.
+
+== Pushed Claims
+
+Clients can now push additional claims and have them used by policies when evaluating permissions.
+
+== Resource Attributes
+
+It is now possible to define attributes on resources in order to have them used by policies when evaluating permissions.
+
+= Themes and Theme Resources
+
+It is now possible to hot-deploy themes to Keycloak through a regular provider deployment. We have also added support for theme resources, which allows adding additional templates and resources without creating a theme. This is useful for custom authenticators that require additional pages to be added to the authentication flow.
+
+We have also added support to override the theme for specific clients. If that is not adequate for your needs, then there is also a new Theme Selector SPI that allows you to implement custom logic to select the theme.
+
+= Instagram Identity Provider
+
+We have added support to login with Instagram. Thanks to https://github.com/hguerrero[hguerrero] for the contribution.
+
+= Search by User ID in Admin Console
+
+To search for a user by id in the admin console you previously had to edit the URL. It is now possible to search
+directly in the user search field.
+
+= Adapters
+
+== Sprint Boot 2
+
+We now have support for Spring Boot 2.
+
+== Fuse 7
+
+We now have support for Fuse 7.
+
+== JavaScript - Native Promise Support
+
+The JavaScript adapter now supports native promises. It retains support for the old style promises as well.
+Both can be used interchangeably.
+
+== JavaScript - Cordova Options
+
+It is now possible to pass Cordova-specific options to login and other methods in the JavaScript adapter.
+Thanks to https://github.com/looorent[loorent] for the contribution.
\ No newline at end of file
diff --git a/release_notes/topics/4_0_0_final.adoc b/release_notes/topics/4_0_0_final.adoc
index b36d0b4b19..b587896aa9 100644
--- a/release_notes/topics/4_0_0_final.adoc
+++ b/release_notes/topics/4_0_0_final.adoc
@@ -1,56 +1,3 @@
-ifeval::[{project_community}==true]
-= {project_name_full} 4.0.0.Final
-endif::[]
-ifeval::[{project_product}==true]
-= {project_name_full} 7.3.0 CD1
-endif::[]
+= Test Feature
-== Authorization Services
-
-=== UMA 2.0
-
-UMA 2.0 is now supported for Authorization Services, including support for users to manage user access through
-the account management console. There are also other additions and improvements to authorization services.
-
-=== Pushed Claims
-
-Clients can now push additional claims and have them used by policies when evaluating permissions.
-
-=== Resource Attributes
-
-It is now possible to define attributes on resources in order to have them used by policies when evaluating permissions.
-
-== Themes and Theme Resources
-
-It is now possible to hot-deploy themes to Keycloak through a regular provider deployment. We have also added support for theme resources, which allows adding additional templates and resources without creating a theme. This is useful for custom authenticators that require additional pages to be added to the authentication flow.
-
-We have also added support to override the theme for specific clients. If that is not adequate for your needs, then there is also a new Theme Selector SPI that allows you to implement custom logic to select the theme.
-
-== Instagram Identity Provider
-
-We have added support to login with Instagram. Thanks to https://github.com/hguerrero[hguerrero] for the contribution.
-
-== Search by User ID in Admin Console
-
-To search for a user by id in the admin console you previously had to edit the URL. It is now possible to search
-directly in the user search field.
-
-== Adapters
-
-=== Sprint Boot 2
-
-We now have support for Spring Boot 2.
-
-=== Fuse 7
-
-We now have support for Fuse 7.
-
-=== JavaScript - Native Promise Support
-
-The JavaScript adapter now supports native promises. It retains support for the old style promises as well.
-Both can be used interchangeably.
-
-=== JavaScript - Cordova Options
-
-It is now possible to pass Cordova-specific options to login and other methods in the JavaScript adapter.
-Thanks to https://github.com/looorent[loorent] for the contribution.
\ No newline at end of file
+Some test feature.
\ No newline at end of file