diff --git a/.gitignore b/.gitignore
index 4dcbcdb..b080a56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,23 @@
-SOURCES/ansible-posix-1.3.0.tar.gz
-SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz
-SOURCES/auto-maintenance-07860ebb58a41f294b5ff41b1b5ab8f358cd9513.tar.gz
-SOURCES/certificate-1.1.3.tar.gz
-SOURCES/cockpit-1.2.1.tar.gz
-SOURCES/community-general-4.4.0.tar.gz
-SOURCES/crypto_policies-1.2.3.tar.gz
-SOURCES/firewall-1.1.0.tar.gz
-SOURCES/ha_cluster-1.4.1.tar.gz
-SOURCES/kdump-1.2.2.tar.gz
-SOURCES/kernel_settings-1.1.4.tar.gz
-SOURCES/logging-1.8.1.tar.gz
-SOURCES/metrics-1.4.1.tar.gz
-SOURCES/nbde_client-1.2.0.tar.gz
-SOURCES/nbde_server-1.1.2.tar.gz
-SOURCES/network-61423ed36fc6da6dbe8321912e896c59a2d8e2f6.tar.gz
-SOURCES/postfix-1.1.3.tar.gz
-SOURCES/selinux-1.3.4.tar.gz
-SOURCES/ssh-1.1.4.tar.gz
-SOURCES/storage-1.7.0.tar.gz
-SOURCES/timesync-1.6.5.tar.gz
-SOURCES/tlog-1.2.5.tar.gz
-SOURCES/vpn-1.3.2.tar.gz
+SOURCES/ansible-posix-1.4.0.tar.gz
+SOURCES/ansible-sshd-9766d9097a87a130d4c8abde2247aaad5c925ecf.tar.gz
+SOURCES/auto-maintenance-c22eff88d40972158cd5c413b7468b4e904cc76c.tar.gz
+SOURCES/certificate-1.1.6.tar.gz
+SOURCES/cockpit-1.3.0.tar.gz
+SOURCES/community-general-5.4.0.tar.gz
+SOURCES/crypto_policies-1.2.6.tar.gz
+SOURCES/firewall-1.4.0.tar.gz
+SOURCES/ha_cluster-1.7.4.tar.gz
+SOURCES/kdump-1.2.5.tar.gz
+SOURCES/kernel_settings-1.1.10.tar.gz
+SOURCES/logging-1.10.0.tar.gz
+SOURCES/metrics-1.7.3.tar.gz
+SOURCES/nbde_client-1.2.6.tar.gz
+SOURCES/nbde_server-1.1.5.tar.gz
+SOURCES/network-1.9.1.tar.gz
+SOURCES/postfix-1.2.4.tar.gz
+SOURCES/selinux-1.4.0.tar.gz
+SOURCES/ssh-1.1.9.tar.gz
+SOURCES/storage-1.9.1.tar.gz
+SOURCES/timesync-1.6.9.tar.gz
+SOURCES/tlog-1.2.9.tar.gz
+SOURCES/vpn-1.3.5.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index 68f4142..9b1ba8a 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -1,23 +1,23 @@
-d2d2382c38eaf34d2295aba2aa4652d75ebbaeef SOURCES/ansible-posix-1.3.0.tar.gz
-a4d4556cf6628e87fa62dec6c46099338b499930 SOURCES/ansible-sshd-214df35c0bee77b5d69f49c2da269251d451b28f.tar.gz
-b64ad3ed71082042aa9cbaf3b4cf4f98240429a6 SOURCES/auto-maintenance-07860ebb58a41f294b5ff41b1b5ab8f358cd9513.tar.gz
-cee41b5fd6359e9ddeb83c5af7b8057fef6b2334 SOURCES/certificate-1.1.3.tar.gz
-004064268df0e7dd154331b7799272d3277388d4 SOURCES/cockpit-1.2.1.tar.gz
-a7a5fb799f9446f27f1d19c6b1610bbe13c6ae04 SOURCES/community-general-4.4.0.tar.gz
-0684c1335923ba8ebbb05afbd507e5ff31f874d6 SOURCES/crypto_policies-1.2.3.tar.gz
-fcb8d48ccaeba886859ce6afd3d14bbb3f8a5667 SOURCES/firewall-1.1.0.tar.gz
-9a990a4908bdf3269bce4f214907623780a5e221 SOURCES/ha_cluster-1.4.1.tar.gz
-a1c9c89dea1dbe2410465c29ad0e1d3637ac5f52 SOURCES/kdump-1.2.2.tar.gz
-72bd06d25e4c841e53be7fa1330c859ac8f76a6d SOURCES/kernel_settings-1.1.4.tar.gz
-e530528ba5f9478cc8604aa6612388ea8e5078af SOURCES/logging-1.8.1.tar.gz
-c0dbbea68bba05ee98c3e1a686c328e741abe763 SOURCES/metrics-1.4.1.tar.gz
-641ab2f8cd9916a43c8b580907203a3304110d1e SOURCES/nbde_client-1.2.0.tar.gz
-33f0a3ea008021e69b2bbd7b25f6536f91e7613d SOURCES/nbde_server-1.1.2.tar.gz
-85817484d16946dcc268ea3d5ef103fc688797d8 SOURCES/network-61423ed36fc6da6dbe8321912e896c59a2d8e2f6.tar.gz
-19b7356c0857acd54956a08132d8dd67a4c071d4 SOURCES/postfix-1.1.3.tar.gz
-4e5c5216814577ee55304721e5c811ed8857efbc SOURCES/selinux-1.3.4.tar.gz
-f38972c4b22a9f226b58725c7e9ba8fac692bba2 SOURCES/ssh-1.1.4.tar.gz
-0728b4e01261f84ce470431a4ea21907db75f26a SOURCES/storage-1.7.0.tar.gz
-b9f1b88b8eda052161bc86473b383ad88692249c SOURCES/timesync-1.6.5.tar.gz
-17e6f3d437d161143c87b6709a42a3eff6ef7df0 SOURCES/tlog-1.2.5.tar.gz
-d1bb00636c04bc1b2d94ce0e491afe9ef921cd56 SOURCES/vpn-1.3.2.tar.gz
+bca451fd997be80be30f106e49f1bf550d2e609c SOURCES/ansible-posix-1.4.0.tar.gz
+c47e62ecf6502d952378206626ba66e456a73513 SOURCES/ansible-sshd-9766d9097a87a130d4c8abde2247aaad5c925ecf.tar.gz
+453a44d1259addc4f702ea79da7b810b420e21f1 SOURCES/auto-maintenance-c22eff88d40972158cd5c413b7468b4e904cc76c.tar.gz
+25e2045c8fc9d6455d7c5b0c7d32d4976ebc5178 SOURCES/certificate-1.1.6.tar.gz
+77b34cce8b416fec3a50900b47cbe6b8216e3036 SOURCES/cockpit-1.3.0.tar.gz
+58f117fafe36a19425b3a9bc0ba69f33e5fa81ee SOURCES/community-general-5.4.0.tar.gz
+56bc0763e0b549c3499a80e95d0953ee6769136a SOURCES/crypto_policies-1.2.6.tar.gz
+4ee58deb2a514edd81dbcc56508be4ca9fd49089 SOURCES/firewall-1.4.0.tar.gz
+6ac7fbfa996fd4425415601d28e5b7b0790682ae SOURCES/ha_cluster-1.7.4.tar.gz
+6ae0614d51db00957943fad6967674c0de88862c SOURCES/kdump-1.2.5.tar.gz
+17f28f701d7842499b232a7b28daae5f51ea631b SOURCES/kernel_settings-1.1.10.tar.gz
+042ba1183db4d36742a21c92111d68415c7c951a SOURCES/logging-1.10.0.tar.gz
+4ebbf457b9f0d767d19b7ef322b848e5e4da50ef SOURCES/metrics-1.7.3.tar.gz
+80baf489aea9052ad11c84df7a6adfca75ce7a7b SOURCES/nbde_client-1.2.6.tar.gz
+2e2ad1b455da8c0a198524a08ffe16f2c954f131 SOURCES/nbde_server-1.1.5.tar.gz
+cb01d5d59afdf4f514de5fda2220ea8271ecb699 SOURCES/network-1.9.1.tar.gz
+4a31ac4e7d4de65c2a74cfc6f3c4ff852d5a578c SOURCES/postfix-1.2.4.tar.gz
+a54aee1fa1b0ee023e4168d0abe880ad6ea64dcb SOURCES/selinux-1.4.0.tar.gz
+fcdbd369bcc41df028f842e49ebff28370d3adb4 SOURCES/ssh-1.1.9.tar.gz
+10b9bf8f3b16fc99d6070af6dbf82f9f889a8ff6 SOURCES/storage-1.9.1.tar.gz
+c0af2701a0f8db1d721bf6df4ba257888be0fe87 SOURCES/timesync-1.6.9.tar.gz
+53fd0059c1da4c42228a9c0df592a96cd5a5060f SOURCES/tlog-1.2.9.tar.gz
+ec3e9a88af360861ea3ef4be92fbb6776690272d SOURCES/vpn-1.3.5.tar.gz
diff --git a/SOURCES/CHANGELOG.md b/SOURCES/CHANGELOG.md
new file mode 100644
index 0000000..920d9b6
--- /dev/null
+++ b/SOURCES/CHANGELOG.md
@@ -0,0 +1,563 @@
+Changelog
+=========
+
+[1.20.0] - 2022-08-09
+----------------------------
+
+### New Features
+
+- [cockpit - Add customization of port](https://bugzilla.redhat.com/show_bug.cgi?id=2115159)
+- [firewall - RFE: firewall-system-role: add ability to add interface to zone by PCI device ID](https://bugzilla.redhat.com/show_bug.cgi?id=2100939)
+- [firewall - support for firewall_config - gather firewall facts](https://bugzilla.redhat.com/show_bug.cgi?id=2115160)
+- [logging - [RFE] Support startmsg.regex and endmsg.regex in the files inputs](https://bugzilla.redhat.com/show_bug.cgi?id=2112143)
+- [selinux - Added setting of seuser and selevel for completeness](https://bugzilla.redhat.com/show_bug.cgi?id=2115162)
+
+### Bug Fixes
+
+- [nbde_client - Sets proper spacing for parameter rd.neednet=1](https://bugzilla.redhat.com/show_bug.cgi?id=2115161)
+- [network - fix IPRouteUtils.get_route_tables_mapping() to accept any whitespace sequence](https://bugzilla.redhat.com/show_bug.cgi?id=2115884)
+- [ssh sshd - ssh, sshd: RSAMinSize parameter definition is missing](https://bugzilla.redhat.com/show_bug.cgi?id=2109997)
+- [storage - [RHEL8] [WARNING]: The loop variable 'storage_test_volume' is already in use. You should set the `loop_var` value in the `loop_control` option for the task to something else to avoid variable collisions and unexpected behavior.](https://bugzilla.redhat.com/show_bug.cgi?id=2082391)
+
+[1.19.3] - 2022-07-01
+----------------------------
+
+### New Features
+
+- [firewall - support add/modify/delete services](https://bugzilla.redhat.com/show_bug.cgi?id=2100297)
+- [network - [RFE] [network] Support managing the network through nmstate schema](https://bugzilla.redhat.com/show_bug.cgi?id=2100979)
+- [storage - support for adding/removing disks to/from storage pools](https://bugzilla.redhat.com/show_bug.cgi?id=2066880)
+- [storage - support for attaching cache volumes to existing volumes](https://bugzilla.redhat.com/show_bug.cgi?id=2066881)
+
+### Bug Fixes
+
+- [firewall - forward_port should accept list of string or list of dict](https://bugzilla.redhat.com/show_bug.cgi?id=2101607)
+- [metrics - document minimum supported redis version required by rhel-system-roles](https://bugzilla.redhat.com/show_bug.cgi?id=2100285)
+- [metrics - restart pmie, pmlogger if changed, do not wait for handler](https://bugzilla.redhat.com/show_bug.cgi?id=2100298)
+
+[1.19.2] - 2022-06-15
+----------------------------
+
+### New Features
+
+- [sshd - system role should be able to optionally manage /etc/ssh/sshd_config on RHEL 9](https://bugzilla.redhat.com/show_bug.cgi?id=2086935)
+
+### Bug Fixes
+
+- none
+
+[1.19.1] - 2022-06-13
+----------------------------
+
+### New Features
+
+- [storage - support for creating and managing LVM thin pools/LVs](https://bugzilla.redhat.com/show_bug.cgi?id=2066876)
+- [All roles should support running with gather_facts: false](https://bugzilla.redhat.com/show_bug.cgi?id=2079008)
+
+### Bug Fixes
+
+- none
+
+[1.19.0] - 2022-06-06
+----------------------------
+
+### New Features
+
+- [storage - support for creating and managing LVM thin pools/LVs](https://bugzilla.redhat.com/show_bug.cgi?id=2066876)
+- [firewall - state no longer required for masquerade and ICMP block inversion](https://bugzilla.redhat.com/show_bug.cgi?id=2093437)
+
+### Bug Fixes
+
+- [storage - role raid_level "striped" is not supported](https://bugzilla.redhat.com/show_bug.cgi?id=2083426)
+
+[1.18.0] - 2022-05-26
+----------------------------
+
+### New Features
+
+- [firewall - [Improvement] Allow System Role to reset to default Firewalld Settings](https://bugzilla.redhat.com/show_bug.cgi?id=2043009)
+- [metrics - [RFE] add an option to the metrics role to enable postfix metric collection](https://bugzilla.redhat.com/show_bug.cgi?id=2079114)
+- [network - Rework the infiniband support](https://bugzilla.redhat.com/show_bug.cgi?id=2086869)
+- [sshd - system role should not assume that RHEL 9 /etc/ssh/sshd_config has "Include > /etc/ssh/sshd_config.d/*.conf"](https://bugzilla.redhat.com/show_bug.cgi?id=2086934)
+- [sshd - system role should be able to optionally manage /etc/ssh/sshd_config on RHEL 9](https://bugzilla.redhat.com/show_bug.cgi?id=2086935)
+
+### Bug Fixes
+
+- [storage - role cannot set mount_options for volumes](https://bugzilla.redhat.com/show_bug.cgi?id=2083378)
+
+[1.17.0] - 2022-04-25
+----------------------------
+
+### New Features
+
+- [All roles should support running with gather_facts: false](https://bugzilla.redhat.com/show_bug.cgi?id=2079008)
+- [ha_cluster - support advanced corosync configuration](https://bugzilla.redhat.com/show_bug.cgi?id=2065339)
+- [ha_cluster - support SBD fencing](https://bugzilla.redhat.com/show_bug.cgi?id=2066868)
+- [ha_cluster - add support for configuring bundle resources](https://bugzilla.redhat.com/show_bug.cgi?id=2073518)
+- [logging - Logging - RFE - support template, severity and facility options](https://bugzilla.redhat.com/show_bug.cgi?id=2075116)
+- [metrics - consistently use ansible_managed in configuration files managed by role [rhel-8.7.0]](https://bugzilla.redhat.com/show_bug.cgi?id=2065215)
+- [metrics - [RFE] add an option to the metrics role to enable postfix metric collection](https://bugzilla.redhat.com/show_bug.cgi?id=2079114)
+- [network - [RFE] Extend rhel-system-roles.network feature set to support routing rules](https://bugzilla.redhat.com/show_bug.cgi?id=1996731)
+- [network - consistently use ansible_managed in configuration files managed by role [rhel-8.7.0]](https://bugzilla.redhat.com/show_bug.cgi?id=2065670)
+- [postfix - consistently use ansible_managed in configuration files managed by role [rhel-8.7.0]](https://bugzilla.redhat.com/show_bug.cgi?id=2065216)
+- [postfix - Postfix RHEL System Role should provide the ability to replace config and reset configuration back to default [rhel-8.7.0]](https://bugzilla.redhat.com/show_bug.cgi?id=2065218)
+
+### Bug Fixes
+
+- [firewall - Firewall system role Ansible deprecation warning related to "include"](https://bugzilla.redhat.com/show_bug.cgi?id=2078650)
+- [kernel_settings - error configobj not found on RHEL 8.6 managed hosts [rhel-8.7.0]](https://bugzilla.redhat.com/show_bug.cgi?id=2060378)
+- [metrics - Metrics role, with "metrics_from_mssql" option does not configure /var/lib/pcp/pmdas/mssql/mssql.conf on first run [rhel-8.7.0]](https://bugzilla.redhat.com/show_bug.cgi?id=2060377)
+- [nbde_client - NBDE client system role does not support servers with static IP addresses [rhel-8.7.0]](https://bugzilla.redhat.com/show_bug.cgi?id=2071011)
+- [network - bond: fix typo in supporting the infiniband ports in active-backup mode](https://bugzilla.redhat.com/show_bug.cgi?id=2064067)
+- [sshd - FIPS mode detection in SSHD role is wrong](https://bugzilla.redhat.com/show_bug.cgi?id=2075338)
+- [storage - RFE storage Less verbosity by default](https://bugzilla.redhat.com/show_bug.cgi?id=2056480)
+- [tlog - Tlog role - Enabling session recording configuration does not work due to RHEL9 SSSD files provider default](https://bugzilla.redhat.com/show_bug.cgi?id=2072749)
+
+[1.16.3] - 2022-04-07
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [tlog - Tlog role - Enabling session recording configuration does not work due to RHEL9 SSSD files provider default](https://bugzilla.redhat.com/show_bug.cgi?id=2072749)
+
+[1.16.2] - 2022-04-06
+----------------------------
+
+### New Features
+
+- [nbde_client - NBDE client system role does not support servers with static IP addresses](https://bugzilla.redhat.com/show_bug.cgi?id=1985022)
+
+### Bug Fixes
+
+- none
+
+[1.16.1] - 2022-03-29
+----------------------------
+
+### New Features
+
+- [nbde_client - NBDE client system role does not support servers with static IP addresses](https://bugzilla.redhat.com/show_bug.cgi?id=1985022)
+
+### Bug Fixes
+
+- none
+
+[1.16.0] - 2022-03-22
+----------------------------
+
+### New Features
+
+- [network - consistently use ansible_managed in configuration files managed by role](https://bugzilla.redhat.com/show_bug.cgi?id=2057656)
+- [metrics - consistently use ansible_managed in configuration files managed by role](https://bugzilla.redhat.com/show_bug.cgi?id=2057645)
+- [postfix - consistently use ansible_managed in configuration files managed by role](https://bugzilla.redhat.com/show_bug.cgi?id=2057661)
+- [postfix - Postfix RHEL System Role should provide the ability to replace config and reset configuration back to default](https://bugzilla.redhat.com/show_bug.cgi?id=2044657)
+
+### Bug Fixes
+
+- [network - bond: fix typo in supporting the infiniband ports in active-backup mode](https://bugzilla.redhat.com/show_bug.cgi?id=2064388)
+
+[1.15.1] - 2022-03-03
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [kernel_settings - error configobj not found on RHEL 8.6 managed hosts](https://bugzilla.redhat.com/show_bug.cgi?id=2058772)
+- [timesync - timesync: basic-smoke test failure in timesync/tests_ntp.yml](https://bugzilla.redhat.com/show_bug.cgi?id=2058645)
+
+[1.15.0] - 2022-03-01
+----------------------------
+
+### New Features
+
+- [firewall - [RFE] - Firewall RHEL System Role should be able to set default zone](https://bugzilla.redhat.com/show_bug.cgi?id=2022458)
+
+### Bug Fixes
+
+- [metrics - Metrics role, with "metrics_from_mssql" option does not configure /var/lib/pcp/pmdas/mssql/mssql.conf on first run](https://bugzilla.redhat.com/show_bug.cgi?id=2058655)
+- [firewall - ensure target changes take effect immediately](https://bugzilla.redhat.com/show_bug.cgi?id=2057172)
+
+[1.14.0] - 2022-02-14
+----------------------------
+
+### New Features
+
+- [network - [RFE] Add more bonding options to rhel-system-roles.network](https://bugzilla.redhat.com/show_bug.cgi?id=2008931)
+- [certificate - should consistently use ansible_managed in hook scripts](https://bugzilla.redhat.com/show_bug.cgi?id=2054364)
+- [tlog - consistently use ansible_managed in configuration files managed by role](https://bugzilla.redhat.com/show_bug.cgi?id=2054363)
+- [vpn - consistently use ansible_managed in configuration files managed by role](https://bugzilla.redhat.com/show_bug.cgi?id=2054365)
+
+### Bug Fixes
+
+- [ha_cluster - set permissions for haclient group](https://bugzilla.redhat.com/show_bug.cgi?id=2049747)
+
+[1.13.1] - 2022-02-08
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [vpn - vpn: template error while templating string: no filter named 'vpn_ipaddr'](https://bugzilla.redhat.com/show_bug.cgi?id=2050341)
+- [kdump - kdump: Unable to start service kdump: Job for kdump.service failed because the control process exited with error code.](https://bugzilla.redhat.com/show_bug.cgi?id=2052105)
+
+[1.13.0] - 2022-02-01
+----------------------------
+
+### New Features
+
+- [storage - RFE: Add support for RAID volumes (lvm-only)](https://bugzilla.redhat.com/show_bug.cgi?id=2016514)
+- [storage - RFE: Add support for cached volumes (lvm-only)](https://bugzilla.redhat.com/show_bug.cgi?id=2016511)
+- [nbde_client - NBDE client system role does not support servers with static IP addresses](https://bugzilla.redhat.com/show_bug.cgi?id=1985022)
+- [ha_cluster - [RFE] ha_cluster - Support for creating resource constraints (Location, Ordering, etc.)](https://bugzilla.redhat.com/show_bug.cgi?id=2041635)
+- [network - RFE: Support Routing Tables in static routes in Network Role](https://bugzilla.redhat.com/show_bug.cgi?id=2031521)
+
+### Bug Fixes
+
+- [metrics - role can't be re-run if the Grafana admin password has been changed](https://bugzilla.redhat.com/show_bug.cgi?id=1967321)
+- [network - Failure to activate connection: nm-manager-error-quark: No suitable device found for this connection](https://bugzilla.redhat.com/show_bug.cgi?id=2034908)
+- [network - Set DNS search setting only for enabled IP protocols](https://bugzilla.redhat.com/show_bug.cgi?id=2041627)
+
+[1.12.0] - 2022-01-27
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [logging - Logging role "logging_purge_confs" option not properly working](https://bugzilla.redhat.com/show_bug.cgi?id=2040812)
+- [kernel_settings - role should use ansible_managed in its configuration file](https://bugzilla.redhat.com/show_bug.cgi?id=2047504)
+
+[1.11.0] - 2022-01-20
+----------------------------
+
+### New Features
+
+- [Support ansible-core 2.11+](https://bugzilla.redhat.com/show_bug.cgi?id=2012316)
+- [cockpit - Please include "cockpit" role](https://bugzilla.redhat.com/show_bug.cgi?id=2021661)
+- [ssh - ssh/tests_all_options.yml: "assertion": "'StdinNull yes' in config.content | b64decode ", failure](https://bugzilla.redhat.com/show_bug.cgi?id=2029614)
+
+### Bug Fixes
+
+- [timesync - timesync: Failure related to missing ntp/ntpd package/service on RHEL-9 host](https://bugzilla.redhat.com/show_bug.cgi?id=2029463)
+- [logging - role missing quotes for immark module interval value](https://bugzilla.redhat.com/show_bug.cgi?id=2021678)
+- [kdump - kdump: support reboot required and reboot ok](https://bugzilla.redhat.com/show_bug.cgi?id=2029605)
+- [sshd - should detect FIPS mode and handle tasks correctly in FIPS mode](https://bugzilla.redhat.com/show_bug.cgi?id=1979714)
+
+[1.10.0] - 2021-11-08
+----------------------------
+
+### New Features
+
+- [cockpit - Please include "cockpit" role](https://bugzilla.redhat.com/show_bug.cgi?id=2021661)
+- [firewall - Ansible Roles for RHEL Firewall](https://bugzilla.redhat.com/show_bug.cgi?id=1854988)
+- [firewall - RFE: firewall-system-role: add ability to add-source](https://bugzilla.redhat.com/show_bug.cgi?id=1932678)
+- [firewall - RFE: firewall-system-role: allow user defined zones](https://bugzilla.redhat.com/show_bug.cgi?id=1850768)
+- [firewall - RFE: firewall-system-role: allow specifying the zone](https://bugzilla.redhat.com/show_bug.cgi?id=1850753)
+- [Support ansible-core 2.11+](https://bugzilla.redhat.com/show_bug.cgi?id=2012316)
+- [network - role: Allow to specify PCI address to configure profiles](https://bugzilla.redhat.com/show_bug.cgi?id=1695634)
+- [network - [RFE] support wifi Enhanced Open (OWE)](https://bugzilla.redhat.com/show_bug.cgi?id=1993379)
+- [network - [RFE] support WPA3 Simultaneous Authentication of Equals(SAE)](https://bugzilla.redhat.com/show_bug.cgi?id=1993311)
+- [network - [Network] RFE: Support ignoring default gateway retrieved by DHCP/IPv6-RA](https://bugzilla.redhat.com/show_bug.cgi?id=1897565)
+- [logging - [RFE]  logging - Add user and password](https://bugzilla.redhat.com/show_bug.cgi?id=2010327)
+
+### Bug Fixes
+
+- [Replace `# {{ ansible_managed }}` with `{{ ansible_managed | comment }}`](https://bugzilla.redhat.com/show_bug.cgi?id=2006230)
+- [logging - role missing quotes for immark module interval value](https://bugzilla.redhat.com/show_bug.cgi?id=2021678)
+- [logging - Logging - Performance improvement](https://bugzilla.redhat.com/show_bug.cgi?id=2005727)
+- [nbde_client - add regenerate-all to the dracut command](https://bugzilla.redhat.com/show_bug.cgi?id=2021682)
+- [certificate - certificates: "group" option keeps certificates inaccessible to the group](https://bugzilla.redhat.com/show_bug.cgi?id=2021683)
+
+[1.7.3] - 2021-08-26
+----------------------------
+
+### New Features
+
+- [storage - RFE: Request that VDO be added to the Ansible (redhat-system-roles)](https://bugzilla.redhat.com/show_bug.cgi?id=1978488)
+
+### Bug Fixes
+
+- none
+
+[1.7.2] - 2021-08-24
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [logging - Update the certificates copy tasks](https://bugzilla.redhat.com/show_bug.cgi?id=1996777)
+
+[1.7.1] - 2021-08-16
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [metrics - role: the bpftrace role does not properly configure bpftrace agent](https://bugzilla.redhat.com/show_bug.cgi?id=1994180)
+
+[1.7.0] - 2021-08-12
+----------------------------
+
+### New Features
+
+- [drop support for Ansible 2.8](https://bugzilla.redhat.com/show_bug.cgi?id=1989197)
+
+### Bug Fixes
+
+- [sshd - sshd: failed to validate: error:Missing Match criteria for all Bad Match condition](https://bugzilla.redhat.com/show_bug.cgi?id=1991598)
+
+[1.6.6] - 2021-08-06
+----------------------------
+
+### New Features
+
+- [logging - [RFE] logging - Add a support for list value to server_host in the elasticsearch output](https://bugzilla.redhat.com/show_bug.cgi?id=1986460)
+
+### Bug Fixes
+
+- none
+
+[1.6.2] - 2021-07-30
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [metrics - role: Grafana dashboard not working after metrics role run unless services manually restarted](https://bugzilla.redhat.com/show_bug.cgi?id=1984150)
+
+[1.6.0] - 2021-07-28
+----------------------------
+
+### New Features
+
+- [storage - [RFE] storage: support volume sizes as a percentage of pool](https://bugzilla.redhat.com/show_bug.cgi?id=1984583)
+
+### Bug Fixes
+
+- none
+
+[1.5.0] - 2021-07-15
+----------------------------
+
+### New Features
+
+- [ha_cluster - RFE: ha_cluster - add pacemaker cluster properties configuration](https://bugzilla.redhat.com/show_bug.cgi?id=1982913)
+
+### Bug Fixes
+
+- none
+
+[1.4.3] - 2021-07-15
+----------------------------
+
+### New Features
+
+- [crypto_policies - rename 'policy modules' to 'subpolicies'](https://bugzilla.redhat.com/show_bug.cgi?id=1982896)
+
+### Bug Fixes
+
+- none
+
+[1.4.2] - 2021-07-15
+----------------------------
+
+### New Features
+
+- [storage - storage: relabel doesn't support](https://bugzilla.redhat.com/show_bug.cgi?id=1876315)
+
+### Bug Fixes
+
+- none
+
+[1.4.1] - 2021-07-09
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [network - Re-running the network system role results in "changed: true" when nothing has actually changed](https://bugzilla.redhat.com/show_bug.cgi?id=1943384)
+
+[1.4.0] - 2021-07-08
+----------------------------
+
+### New Features
+
+- [storage - RFE: Request that VDO be added to the Ansible (redhat-system-roles)](https://bugzilla.redhat.com/show_bug.cgi?id=1882475)
+
+### Bug Fixes
+
+- none
+
+[1.3.0] - 2021-06-23
+----------------------------
+
+### New Features
+
+- [ha_cluster - RFE: add pacemaker resources configuration](https://bugzilla.redhat.com/show_bug.cgi?id=1963283)
+- [network - [Network] RFE: Support ignoring default gateway retrieved by DHCP/IPv6-RA](https://bugzilla.redhat.com/show_bug.cgi?id=1897565)
+- [storage - RFE: Request that VDO be added to the Ansible (redhat-system-roles)](https://bugzilla.redhat.com/show_bug.cgi?id=1882475)
+- [sshd - RFE: sshd - support for appending a snippet to configuration file](https://bugzilla.redhat.com/show_bug.cgi?id=1970642)
+- [timesync - RFE: timesync support for Network Time Security (NTS)](https://bugzilla.redhat.com/show_bug.cgi?id=1970664)
+
+### Bug Fixes
+
+- [postfix - Postfix RHEL system role README.md missing variables under the "Role Variables" section](https://bugzilla.redhat.com/show_bug.cgi?id=1961858)
+- [postfix - the postfix role is not idempotent](https://bugzilla.redhat.com/show_bug.cgi?id=1960375)
+- [selinux - task for semanage says Fedora in name but also runs on RHEL/CentOS 8](https://bugzilla.redhat.com/show_bug.cgi?id=1966681)
+- [metrics - role task to enable logging for targeted hosts not working](https://bugzilla.redhat.com/show_bug.cgi?id=1967335)
+- [sshd ssh - Unable to set sshd_hostkey_group and sshd_hostkey_mode](https://bugzilla.redhat.com/show_bug.cgi?id=1966711)
+
+[1.2.3] - 2021-06-17
+----------------------------
+
+### New Features
+
+- [main.yml: Add EL 9 support for all roles](https://bugzilla.redhat.com/show_bug.cgi?id=1952887)
+
+### Bug Fixes
+
+- none
+
+[1.2.2] - 2021-06-15
+----------------------------
+
+### New Features
+
+- [timesync - Add hybrid_e2e option to PTP domain](https://bugzilla.redhat.com/show_bug.cgi?id=1957849)
+
+### Bug Fixes
+
+- [Internal links in README.md are broken](https://bugzilla.redhat.com/show_bug.cgi?id=1962976)
+- [ha_cluster - cannot read preshared key in binary format](https://bugzilla.redhat.com/show_bug.cgi?id=1952620)
+
+[1.2.1] - 2021-05-21
+----------------------------
+
+### New Features
+
+- none
+
+### Bug Fixes
+
+- [Internal links in README.md are broken](https://bugzilla.redhat.com/show_bug.cgi?id=1962976)
+
+[1.2.0] - 2021-05-17
+----------------------------
+
+### New Features
+
+- [network - role: Support ethtool -G|--set-ring options](https://bugzilla.redhat.com/show_bug.cgi?id=1959649)
+
+### Bug Fixes
+
+- [postfix - postfix: Use FQRN in README](https://bugzilla.redhat.com/show_bug.cgi?id=1958963)
+- [postfix - Documentation error in rhel-system-roles postfix readme file](https://bugzilla.redhat.com/show_bug.cgi?id=1866544)
+- [storage - storage: calltrace observed when set type: partition for storage_pools](https://bugzilla.redhat.com/show_bug.cgi?id=1854187)
+
+[1.1.0] - 2021-05-13
+----------------------------
+
+### New Features
+
+- [timesync - [RFE] support for free form configuration for chrony](https://bugzilla.redhat.com/show_bug.cgi?id=1938023)
+- [timesync - [RFE] support for timesync_max_distance to configure maxdistance/maxdist parameter](https://bugzilla.redhat.com/show_bug.cgi?id=1938016)
+- [timesync - [RFE] support for ntp xleave, filter, and hw timestamping](https://bugzilla.redhat.com/show_bug.cgi?id=1938020)
+- [selinux - [RFE] Ability to install custom SELinux module via Ansible](https://bugzilla.redhat.com/show_bug.cgi?id=1848683)
+- [network - support for ipv6_disabled to disable ipv6 for address](https://bugzilla.redhat.com/show_bug.cgi?id=1939711)
+- [vpn - [RFE] Release Ansible role for vpn in rhel-system-roles](https://bugzilla.redhat.com/show_bug.cgi?id=1943679)
+
+### Bug Fixes
+
+- [Bug fixes for Collection/Automation Hub](https://bugzilla.redhat.com/show_bug.cgi?id=1954747)
+- [timesync - do not use ignore_errors in timesync role](https://bugzilla.redhat.com/show_bug.cgi?id=1938014)
+- [selinux - rhel-system-roles should not reload the SELinux policy if its not changed](https://bugzilla.redhat.com/show_bug.cgi?id=1757869)
+
+[1.0.0] - 2021-02-23
+----------------------------
+
+### New Features
+
+- [network - RFE: [network] Support of DNS with options](https://bugzilla.redhat.com/show_bug.cgi?id=1893959)
+- [network - RFE: [network] Embrace Inclusive language](https://bugzilla.redhat.com/show_bug.cgi?id=1893957)
+- [ssh - [8.4] [RFE] Release Ansible role for ssh client in rhel-system-roles](https://bugzilla.redhat.com/show_bug.cgi?id=1893712)
+- [clusterha - [8.4] [RFE] Release Ansible role for cluster HA in rhel-system-roles](https://bugzilla.redhat.com/show_bug.cgi?id=1893743)
+- [logging - Logging - Support RELP secure transport in the logging role configuration](https://bugzilla.redhat.com/show_bug.cgi?id=1889484)
+- [metrics - [8.4] [RFE] add exporting-metric-data-to-elasticsearch functionality in the metrics role](https://bugzilla.redhat.com/show_bug.cgi?id=1895188)
+- [metrics - release SQL server configuration support in the metrics role](https://bugzilla.redhat.com/show_bug.cgi?id=1893908)
+- [[8.4] Package rhel-system-roles in the collection format in addition to the legacy role format](https://bugzilla.redhat.com/show_bug.cgi?id=1893906)
+
+### Bug Fixes
+
+- [logging - Logging - Integrating ELK with RHV-4.4 fails as RHVH is missing 'rsyslog-gnutls' package.](https://bugzilla.redhat.com/show_bug.cgi?id=1927943)
+- [storage - storage: omitted parameters on existing pool/volume is interpreted as "use the default"](https://bugzilla.redhat.com/show_bug.cgi?id=1894651)
+- [storage - storage: must list disks in order to identify an existing pool](https://bugzilla.redhat.com/show_bug.cgi?id=1894676)
+- [storage - storage: pool metadata usage must be accounted for by the user](https://bugzilla.redhat.com/show_bug.cgi?id=1894647)
+- [selinux - Merged fix incorrect default value (there is no variable named "present")](https://bugzilla.redhat.com/show_bug.cgi?id=1926947)
+- [storage - storage: tests_luks.yml partition case failed with nvme disk](https://bugzilla.redhat.com/show_bug.cgi?id=1865990)
+
+[1.0] - 2021-01-15
+----------------------------
+
+### New Features
+
+- [tlog - Add exclude_users and exclude_groups support](https://bugzilla.redhat.com/show_bug.cgi?id=1895472)
+- [crypto_policies - [8.4] [RFE] Release Ansible role for crypto policies in rhel-system-roles](https://bugzilla.redhat.com/show_bug.cgi?id=1893699)
+- [sshd - [8.4] [RFE] Release Ansible role for sshd in rhel-system-roles](https://bugzilla.redhat.com/show_bug.cgi?id=1893696)
+- [metrics - role should automate the setup of Grafana datasources](https://bugzilla.redhat.com/show_bug.cgi?id=1855544)
+- [network role: Support -K|--features|--offload ethtool options](https://bugzilla.redhat.com/show_bug.cgi?id=1696703)
+- [network role: Atomic changes](https://bugzilla.redhat.com/show_bug.cgi?id=1695161)
+
+### Bug Fixes
+
+- [storage - safe mode of storage role does not prevent accidentally losing data when toggling encryption on a volume, disk or pool](https://bugzilla.redhat.com/show_bug.cgi?id=1881524)
+- [storage - storage: ext2/3/4 resize function doesn't work](https://bugzilla.redhat.com/show_bug.cgi?id=1862867)
+- [logging - [logging role] cannot setup machine with tls](https://bugzilla.redhat.com/show_bug.cgi?id=1861318)
+- [certificate - role: The role is not idempotent in rhel7](https://bugzilla.redhat.com/show_bug.cgi?id=1859547)
+- [logging - Logging - Bug fixes](https://bugzilla.redhat.com/show_bug.cgi?id=1854546)
+- [logging - [logging role] support scenario for client without key/cert, just CA cert](https://bugzilla.redhat.com/show_bug.cgi?id=1860896)
+- [metrics - role incorrectly sets up multiple primary pmie processes in multi-host mode](https://bugzilla.redhat.com/show_bug.cgi?id=1855539)
+- [certificate - role cannot manage EL7 hosts](https://bugzilla.redhat.com/show_bug.cgi?id=1848745)
+- [network - [network] Support state:down persistent_state:absent for non-existent profile](https://bugzilla.redhat.com/show_bug.cgi?id=1822777)
+- [network - Creating active bonded interface fails with the initscripts provider](https://bugzilla.redhat.com/show_bug.cgi?id=1848472)
+- [logging - Logging role had performance issues](https://bugzilla.redhat.com/show_bug.cgi?id=1848762)
+- [certificate - role does not work on controller hosts which use jinja2 2.10](https://bugzilla.redhat.com/show_bug.cgi?id=1848742)
+- [nbde_client - fix idempotency, check_mode issues with nbde_client role](https://bugzilla.redhat.com/show_bug.cgi?id=1848766)
+- [storage - Storage role can remove existing filesystems and volume groups without warning](https://bugzilla.redhat.com/show_bug.cgi?id=1763242)
+- [network role: Minimize service disruption](https://bugzilla.redhat.com/show_bug.cgi?id=1695157)
+- [typo in selinux/tests/tests_selinux_disabled.yml: Invalid options for assert: mgs](https://bugzilla.redhat.com/show_bug.cgi?id=1677743)
+- [Check mode problems in rhel-system-roles](https://bugzilla.redhat.com/show_bug.cgi?id=1685904)
+
+[0.6] - 2018-05-11
+----------------------------
+
+### New Features
+
+- [RFE: Ansible rhel-system-roles.network: add ETHTOOL_OPTS, LINKDELAY, IPV4_FAILURE_FATAL](https://bugzilla.redhat.com/show_bug.cgi?id=1478576)
+
+### Bug Fixes
+
+- none
diff --git a/SOURCES/spec-to-changelog-md.sh b/SOURCES/spec-to-changelog-md.sh
new file mode 100644
index 0000000..e69de29
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index f9eee0d..cf4a858 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -30,7 +30,7 @@ Name: linux-system-roles
 %endif
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
-Version: 1.15.0
+Version: 1.20.0
 Release: 1%{?dist}
 
 #Group: Development/Libraries
@@ -127,85 +127,85 @@ BuildRequires: %{ansible_build_dep}
 
 #%%defcommit 1 14314822b529520ac12964e0d2938c4bb18ab895
 %global rolename1 postfix
-%deftag 1 1.1.3
+%deftag 1 1.2.4
 
 #%%defcommit 2 9fe6eb36772e83b53dcfb8ceb73608fd4f72eeda
 %global rolename2 selinux
-%deftag 2 1.3.4
+%deftag 2 1.4.0
 
 #%%defcommit 3 cbe4bf262bffae3bf53e531662237741954c4182
 %global rolename3 timesync
-%deftag 3 1.6.5
+%deftag 3 1.6.9
 
 #%%defcommit 4 02fc72b482e165472624b2f68eecd2ddce1d93b1
 %global rolename4 kdump
-%deftag 4 1.2.2
+%deftag 4 1.2.5
 
-%defcommit 5 61423ed36fc6da6dbe8321912e896c59a2d8e2f6
+#%%defcommit 5 a74092634adfe45f76cf761138abab1811692b4b
 %global rolename5 network
-#%%deftag 5 1.7.0
+%deftag 5 1.9.1
 
 #%%defcommit 6 50d2b8ccc98a8f4cb9d1d550d21adc227181e9fa
 %global rolename6 storage
-%deftag 6 1.7.0
+%deftag 6 1.9.1
 
-#%%defcommit 7 0673d842fb32c437501e2aada2e38921da98e115
+#%%defcommit 7 d57caa8ca506d8cbc7ca0f96f7cb62b7e965f163
 %global rolename7 metrics
-%deftag 7 1.4.1
+%deftag 7 1.7.3
 
 #%%defcommit 8 2b9e53233ee3a68bdb532e62f289733e436a6106
 %global rolename8 tlog
-%deftag 8 1.2.5
+%deftag 8 1.2.9
 
 #%%defcommit 9 9373303b98e09ef38df7afc8d06e5e55812096c7
 %global rolename9 kernel_settings
-%deftag 9 1.1.4
+%deftag 9 1.1.10
 
 #%%defcommit 10 20dd3e5520ca06dcccaa9b3f1fb428d055e0c23f
 %global rolename10 logging
-%deftag 10 1.8.1
+%deftag 10 1.10.0
 
 #%%defcommit 11 c57d0b1f3384c525738fa26ba4bdca485e162567
 %global rolename11 nbde_server
-%deftag 11 1.1.2
+%deftag 11 1.1.5
 
 #%%defcommit 12 bef2fad5e365712d1f40e53662490ba2550a253f
 %global rolename12 nbde_client
-%deftag 12 1.2.0
+%deftag 12 1.2.6
 
 #%%defcommit 13 310fc53db04e8d3134524afb7a89b0477a2ffb83
 %global rolename13 certificate
-%deftag 13 1.1.3
+%deftag 13 1.1.6
 
 #%%defcommit 14 b2a9857ac661fa32e66666e444b73bfdb34cdf95
 %global rolename14 crypto_policies
-%deftag 14 1.2.3
+%deftag 14 1.2.6
 
 %global forgeorg15 https://github.com/willshersystems
 %global repo15 ansible-sshd
 %global rolename15 sshd
-%defcommit 15 214df35c0bee77b5d69f49c2da269251d451b28f
-#%%deftag 15 v0.14.1
+%defcommit 15 9766d9097a87a130d4c8abde2247aaad5c925ecf
+#%%deftag 15 v0.15.1
 
 #%%defcommit 16 59b9fd7b25607d8bd33bdb082748955f2652846a
 %global rolename16 ssh
-%deftag 16 1.1.4
+%deftag 16 1.1.9
 
 #%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d
 %global rolename17 ha_cluster
-%deftag 17 1.4.1
+%deftag 17 1.7.4
 
 #%%defcommit 18 5f6cb73e6753fbdbb219b7d3079f0378b2d3bdb3
 %global rolename18 vpn
-%deftag 18 1.3.2
+%deftag 18 1.3.5
 
 %global rolename19 firewall
-%deftag 19 1.1.0
+%deftag 19 1.4.0
 
 %global rolename20 cockpit
-%deftag 20 1.2.1
+%deftag 20 1.3.0
 
-%global mainid 07860ebb58a41f294b5ff41b1b5ab8f358cd9513
+%global mainid c22eff88d40972158cd5c413b7468b4e904cc76c
 Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: %{archiveurl1}
 Source2: %{archiveurl2}
@@ -230,11 +230,18 @@ Source20: %{archiveurl20}
 
 # Collection tarballs from Automation Hub
 # Not used on Fedora.
-Source801: ansible-posix-1.3.0.tar.gz
+Source801: ansible-posix-1.4.0.tar.gz
 
 # Collection tarballs from Galaxy
 # Not used on Fedora.
-Source901: community-general-4.4.0.tar.gz
+Source901: community-general-5.4.0.tar.gz
+
+# changelog is auto generated on Fedora
+Source996: CHANGELOG.md
+
+# Script to convert spec %changelog into collection CHANGELOG.md
+# only used on Fedora
+Source997: spec-to-changelog-md.sh
 
 # Script to convert the collection README to Automation Hub.
 # Not used on Fedora.
@@ -334,8 +341,11 @@ cd %{rolename5}
 %patch51 -p1
 cd ..
 cd %{rolename15}
-sed -r -i -e "s/ansible-sshd/linux-system-roles.sshd/" tests/*.yml examples/*.yml
-sed -r -i -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" tests/*.yml examples/*.yml README.md
+find -P tests examples -name \*.yml | while read file; do
+  sed -r -i -e "s/ansible-sshd/linux-system-roles.sshd/" \
+     -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" "$file"
+done
+sed -r -i -e "s/ willshersystems.sshd/ linux-system-roles.sshd/" README.md
 sed -r -i -e "s/min_ansible_version: 2.8/min_ansible_version: 2.9/" meta/main.yml
 cd ..
 
@@ -391,7 +401,15 @@ for module in "${!module_map[@]}"; do
   if [ ! -d $role/library ]; then
     mkdir $role/library
   fi
-  cp -pL .external/community/general/plugins/modules/$module $role/library/$module
+  # version 5.x seems to be broken?
+  moduledir=.external/community/general/plugins/modules
+  if [ ! -f $moduledir/$module ]; then
+    moduledir=.external/community/general/plugins/modules/system
+  fi
+  if [ ! -f $moduledir/$module ]; then
+    moduledir=.external/community/general/plugins/modules/files
+  fi
+  cp -pL $moduledir/$module $role/library/$module
   ls -alrtF $role/library/$module
   sed -i -e ':a;N;$!ba;s/description:\n\( *\)/description:\n\1- WARNING: Do not use this module directly! It is only for role internal use.\n\1/' $role/library/$module
 done
@@ -464,7 +482,7 @@ for role in %{rolenames}; do
     includes="$includes --include $role"
 %if 0%{?rhel}
     # we vendor-in all of the dependencies on rhel, so remove them
-    rm -f "$role/meta/requirements.yml"
+    rm -f "$role/meta/requirements.yml" "$role/meta/collection-requirements.yml"
 %endif
 done
 
@@ -486,6 +504,15 @@ for role in %{rolenames}; do
     .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/$role/README.md
 done
 
+%if 0%{?rhel}
+cp %{SOURCE996} \
+    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/docs/CHANGELOG.md
+%else
+# Build the collection CHANGELOG.md
+%{SOURCE997} %{_specdir}/%{name}.spec \
+    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/docs/CHANGELOG.md
+%endif
+
 %install
 mkdir -p $RPM_BUILD_ROOT%{installbase}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles
@@ -504,6 +531,8 @@ mkdir -p $RPM_BUILD_ROOT%{_pkglicensedir}
 rm $RPM_BUILD_ROOT%{installbase}/%{roleinstprefix}network/examples/roles
 for role in %{rolenames}; do
     mkdir -p "$RPM_BUILD_ROOT%{_pkgdocdir}/$role"
+    cp -p "$RPM_BUILD_ROOT%{installbase}/%{roleinstprefix}$role/CHANGELOG.md" \
+       "$RPM_BUILD_ROOT%{_pkgdocdir}/$role"
     cp -p "$RPM_BUILD_ROOT%{installbase}/%{roleinstprefix}$role/README.md" \
        "$RPM_BUILD_ROOT%{_pkgdocdir}/$role"
 %if %{with html}
@@ -563,11 +592,15 @@ cp -p %{buildroot}%{ansible_collection_files}%{collection_name}/README.md \
    $RPM_BUILD_ROOT%{_pkgdocdir}/collection
 
 for rolename in %{rolenames}; do
-  if [ -f %{buildroot}%{ansible_collection_files}%{collection_name}/roles/${rolename}/README.md ]; then
-    mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/collection/roles/${rolename}
-    cp -p %{buildroot}%{ansible_collection_files}%{collection_name}/roles/${rolename}/README.md \
+  for file in CHANGELOG.md README.md; do
+    if [ -f %{buildroot}%{ansible_collection_files}%{collection_name}/roles/${rolename}/$file ]; then
+      if [ ! -d $RPM_BUILD_ROOT%{_pkgdocdir}/collection/roles/${rolename} ]; then
+        mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}/collection/roles/${rolename}
+      fi
+      cp -p %{buildroot}%{ansible_collection_files}%{collection_name}/roles/${rolename}/$file \
         $RPM_BUILD_ROOT%{_pkgdocdir}/collection/roles/${rolename}
-  fi
+    fi
+  done
 done
 
 %if %{with html}
@@ -607,7 +640,7 @@ format_item_for_files() {
         else
             echo "$files_item"
         fi
-    elif [[ "$item" == */README.md ]] || [[ "$item" == */README.html ]]; then
+    elif [[ "$item" == */README.md ]] || [[ "$item" == */README.html ]] || [[ "$item" == */CHANGELOG.md ]]; then
         if [[ "$item" == */private_* ]]; then
             # mark as regular file, not %doc
             echo "$files_item"
@@ -677,11 +710,13 @@ fi
 
 
 %files -f files_section.txt
+%{_pkgdocdir}/*/CHANGELOG.md
 %{_pkgdocdir}/*/README.md
 %if %{with html}
 %{_pkgdocdir}/*/README.html
 %endif
 %{_pkgdocdir}/*/example-*
+%{_pkgdocdir}/collection/roles/*/CHANGELOG.md
 %{_pkgdocdir}/collection/roles/*/README.md
 %if %{with html}
 %{_pkgdocdir}/collection/roles/*/README.html
@@ -710,7 +745,228 @@ fi
 %endif
 
 %changelog
-* Tue Feb 20 2022 Rich Megginson <rmeggins@redhat.com> - 1.15.0-1
+* Tue Aug 09 2022 Rich Megginson <rmeggins@redhat.com> - 1.20.0-1
+- Resolves:rhbz#2115159 : cockpit - Add customization of port
+- Resolves:rhbz#2100939 : firewall - RFE: firewall-system-role: add ability to add interface to zone by PCI device ID
+- Resolves:rhbz#2115160 : firewall - support for firewall_config - gather firewall facts
+- Resolves:rhbz#2112143 : logging - [RFE] Support startmsg.regex and endmsg.regex in the files inputs
+- Resolves:rhbz#2115162 : selinux - Added setting of seuser and selevel for completeness
+- Resolves:rhbz#2115161 : nbde_client - Sets proper spacing for parameter rd.neednet=1
+- Resolves:rhbz#2115884 : network - fix IPRouteUtils.get_route_tables_mapping() to accept any whitespace sequence
+- Resolves:rhbz#2109997 : ssh sshd - ssh, sshd: RSAMinSize parameter definition is missing
+- Resolves:rhbz#2082391 : storage - [RHEL8] [WARNING]: The loop variable 'storage_test_volume' is already in use. You should set the `loop_var` value in the `loop_control` option for the task to something else to avoid variable collisions and unexpected behavior.
+
+* Fri Jul 01 2022 Rich Megginson <rmeggins@redhat.com> - 1.19.3-1
+- min_ansible_version is string instead of float
+
+- fix storage test failures
+
+- support for ansible-core 2.13
+
+- firewall - forward_port should accept list of string or list of dict
+  Resolves: rhbz#2101607
+
+- firewall - support add/modify/delete services
+  Resolves: rhbz#2100297
+
+- metrics - document minimum supported redis version required by rhel-system-roles
+  Resolves: rhbz#2100285
+
+- metrics - restart pmie, pmlogger if changed, do not wait for handler
+  Resolves: rhbz#2100298
+
+- network - Support managing the network through nmstate schema
+  Resolves: rhbz#2100979
+
+- storage - support for adding/removing disks to/from storage pools
+  Resolves: rhbz#2066880
+
+- storage - support for attaching cache volumes to existing volumes
+  Resolves: rhbz#2066881
+
+* Wed Jun 15 2022 Rich Megginson <rmeggins@redhat.com> - 1.19.2-1
+- sshd - fix ansible 2.9 support in meta/main.yml
+  Resolves: rhbz#2086935 (8.7.0)
+
+* Mon Jun 13 2022 Rich Megginson <rmeggins@redhat.com> - 1.19.1-1
+- storage - fix coverity scan issue in blivet.py
+  Resolves: rhbz#2066876 (8.7.0)
+
+- logging - fix gather_facts/set_vars issue
+  Resolves: rhbz#2079008 (8.7.0)
+
+- ha_cluster - Move tasks that set up CI environment to roles tasks/ dir
+  Resolves: rhbz#2093500 (8.7.0)
+
+- sshd - fix tests issue with rhel9 hosts
+
+* Mon Jun 06 2022 Rich Megginson <rmeggins@redhat.com> - 1.19.0-1
+- storage - support for creating and managing LVM thin pools/LVs
+  Resolves: rhbz#2066876 (8.7.0)
+
+- firewall - Update Ansible syntax in Firewall system role README.md file examples
+  Resolves: rhbz#2081839 (8.7.0)
+
+- storage role raid_level "striped" is not supported
+  Resolves: rhbz#2083426 (8.7.0)
+
+- network: the controller device is not completely cleaned up in the bond tests.
+  Resolves: rhbz#2089868 (8.7.0)
+
+- firewall - state no longer required for masquerade and ICMP block inversion
+  Resolves: rhbz#2093437 (8.7.0)
+
+- ha_cluster - Move tasks that set up CI environment to roles tasks/ dir
+  Resolves: rhbz#2093500 (8.7.0)
+
+* Thu May 26 2022 Rich Megginson <rmeggins@redhat.com> - 1.18.0-1
+- firewall - [Improvement] Allow System Role to reset to default Firewalld Settings
+  Resolves: rhbz#2043009 (8.7.0)
+
+- metrics - [RFE] add an option to the metrics role to enable postfix metric collection
+  Resolves: rhbz#2079114 (8.7.0)
+
+- network - Rework the infiniband support
+  Resolves: rhbz#2086869 (8.7.0)
+
+- sshd - recurse into tests and examples sub-directories when replacing string in files
+  the sshd role latest version added sub-directories under tests that need
+  role name replacement - so just use find
+
+- sshd - sshd system role should not assume that RHEL 9 /etc/ssh/sshd_config has "Include > /etc/ssh/sshd_config.d/*.conf"
+  Resolves: rhbz#2086934 (8.7.0)
+
+- sshd - sshd system role should be able to optionally manage /etc/ssh/sshd_config on RHEL 9
+  Resolves: rhbz#2086935 (8.7.0)
+
+- storage - storage role cannot set mount_options for volumes
+  Resolves: rhbz#2083378 (8.7.0)
+
+* Mon Apr 25 2022 Rich Megginson <rmeggins@redhat.com> - 1.17.0-1
+- All roles should support running with gather_facts: false
+  Resolves: rhbz#2079008 (8.7.0)
+
+- firewall - Firewall system role Ansible deprecation warning related to "include"
+  Resolves: rhbz#2078650 (8.7.0)
+
+- ha_cluster - ha_cluster - support advanced corosync configuration
+  Resolves: rhbz#2065339 (8.7.0)
+
+- ha_cluster - ha_cluster - support SBD fencing
+  Resolves: rhbz#2066868 (8.7.0)
+
+- ha_cluster - ha_cluster - add support for configuring bundle resources
+  Resolves: rhbz#2073518 (8.7.0)
+
+- kernel_settings - kernel_settings error configobj not found on RHEL 8.6 managed hosts
+  Resolves: rhbz#2060378 (8.7.0)
+
+- logging - logging tests fail during cleanup if no cloud-init on system
+  Resolves: rhbz#2058807 (8.7.0)
+
+- logging - Logging - RFE - support template, severity and facility options
+  Resolves: rhbz#2075116 (8.7.0)
+
+- metrics - Metrics role, with "metrics_from_mssql" option does not configure /var/lib/pcp/pmdas/mssql/mssql.conf on first run
+  Resolves: rhbz#2060377 (8.7.0)
+
+- metrics - metrics - consistently use ansible_managed in configuration files managed by role
+  Resolves: rhbz#2065215 (8.7.0)
+
+- metrics - [RFE] add an option to the metrics role to enable postfix metric collection
+  Resolves: rhbz#2079114 (8.7.0)
+
+- nbde_client - NBDE client system role does not support servers with static IP addresses
+  Resolves: rhbz#2071011 (8.7.0)
+
+- network - [RFE] Extend rhel-system-roles.network feature set to support routing rules
+  Resolves: rhbz#1996731 (8.7.0)
+
+- network - bond: fix typo in supporting the infiniband ports in active-backup mode
+  Resolves: rhbz#2064067 (8.7.0)
+
+- network - pytest failed when running with nm providers in the rhel-8.5 beaker machine
+  Resolves: rhbz#2065217 (8.7.0)
+
+- network - network - consistently use ansible_managed in configuration files managed by role
+  Resolves: rhbz#2065670 (8.7.0)
+
+- postfix - postfix - consistently use ansible_managed in configuration files managed by role
+  Resolves: rhbz#2065216 (8.7.0)
+
+- postfix - Postfix RHEL System Role should provide the ability to replace config and reset configuration back to default
+  Resolves: rhbz#2065218 (8.7.0)
+
+- sshd - FIPS mode detection in SSHD role is wrong
+  Resolves: rhbz#2075338 (8.7.0)
+
+- storage - RFE storage Less verbosity by default
+  Resolves: rhbz#2056480 (8.7.0)
+
+- timesync - timesync: basic-smoke test failure in timesync/tests_ntp.yml
+  Resolves: rhbz#2060379 (8.7.0)
+
+- tlog - Tlog role - Enabling session recording configuration does not work due to RHEL9 SSSD files provider default
+  Resolves: rhbz#2072749 (8.7.0)
+
+* Thu Apr 07 2022 Rich Megginson <rmeggins@redhat.com> - 1.16.3-1
+- tlog - Enabling session recording configuration does not work due to RHEL9 SSSD files provider default
+  Resolves rhbz#2072749 (EL8)
+  Resolves rhbz#2071804 (EL9)
+
+* Wed Apr 06 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.16.2-2
+- Update community.general
+
+* Thu Mar 31 2022 Rich Megginson <rmeggins@redhat.com> - 1.16.2-1
+- nbde_client - NBDE client system role does not support servers with static IP addresses
+  previous fix did not handle some other cases
+  Resolves rhbz#1985022 (EL8)
+  Resolves rhbz#2031555 (EL9)
+
+* Tue Mar 29 2022 Rich Megginson <rmeggins@redhat.com> - 1.16.1-1
+- nbde_client - NBDE client system role does not support servers with static IP addresses
+  previous fix did not handle some cases
+  Resolves rhbz#1985022 (EL8)
+  Resolves rhbz#2031555 (EL9)
+
+* Tue Mar 22 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.16.0-2
+- Update community.general
+
+* Tue Mar 15 2022 Rich Megginson <rmeggins@redhat.com> - 1.16.0-1
+- network - pytest failed when running with nm providers in the rhel-8.5 beaker machine
+  Resolves rhbz#2064396 (EL8)
+  Resolves rhbz#2064401 (EL9)
+- network - bond: fix typo in supporting the infiniband ports in active-backup modekernel_settings error configobj not found on RHEL 8.6 managed hosts
+  Resolves rhbz#2064388 (EL8)
+  Resolves rhbz#2064391 (EL9)
+- network - consistently use ansible_managed in configuration files managed by role
+  Resolves rhbz#2057656 (EL8)
+  Resolves rhbz#2057657 (EL9)
+- metrics - consistently use ansible_managed in configuration files managed by role
+  Resolves rhbz#2057645 (EL8)
+  Resolves rhbz#2057647 (EL9)
+- postfix - consistently use ansible_managed in configuration files managed by role
+  Resolves rhbz#2057661 (EL8)
+  Resolves rhbz#2057662 (EL9)
+- postfix - provide the ability to replace config and reset configuration back to default
+  Resolves rhbz#2044657 (EL8)
+  Resolves rhbz#2058780 (EL9)
+- new tags required in galaxy.yml for Automation Hub
+
+* Thu Mar 3 2022 Rich Megginson <rmeggins@redhat.com> - 1.15.1-1
+- kernel_settings error configobj not found on RHEL 8.6 managed hosts
+  Resolves rhbz#2058772 (EL8)
+  Resolves rhbz#2058756 (EL9)
+- timesync: basic-smoke test failure in timesync/tests_ntp.yml
+  Resolves rhbz#2059293 (EL8)
+  Resolves rhbz#2058645 (EL9)
+
+* Tue Mar  1 2022 Noriko Hosoi <nhosoi@redhat.com> - 1.15.0-2
+- metrics - follow symlinks for the mssql and elasticsearch configuration paths
+  Resolves rhbz#2058655 (EL8)
+  Resolves rhbz#2058777 (EL9)
+
+* Thu Feb 24 2022 Rich Megginson <rmeggins@redhat.com> - 1.15.0-1
 - firewall - ensure target changes take effect immediately
   Resolves rhbz#2057172 (EL8)
   Resolves rhbz#2057164 (EL9)