diff --git a/docs/release_notes/8-changelog.md b/docs/release_notes/8-changelog.md
deleted file mode 100644
index 12667af8a6..0000000000
--- a/docs/release_notes/8-changelog.md
+++ /dev/null
@@ -1,500 +0,0 @@
----
-title: Change Log
-author: Louis Abel
-contributors: Steven Spencer
-update: 13-Dec-2021
----
-
-# Rocky Linux 8 Change Log
-
-Rocky Linux 8 will receive incremental updates, and minor version upgrades, over time as upstream builds and pushes their own. This page will provide details and information of changes as they occur. A system running Rocky Linux can update their system to full at any time by running `dnf update`. The update of this document can sometimes be delayed. To check for new updates, you can go to the [Rocky Announce](https://lists.resf.org/archives/list/rocky-announce@lists.resf.org/) mailing list archive.
-
-### Updates
-
-Updates released since upstream are posted across our current architectures. We strongly recommend that all users apply *all* updates, including the content released today, on your existing Rocky Linux machines. This can be done by running `dnf update`.
-
-All Rocky Linux components are built from the sources hosted at [git.rockylinux.org](https://git.rockylinux.org). In addition, SRPMs are being published alongside the repositories in a corresponding "source" directory. You can find these on any of our mirrors. These source packages match every binary RPM we release.
-
-## 8.5 - 2021-12-12
-
-The following packages have been updated since December 12, 2021:
-
-* samba: samba-4.14.5-2.el8 -> samba-4.14.5-7.el8_5
-
-Associated CVE's:
-
-* CVE-2016-2124
-* CVE-2020-25717
-* CVE-2021-23192
-
-## 8.5 - 2021-12-10
-
-The following packages have been updated since December 10, 2021:
-
-* WALinuxAgent: WALinuxAgent-2.3.0.2-2.el8 -> WALinuxAgent-2.3.0.2-2.el8.rocky.0
-* libreoffice: libreoffice-1:6.4.7.2-5.el8.1 -> libreoffice-1:6.4.7.2-5.el8.2.rocky
-* openscap: openscap-1.3.5-6.el8 -> openscap-1.3.5-6.el8.rocky.0.1
-* pcs: pcs-0.10.10-4.el8 -> pcs-0.10.10-4.el8.rocky.0
-* python2: python2-2.7.18-7.module+el8.5.0+706+735ec4b3.rocky.0.1 -> python2-2.7.18-7.module+el8.5.0+718+67e45b5f.rocky.0.2
-* rocky-release: rocky-release-8.5-1.el8 -> rocky-release-8.5-2.el8
-
-The follow modules have been updated:
-
-* python27
-
-### Release Engineering Notes
-
-These updates are mostly cosmetic in nature and do not affect
-functionality.
-
-* WALinuxAgent -> We have added direct Rocky support here as well as in a PR upstream to Microsoft
-* libreoffice -> There was red hat branding found. This update addresses the branding.
-* openscap -> There were missing information for Rocky Linux.
-* pcs -> The logo had a trademark that was not removed
-* rocky-release -> simplifies CPE_NAME
-* python2 -> adds rocky to supported dists
-
-## 8.5 - 2021-12-09
-
-The following packages have been updated since December 09, 2021:
-
-* thunderbird: thunderbird-91.3.0-2.el8_4 ->
-* thunderbird-91.4.0-2.el8_5
-* thunderbird: thunderbird-91.3.0-2.el8.plus ->
-* thunderbird-91.4.0-2.el8.plus
-
-### Release Engineering Notes
-
-Thunderbird: This is a regular ESR build update for thunderbird. This update is for both the base repositories and Plus. The Plus repository contains a version of thunderbird with PGP support.
-
-## 8.5 - 2021-12-03
-
-The following packages have been updated since December 03, 2021:
-
-* abrt: abrt-2.10.9-21.el8 -> abrt-2.10.9-21.el8.rocky.0
-* firefox: firefox-91.3.0-1.el8_4 -> firefox-91.4.0-1.el8_5
-* sos: sos-4.1-5.el8 -> sos-4.1-5.el8.rocky.2
-
-### Release Engineering Notes
-
-Firefox: This is an updated ESR build for Firefox.
-
-abrt: This is a mostly cosmetic change. It removes the reliance on the libreport-rhel* and rhtsupport plugins. These packages can be safely removed after updating to the new abrt package.
-
-sos: This is a mostly cosmetic change. It brings down the upstream Rocky policy. See [this PR for more details](https://github.com/sosreport/sos/pull/2784)
-
-## 8.5 - 2021-12-02
-
-The following packages have been updated since December 02, 2021:
-
-* mailman: mailman-3:2.1.29-12.module+el8.5.0+716+66d1ab43.1 ->
-* mailman-3:2.1.29-12.module+el8.5.0+717+27fd1ba7.2
-
-Associated CVE's:
-
-* mailman: CVE-2021-44227
-
-The follow modules have been updated since December 02, 2021:
-
-* mailman-2.1-8050020211202160117.fd901a62
-
-
-## 8.5 - Supplemental - 2021-11-30
-
-The following packages have been added to the devel repository:
-
-* ncurses-static
-
-The following packages have been added to the plus repository:
-
-* open-vm-tools (aarch64 specific build only)
-
-### Plus Notes
-
-The plus repository contains items which are not provided in the base repositories, either because they are not available due to the comps and pungi configuration (based on RHEL repositories) or they are requested as alternative builds with additional patches/features not found in the base. The plus repository should be safe to keep enabled.
-
-The current packages in plus (as of 2021-11-30) are:
-
-* openldap-servers (all architectures)
-* thunderbird with PGP support (all architectures)
-* ncurses-static (all architectures)
-* open-vm-tools (aarch64 specific build only)
-
-### Devel Notes
-
-The devel repository should be used with care. It is meant for koji or buildroot purposes and should not be enabled 100% of the time. If you find there is a package you wish to see in the devel repo, send a mail on rocky-devel and/or open a bug report on https://bugs.rockylinux.org
-
-## 8.5 - 2021-11-29
-
-The following packages have been updated since Nov 29, 2021:
-
-* kronosnet: kronosnet-1.18-2.el8 -> kronosnet-1.18-4.el8_5
-* nss: nss-3.67.0-6.el8_4 -> nss-3.67.0-7.el8_5
-
-Associated CVE's:
-
-* nss-3.67.0-7.el8_5: CVE-2021-43527
-
-## 8.5 - 2021-11-24
-
-The following packages have been updated since Nov 24, 2021:
-
-* dotnet5.0: dotnet5.0-5.0.208-2.el8_5 -> dotnet5.0-5.0.209-1.el8_5
-* dotnet5.0-build-reference-packages: dotnet5.0-build-reference-packages-0-11.20210607git5f10a4b.el8 -> dotnet5.0-build-reference-packages-0-12.20211117git6ce5818.el8_5
-
-
-## 8.5 - 2021-11-22
-
-The following packages have been updated since Nov 22, 2021 (including updated module packages):
-
-* mailman: mailman-3:2.1.29-12.module+el8.5.0+703+19300c10 -> mailman-3:2.1.29-12.module+el8.5.0+716+66d1ab43.1
-
-The follow modules have been updated since Nov 23, 2021:
-
-* mailman-2.1-8050020211123230959.fd901a62
-
-Associated CVE's:
-
-* CVE-2021-42096
-* CVE-2021-42097
-
-## 8.5 - 2021-11-16
-
-The following packages have been updated since Nov 16, 2021 (including updated module packages):
-
-* clang: clang-12.0.1-2.module+el8.5.0+692+8756646f -> clang-12.0.1-4.module+el8.5.0+715+58f51d49
-* llvm-toolset: llvm-toolset-12.0.1-1.module+el8.5.0+692+8756646f -> llvm-toolset-12.0.1-1.module+el8.5.0+715+58f51d49
-
-The follow modules have been updated since Nov 16, 2021:
-
-* llvm-toolset-rhel8-8050020211122023437.b4937e53
-
-## 8.5 - 2021-11-14
-
-The following packages have been updated since the 8.5 release Nov 14, 2021
-(including updated module packages):
-
-* annobin: annobin-9.65-1.el8 -> annobin-9.72-1.el8_5.2
-* binutils: binutils-2.30-108.el8 -> binutils-2.30-108.el8_5.1
-* dotnet-build-reference-packages: dotnet-build-reference-packages-0-9.20200608gitcd5a8c6.el8 -> dotnet-build-reference-packages-0-10.20200608gitcd5a8c6.el8
-* dotnet3.1: dotnet3.1-3.1.119-2.el8.0.1 -> dotnet3.1-3.1.120-2.el8_5
-* dotnet5.0: dotnet5.0-5.0.207-3.el8.0.1 -> dotnet5.0-5.0.208-2.el8_5
-* dotnet6.0: dotnet6.0-6.0.0-0.6.28be3e9a006d90d8c6e87d4353b77882829df718.el8.0.1 -> dotnet6.0-6.0.100-0.10.el8_5
-* firefox: firefox-78.13.0-2.el8 -> firefox-91.3.0-1.el8
-* flatpak: flatpak-1.8.5-4.el8 -> flatpak-1.8.5-5.el8_5
-* freerdp: freerdp-2:2.2.0-2.el8 -> freerdp-2:2.2.0-7.el8_5
-* gcc: gcc-8.5.0-3.el8 -> gcc-8.5.0-4.el8_5
-* gcc-toolset-10-annobin: gcc-toolset-10-annobin-9.29-1.el8 -> gcc-toolset-10-annobin-9.29-1.el8_5.2
-* gcc-toolset-10-binutils: gcc-toolset-10-binutils-2.35-8.el8_4.4 -> gcc-toolset-10-binutils-2.35-8.el8_5.6
-* gcc-toolset-10-gcc: gcc-toolset-10-gcc-10.2.1-8.2.el8 -> gcc-toolset-10-gcc-10.3.1-1.2.el8_5
-* gcc-toolset-11-annobin: gcc-toolset-11-annobin-9.73-1.el8 -> gcc-toolset-11-annobin-9.85-1.el8_5.1
-* gcc-toolset-11-binutils: gcc-toolset-11-binutils-2.36.1-1.el8 -> gcc-toolset-11-binutils-2.36.1-1.el8_5.1
-* gcc-toolset-11-dyninst: gcc-toolset-11-dyninst-11.0.0-1.el8 -> gcc-toolset-11-dyninst-11.0.0-2.el8
-* gcc-toolset-11-gcc: gcc-toolset-11-gcc-11.1.1-3.el8 -> gcc-toolset-11-gcc-11.2.1-1.2.el8_5
-* gcc-toolset-11-systemtap: gcc-toolset-11-systemtap-4.5-3.el8 -> gcc-toolset-11-systemtap-4.5-4.el8
-* gcc-toolset-11-valgrind: gcc-toolset-11-valgrind-1:3.17.0-4.el8 -> gcc-toolset-11-valgrind-1:3.17.0-6.el8
-* gnome-settings-daemon: gnome-settings-daemon-3.32.0-14.el8 -> gnome-settings-daemon-3.32.0-16.el8
-* gnome-shell-extensions: gnome-shell-extensions-3.32.1-20.el8 -> gnome-shell-extensions-3.32.1-20.el8_5.1
-* httpd: httpd-2.4.37-41.module+el8.5.0+695+1fa8055e -> httpd-2.4.37-43.module+el8.5.0+714+5ec56ee8
-* ibus: ibus-1.5.19-13.el8 -> ibus-1.5.19-14.el8_5
-* java-1.8.0-openjdk: java-1.8.0-openjdk-1:1.8.0.302.b08-3.el8 -> java-1.8.0-openjdk-1:1.8.0.312.b07-2.el8_5
-* java-11-openjdk: java-11-openjdk-1:11.0.12.0.7-4.el8 -> java-11-openjdk-1:11.0.13.0.8-3.el8_5
-* java-17-openjdk: java-17-openjdk-1:17.0.0.0.35-4.el8 -> java-17-openjdk-1:17.0.1.0.12-2.el8_5
-* kernel: kernel-4.18.0-348.el8.0.2 -> kernel-4.18.0-348.2.1.el8_5
-* kernel-rt: kernel-rt-4.18.0-348.rt7.130.el8.0.2 -> kernel-rt-4.18.0-348.2.1.rt7.132.el8_5
-* kronosnet: kronosnet-1.18-1.el8 -> kronosnet-1.18-2.el8
-* rust: rust-1.54.0-2.module+el8.5.0+678+cf7bc64b -> rust-1.54.0-3.module+el8.5.0+712+d335422a
-* rust-toolset: rust-toolset-1.54.0-1.module+el8.5.0+678+cf7bc64b -> rust-toolset-1.54.0-1.module+el8.5.0+712+d335422a
-* sssd: sssd-2.5.2-2.el8 -> sssd-2.5.2-2.el8_5.1
-* thunderbird: thunderbird-78.13.0-1.el8 -> thunderbird-91.3.0-2.el8
-* udftools: udftools-2.2-5.el8 -> udftools-2.3-2.el8
-
-The following packages have been dropped and also removed from dnf groups:
-
-* insights-client: insights-client-3.1.5-1.el8 (Standard Group)
-
-For packages that have been dropped, it is safe to remove them using `dnf remove`
-
-The following modules have been updated since the 8.5 release Nov 14, 2021:
-
-* rust-toolset-rhel8-8050020211112021616.f73640c0
-* httpd-2.4-8050020211115030420.b4937e53
-
-### Known Issues
-
-[bug 174](https://bugs.rockylinux.org/show_bug.cgi?id=174) - We are aware of an issue that `kdump` does not work on vmware systems such as ESXi.
-
-We are also aware of our mirror system reporting back the wrong directory for doing updates. It was going to `kickstart` rather than `os`. This should be resolved and updates should work normally.
-
-## 8.4 - 2021-09-21
-
-The following packages have been updated:
-
-* kernel: kernel-4.18.0-305.19.1 (9-15)
-* scap-security-guide: scap-security-guide-0.1.54-5.el8.rocky.2
-* golang: 1.15.14-2
-* nss: 3.67.0-6
-* ca-certificates: 2021.2.50-80.0
-* opencryptoki: 3.15.1-7
-* krb5: 1.18.2-8.3
-* platform-python: 3.6.8-38
-* libdb: 5.3.28-42
-* rng-tools: 6.8-4
-* sos: 4.0-12
-* python-ldap: 3.3.1-1.1
-* subscription-manager: 1.28.13-4
-* pcp: 5.2.5-6
-* strace: 5.7-2.1
-* nspr: 4.32.0-1
-* gcc-toolset-10-elfutils: 0.182-6
-* gcc-toolset-10-binutils: 2.35-8.el8_4.4
-* maven: maven-3.6.2-6
-* mysql: 8.0.26
-* selinux-policy: 3.14.3-67.el8_4.2
-* grub2: 2.02-99.el8_4.1.1
-* resource-agents: 4.1.1-90.el8_4.7
-* poppler: 20.11.0-2.el8_4.1
-* pacemaker: 2.0.5-9.el8_4.3
-
-## 8.4 - 2021-09-13
-
-The following packages have been updated:
-
-* thunderbird: updated to 78.14.0
-* firefox: updated to 78.14.0
-* cyrus-imapd: updated to 3.0.7-20.el8_4.1 (addresses CVE-2021-33582)
-* systemtap rebuilt against dyninst 10.2 to address a bug report
-* rocky-release -> Updated to allow "centos" as an ID
-
-The following repos have been updated:
-
-* extras -> CentOS sig release packages have been added
-
-## 8.4 - 2021-08-24
-
-The following packages have been updated:
-
-* dotnet: dotnet-2.1.525.el8_4 -> dotnet-2.1.526.el8_4
-* libsndfile: libsndfile-1.0.28-10.el8_4 -> libsndfile-1.0.28-10.el8_4.1 -- Addresses
-
-  * Addresses a heap buffer overflow that allowed arbitrary code execution from a wav file
-
-* scap-security-guide: scap-security-guide-0.1.54-5.el8.rocky.1
-
-  * Addresses RLBZ#108
-
-The following repos/packages have been added:
-
-* RT (realtime) - Enabled by running `dnf config-manager --set-enabled rt`
-
-  * kernel-rt (realtime kernel)
-
-## 8.4 - 2021-08-11
-
-The following packages have been updated:
-
-* 389-ds-base: 389-ds-base-1.4.3.16-16.module+el8.4.0+596+159889e5 -> 389-ds-base-1.4.3.16-19.module+el8.4.0+636+837ee950
-* NetworkManager: NetworkManager-1:1.30.0-9.el8_4 -> NetworkManager-1:1.30.0-10.el8_4
-* autofs: autofs-1:5.1.4-48.el8 -> autofs-1:5.1.4-48.el8_4.1
-* buildah: buildah-1.19.7-2.module+el8.4.0+556+40122d08 -> buildah-1.21.4-1.module+el8.4.0+643+525e162a
-* cloud-init: cloud-init-20.3-10.el8_4.3 -> cloud-init-20.3-10.el8_4.5
-* cockpit-podman: cockpit-podman-29-2.module+el8.4.0+556+40122d08 -> cockpit-podman-32-2.module+el8.4.0+643+525e162a
-* conmon: conmon-2:2.0.26-3.module+el8.4.0+556+40122d08 -> conmon-2:2.0.29-1.module+el8.4.0+643+525e162a
-* container-selinux: container-selinux-2:2.162.0-1.module+el8.4.0+556+40122d08 -> container-selinux-2:2.164.1-1.module+el8.4.0+643+525e162a
-* crun: crun-0.18-2.module+el8.4.0+556+40122d08 -> crun-0.20.1-1.module+el8.4.0+643+525e162a
-* dotnet3.1 dotnet3.1-3.1.117-1.el8_4 -> dotnet3.1-3.1.118-1.el8_4
-* edk2: edk2-20200602gitca407c7246bf-4.el8_4.1 -> edk2-20200602gitca407c7246bf-4.el8_4.2
-* elfutils: elfutils-0.182-3.el8 -> elfutils-0.182-3.el8_4
-* esc: esc-1.1.2-18.el8 -> esc-1.1.2-22.el8_4
-* fence-agents: fence-agents-4.2.1-65.el8 -> fence-agents-4.2.1-65.el8_4.1
-* fuse-overlayfs: fuse-overlayfs-1.4.0-3.module+el8.4.0+556+40122d08 -> fuse-overlayfs-1.6-1.module+el8.4.0+643+525e162a
-* gcc-toolset-10-elfutils: gcc-toolset-10-elfutils-0.182-3.el8 -> gcc-toolset-10-elfutils-0.182-5.el8_4
-* gcc-toolset-10-valgrind: gcc-toolset-10-valgrind-1:3.16.0-4.el8 -> gcc-toolset-10-valgrind-1:3.16.0-6.el8_4
-* glib2: glib2-2.56.4-10.el8_4 -> glib2-2.56.4-10.el8_4.1
-* gnome-shell-extensions: gnome-shell-extensions-3.32.1-14.el8.1 -> gnome-shell-extensions-3.32.1-15.el8_4.1
-* go-toolset: go-toolset-1.15.13-1.module+el8.4.0+591+0da41cc3 -> go-toolset-1.15.14-1.module+el8.4.0+632+4dba2916
-* golang: golang-1.15.13-3.module+el8.4.0+591+0da41cc3 -> golang-1.15.14-1.module+el8.4.0+632+4dba2916
-* hivex: hivex-1.3.18-20.module+el8.4.0+534+4680a14e -> hivex-1.3.18-21.module+el8.4.0+642+7e26f5e1
-* kernel: kernel-4.18.0-305.10.2.el8_4 -> kernel-4.18.0-305.12.1.el8_4
-* kexec-tools: kexec-tools-2.0.20-46.el8_4.1 -> kexec-tools-2.0.20-46.el8_4.2
-* libuv: libuv-1:1.40.0-1.el8 -> libuv-1:1.41.1-1.el8_4
-* libvirt: libvirt-6.0.0-35.module+el8.4.0+534+4680a14e -> libvirt-6.0.0-35.1.module+el8.4.0+642+7e26f5e1
-* libwacom: libwacom-1.6-2.el8 -> libwacom-1.6-2.1.el8_4
-* mdadm: mdadm-4.1-15.el8 -> mdadm-4.1-16.el8_4
-* nfs-utils: nfs-utils-1:2.3.3-41.el8 -> nfs-utils-1:2.3.3-41.el8_4.2
-* nmstate: nmstate-1.0.2-11.el8_4 -> nmstate-1.0.2-14.el8_4
-* nodejs: nodejs-1:12.21.0-1.module+el8.3.0+99+3663d81c -> nodejs-1:12.22.3-2.module+el8.4.0+638+5344c6f7
-* nodejs-nodemon: nodejs-nodemon-2.0.3-1.module+el8.3.0+100+234774f7 -> nodejs-nodemon-2.0.3-1.module+el8.4.0+638+5344c6f7
-* oci-seccomp-bpf-hook: oci-seccomp-bpf-hook-1.2.0-2.module+el8.4.0+556+40122d08 -> oci-seccomp-bpf-hook-1.2.3-2.module+el8.4.0+643+525e162a
-* opencryptoki: opencryptoki-3.15.1-5.el8 -> opencryptoki-3.15.1-6.el8_4
-* ostree: ostree-2020.7-4.el8 -> ostree-2020.7-5.el8_4
-* pcp: pcp-5.2.5-4.el8 -> pcp-5.2.5-5.el8_4
-* pcsc-lite: pcsc-lite-1.8.23-3.el8 -> pcsc-lite-1.8.23-4.1.el8_4
-* pcsc-lite-ccid: pcsc-lite-ccid-1.4.29-4.el8 -> pcsc-lite-ccid-1.4.29-5.1.el8_4
-* perl: perl-4:5.26.3-419.el8 -> perl-4:5.26.3-419.el8_4.1
-* perl-IO-String: perl-IO-String-1.08-31.el8 -> perl-IO-String-1.08-32.el8
-* podman: podman-3.0.1-7.module+el8.4.0+556+40122d08 -> podman-3.2.3-0.10.module+el8.4.0+643+525e162a
-* qemu-kvm: qemu-kvm-15:4.2.0-48.module+el8.4.0+534+4680a14e -> qemu-kvm-15:4.2.0-48.module+el8.4.0+642+7e26f5e1.3
-* resource-agents: resource-agents-4.1.1-90.el8_4.5 -> resource-agents-4.1.1-90.el8_4.6
-* runc: runc-1.0.0-73.rc93.module+el8.4.0+556+40122d08 -> runc-1.0.0-74.rc95.module+el8.4.0+643+525e162a
-* rust: rust-1.49.0-1.module+el8.4.0+416+259a129a -> rust-1.52.1-1.module+el8.4.0+641+ca238f88
-* rust-toolset: rust-toolset-1.49.0-1.module+el8.4.0+416+259a129a -> rust-toolset-1.52.1-1.module+el8.4.0+641+ca238f88
-* samba: samba-4.13.3-3.el8 -> samba-4.13.3-4.el8_4
-* selinux-policy: selinux-policy-3.14.3-67.el8 -> selinux-policy-3.14.3-67.el8_4.1
-* skopeo: skopeo-1:1.2.2-10.module+el8.4.0+556+40122d08 -> skopeo-1:1.3.1-5.module+el8.4.0+643+525e162a
-* spirv-tools: spirv-tools-2020.5-3.20201208.gitb27b1af.el8 -> spirv-tools-2021.2-1.20210619.git5dd2f76.el8_4
-* stalld: stalld-1.9-2.el8 -> stalld-1.10-1.el8_4
-* systemd: systemd-239-45.el8_4.2 -> systemd-239-45.el8_4.3
-* systemtap: systemtap-4.4-10.el8 -> systemtap-4.4-11.el8_4
-* udica: udica-0.2.4-1.module+el8.4.0+556+40122d08 -> udica-0.2.4-2.module+el8.4.0+643+525e162a
-* valgrind: valgrind-1:3.16.0-4.el8 -> valgrind-1:3.16.0-4.el8_4
-* virt-what: virt-what-1.18-6.el8 -> virt-what-1.18-9.el8_4
-* virt-who: virt-who-1.30.5-1.el8 -> virt-who-1.30.5-2.el8_4
-* virtio-win: virtio-win-1.9.16-2.el8 -> virtio-win-1.9.17-4.el8_4
-* vulkan-headers: vulkan-headers-1.2.162.0-1.el8 -> vulkan-headers-1.2.182.0-1.el8_4
-* vulkan-loader: vulkan-loader-1.2.162.0-1.el8 -> vulkan-loader-1.2.182.0-1.el8_4
-* vulkan-tools: vulkan-tools-1.2.162.0-1.el8 -> vulkan-tools-1.2.182.0-1.el8_4
-* vulkan-validation-layers: vulkan-validation-layers-1.2.162.0-1.el8 -> vulkan-validation-layers-1.2.182.0-1.el8_4
-
-## 8.4 - 2021-08-02
-
-The following packages have been updated:
-
-* varnish -> varnish-0:6.0.6-2.module+el8.4.0+628+e1687553.1 -> Addresses CVE-2021-36740
-
-Added kickstart repos for the following repositories:
-
-* BaseOS
-* AppStream
-* PowerTools
-* High Availability
-* Resilient Storage
-
-## 8.4 - 2021-07-27
-
-The following packages have been updated:
-
-* thunderbird -> thunderbird-78.12.0-3.el8_4
-
-## 8.4 - 2021-07-21
-
-The following packages have been updated:
-
-* kernel -> kernel-4.18.0-305.10.2.el8_4 -> Addresses CVE-2021-33909
-* systemd -> systemd-239-45.el8_4.2 -> Addresses CVE-2021-33910
-* firefox
-* java-1.8.0-openjdk
-* java-11-openjdk
-
-## 8.4 - 2021-07-12
-
-The following packages have been updated:
-
-* rocky-release
-* linuxptp
-* rpaste
-* ovn2.13 (NFV)
-
-The following modules have been updated:
-
-* python36
-
-### Additional Changes
-
-Experimental repository metadata signing has been implemented. If you would like to try this, set the following option in the Rocky-X.repo files:
-
-```
-repo_gpgcheck=1
-```
-
-### Coming Soon...
-
-* Storage addon repositories:
-
-  * Glusterfs 9 support
-
-## 8.4 - 2021-06-30
-
-### Package Updates
-
-The following packages have been updated:
-
-* NetworkManager -> NetworkManager-11.30.0-9.el8_4
-* cloud-init -> cloud-init-20.3-10.el8_4.3
-* cmake -> cmake-3.18.2-11.el8_4
-* edk2 -> edk2-20200602gitca407c7246bf-4.el8_4.1
-* exiv2 -> exiv2-0.27.3-2.el8
-* firewalld -> firewalld-0.8.2-7.el8_4
-* fwupd -> fwupd-1.5.9-1.el8_4
-* gnome-session -> gnome-session-3.28.1-10.el8_4.1
-* kernel -> kernel-4.18.0-305.7.1.el8_4
-* kexec-tools -> kexec-tools-2.0.20-46.el8_4.1
-* libpq -> libpq-13.3-1.el8_4
-* libreport -> libreport-2.9.5-15.el8.rocky.2
-* libxml2 -> libxml2-2.9.7-9.el8_4.2
-* lz4 -> lz4-1.8.3-3.el8_4
-* nmstate -> nmstate-1.0.2-11.el8_4
-* nvme-cli -> nvme-cli-1.12-4.el8_4
-* openldap -> openldap-2.4.46-17.el8_4
-* osbuild-composer -> osbuild-composer-28.6-1.el8_4
-* resource-agents -> resource-agents-4.1.1-90.el8_4.5
-* rocky-logos -> rocky-logos-84.5-8.el8
-* rocky-release -> rocky-release-8.4-29.el8
-* rpm -> rpm-4.14.3-14.el8_4
-* rsyslog -> rsyslog-8.1911.0-7.el8_4.2
-* sanlock -> sanlock-3.8.3-3.el8_4
-* sssd -> sssd-2.4.0-9.el8_4.1
-* subscription-manager -> subscription-manager-1.28.13-3.el8_4
-* systemd -> systemd-239-45.el8_4.1
-* tuned -> tuned-2.15.0-2.el8_4.1
-* unzip -> unzip-6.0-45.el8_4
-
-The following modules have been updated:
-
-* PyYAML -> PyYAML-5.4.1-1.module+el8.4.0+595+c96abaa2
-* 389-ds -> 1.4.3.16-16
-* go-toolset -> go-toolset-1.15.13-1.module+el8.4.0+591+0da41cc3
-* golang -> golang-1.15.13-3.module+el8.4.0+591+0da41cc3
-* idm:DL1 -> ipa-4.9.2-4
-* idm:client -> (rebuilt with ipaplatform=rhel to sync with DL1 module)
-* pgaudit -> pgaudit-1.4.0-6.module+el8.4.0+587+d46efd10
-* postgres-decoderbufs -> postgres-decoderbufs-0.10.0-2.module+el8.4.0+587+d46efd10
-* postgresql -> postgresql-12.7-1.module+el8.4.0+587+d46efd10
-* python38 -> python38-3.8.6-3.module+el8.4.0+595+c96abaa2
-* ruby -> ruby-2.5.9-107.module+el8.4.0+592+03ff458a
-* ruby:2.5 -> 2.5.9-107
-* ruby:2.6 -> 2.6.7-107
-* ruby:2.7 -> 2.7.3-136
-* rubygem-abrt -> rubygem-abrt-0.3.0-4 / rubygem-abrt-0.4.0-1
-* rubygem-bson -> rubygem-bson-4.3.0-2 / rubygem-bson-4.5.0-1 / rubygem-bson-4.8.1-1
-* rubygem-bundler -> rubygem-bundler-1.16.1-3.module+el8.4.0+592+03ff458a
-* rubygem-mongo -> rubygem-mongo-2.5.1-2 / rubygem-mongo-2.8.0-1 / rubygem-mongo-2.11.3-1
-* rubygem-pg -> rubygem-pg-1.0.0-2 / rubygem-pg-1.1.4-1 / rubygem-pg-1.2.3-1
-
-
-### Context
-
-Some modules and packages have been updated in a routine fashion by upstream.
-
-The regular rocky packages have been updated to address the following:
-
-* rocky-release
-
-  * Add the devel and debuginfo repositories for future state
-  * This is provided for mock/buildroot purposes
-
-* rocky-logos
-
-  * Improve icons for future official live images
-
-
-### Additional Changes
-
-The extras repository for aarch64 has been updated to include various packages that are not included by upstream. Examples of this would be libreoffice and other gnome apps. As they are not in BaseOS or AppStream, the extras repository is the appropriate place for these packages.
-
-* A "devel" repository is now provided for mock/buildroot purposes
-* Extras repository for aarch64 has been updated to include missing packages not provided by upstream for desktop use
-* rpaste has been updated to accept stdin input
-* Older packages will be provided in the repos during the life of a point release.
-
-  * This allows for packages to be downgraded in the case of regressions from upstream or troubleshooting.
diff --git a/docs/release_notes/8-changelog.zh.md b/docs/release_notes/8-changelog.zh.md
index 12c13a6f40..af68daa39b 100644
--- a/docs/release_notes/8-changelog.zh.md
+++ b/docs/release_notes/8-changelog.zh.md
@@ -2,7 +2,7 @@
 title: 更改日志
 author: Louis Abel
 contributors: tianci li, Steven Spencer
-update: 2021-Dec-07
+update: 2021-Dec-13
 ---
 
 # Rocky Linux 8 更改日志
@@ -15,6 +15,73 @@ update: 2021-Dec-07
 
 所有Rocky Linux组件都是由托管在[git.rockylinux.org](https://git.rockylinux.org) 上的源代码进行构建的。此外，SRPM与存储库将一起发布在对应的"source"目录中，您可以在我们的任意镜像网站上找到它们，镜像网站的源码包与我们发布的每个二进制RPM相同。
 
+## 8.5 - 2021-12-12
+
+以下软件包自2021年12月12日起进行了更新:
+
+* samba: samba-4.14.5-2.el8 -> samba-4.14.5-7.el8_5
+
+关联的CVE:
+
+* CVE-2016-2124
+* CVE-2020-25717
+* CVE-2021-23192
+
+## 8.5 - 2021-12-10
+
+以下软件包自2021年12月10日起进行了更新:
+
+* WALinuxAgent: WALinuxAgent-2.3.0.2-2.el8 -> WALinuxAgent-2.3.0.2-2.el8.rocky.0
+* libreoffice: libreoffice-1:6.4.7.2-5.el8.1 -> libreoffice-1:6.4.7.2-5.el8.2.rocky
+* openscap: openscap-1.3.5-6.el8 -> openscap-1.3.5-6.el8.rocky.0.1
+* pcs: pcs-0.10.10-4.el8 -> pcs-0.10.10-4.el8.rocky.0
+* python2: python2-2.7.18-7.module+el8.5.0+706+735ec4b3.rocky.0.1 -> python2-2.7.18-7.module+el8.5.0+718+67e45b5f.rocky.0.2
+* rocky-release: rocky-release-8.5-1.el8 -> rocky-release-8.5-2.el8
+
+以下模块已更新:
+
+* python27
+
+### 发布说明
+
+这些更新主要是外观上的，并不影响功能。
+
+* WALinuxAgent -> 我们在这里以及微软的PR上游中添加了对 Rocky 的直接支持
+* libreoffice -> 发现有红帽的品牌，这次更新解决了这个品牌问题。
+* openscap -> 缺少有关Rocky Linux的信息。
+* pcs -> 该logo有一个未被删除的商标
+* rocky-release -> 简化了 CPE_NAME
+* python2 -> 将 Rocky 添加到支持的地方中
+
+## 8.5 - 2021-12-09
+
+以下软件包自2021年12月09日起进行了更新:
+
+* thunderbird: thunderbird-91.3.0-2.el8_4 ->
+* thunderbird-91.4.0-2.el8_5
+* thunderbird: thunderbird-91.3.0-2.el8.plus ->
+* thunderbird-91.4.0-2.el8.plus
+
+### 发布说明
+
+Thunderbird:这是一个针对Thunderbird常规ESR构建的更新，此次更新适用于base存储库与Plus存储库。Plus存储库包含一个支持PGP的Thunderbird版本。
+
+## 8.5 - 2021-12-03
+
+以下软件包自2021年12月03日起进行了更新:
+
+* abrt: abrt-2.10.9-21.el8 -> abrt-2.10.9-21.el8.rocky.0
+* firefox: firefox-91.3.0-1.el8_4 -> firefox-91.4.0-1.el8_5
+* sos: sos-4.1-5.el8 -> sos-4.1-5.el8.rocky.2
+
+### 发布说明
+
+Firefox: 这是一个针对Firefox ESR构建的更新。
+
+abrt: 主要是外观上的变化，移除了对 libreport-rhel* 和 rhtsupport 这些插件的依赖。在更新到新的abrt软件包之后，可以安全的删除这些软件包。
+
+sos: 主要是外观上的变化，带来了Rocky Linux的策略，查阅 [this PR for more details](https://github.com/sosreport/sos/pull/2784)
+
 ## 8.5 - 2021-12-02
 
 以下软件包自2021年12月2日起进行了更新:
@@ -100,7 +167,6 @@ plus 存储库包含了 base 存储库中没有提供的项目，原因可能是
 
 * llvm-toolset-rhel8-8050020211122023437.b4937e53
 
-
 ## 8.5 - 2021-11-14
 
 从2021年11月14日发布 8.5 版本以来，以下软件包已更新