diff --git a/.gitignore b/.gitignore
index 056fc35..447ae3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -204,3 +204,7 @@ SOURCES/vpn-1.5.3.tar.gz
 /podman-1.3.2.tar.gz
 /community-general-7.3.0.tar.gz
 /firewall-1.6.2.tar.gz
+/containers-podman-1.10.3.tar.gz
+/kdump-1.3.6.tar.gz
+/storage-1.12.3.tar.gz
+/firewall-1.6.3.tar.gz
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c23d25..cf139df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,14 +33,24 @@ Changelog
 
 - [ALL - facts being gathered unnecessarily](https://bugzilla.redhat.com/show_bug.cgi?id=2223036)
 - [certificate - rhel-system-roles.certificate does not re-issue after updating key_size](https://bugzilla.redhat.com/show_bug.cgi?id=2186057)
+#- [firewall - fix: reload on resetting to defaults](https://bugzilla.redhat.com/show_bug.cgi?id=2223764)
+#- [firewall - Check mode fails with replacing previous rules](https://issues.redhat.com/browse/RHEL-898)
 - [firewall - Check mode fails when creating new firewall service](https://bugzilla.redhat.com/show_bug.cgi?id=2222433)
+#- [firewall - Ansible RHEL firewall system role not idempotent when configuring the interface using the role in rhel9](https://issues.redhat.com/browse/RHEL-885)
 - [firewall - Don't install python(3)-firewall it's a dependency of firewalld](https://bugzilla.redhat.com/show_bug.cgi?id=2216521)
+#- [firewall - fix: files: overwrite firewalld.conf on previous replaced](https://issues.redhat.com/browse/RHEL-1495)
 - [kdump - support auto_reset_crashkernel, dracut_args, deprecate /etc/sysconfig/kdump](https://bugzilla.redhat.com/show_bug.cgi?id=2211272)
+#- [kdump - use failure_action instead of default on EL9 and later](https://issues.redhat.com/browse/RHEL-906)
+#- [kdump - "Write new authorized_keys if needed" task idempotency issues](https://bugzilla.redhat.com/show_bug.cgi?id=2232241)
+#- [kdump - system role fails if kdump_ssh_user doesn't have a .ssh/authorized_keys file in home directory](https://bugzilla.redhat.com/show_bug.cgi?id=2232231)
+#- [kdump - fix: ensure .ssh directory exists for kdump_ssh_user on kdump_ssh_server](https://issues.redhat.com/browse/RHEL-1397)
+#- [kdump - fix: Ensure authorized_keys management works with multiple hosts](https://issues.redhat.com/browse/RHEL-1499)
 - [podman - Podman system role:  Unable to use podman_registries_conf to set unqualified-search-registries](https://bugzilla.redhat.com/show_bug.cgi?id=2226077)
 - [rhc - system role does not apply Insights tags](https://bugzilla.redhat.com/show_bug.cgi?id=2209441)
 - [storage - Cannot set chunk size for RAID: Unsupported parameters for (blivet) module: pools.raid_chunk_size](https://bugzilla.redhat.com/show_bug.cgi?id=2193057)
 - [storage - RAID volume pre cleanup - remove existing data from member disks as needed before creation](https://bugzilla.redhat.com/show_bug.cgi?id=2224094)
 - [storage - Storage: mounted devices that are in use cannot be resized](https://bugzilla.redhat.com/show_bug.cgi?id=2168738)
+#- [storage - fix: use stat.pw_name, stat.gr_name instead of owner, group](https://issues.redhat.com/browse/RHEL-1497)
 - [tlog - use the proxy provider - the files provider is deprecated in sssd](https://bugzilla.redhat.com/show_bug.cgi?id=2191702)
 
 [1.21.1] - 2023-03-16
diff --git a/extrasources.inc b/extrasources.inc
index 66ee568..8ee7e1f 100644
--- a/extrasources.inc
+++ b/extrasources.inc
@@ -1,10 +1,10 @@
 Source801: https://galaxy.ansible.com/download/ansible-posix-1.5.4.tar.gz
 Source901: https://galaxy.ansible.com/download/community-general-7.3.0.tar.gz
-Source902: https://galaxy.ansible.com/download/containers-podman-1.10.2.tar.gz
+Source902: https://galaxy.ansible.com/download/containers-podman-1.10.3.tar.gz
 
 Provides: bundled(ansible-collection(ansible.posix)) = 1.5.4
 Provides: bundled(ansible-collection(community.general)) = 7.3.0
-Provides: bundled(ansible-collection(containers.podman)) = 1.10.2
+Provides: bundled(ansible-collection(containers.podman)) = 1.10.3
 
 Source996: CHANGELOG.rst
 Source998: collection_readme.sh
diff --git a/rhel-system-roles.spec b/rhel-system-roles.spec
index 4699861..6bfb39b 100644
--- a/rhel-system-roles.spec
+++ b/rhel-system-roles.spec
@@ -100,13 +100,13 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 3 1.7.6
 
 %global rolename4 kdump
-%deftag 4 1.3.4
+%deftag 4 1.3.6
 
 %global rolename5 network
 %deftag 5 1.13.1
 
 %global rolename6 storage
-%deftag 6 1.12.2
+%deftag 6 1.12.3
 
 %global rolename7 metrics
 %deftag 7 1.8.6
@@ -147,7 +147,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 18 1.5.8
 
 %global rolename19 firewall
-%deftag 19 1.6.2
+%deftag 19 1.6.3
 
 %global rolename20 cockpit
 %deftag 20 1.4.7
@@ -667,7 +667,13 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 
 %changelog
 * Tue Aug 15 2023 Rich Megginson <rmeggins@redhat.com> - 1.22.0-1
+#- Resolves:rhbz#2232241 : kdump - "Write new authorized_keys if needed" task idempotency issues
+#- Resolves:rhbz#2232231 : kdump - system role fails if kdump_ssh_user doesn't have a .ssh/authorized_keys file in home directory
+#- Resolves RHEL-1397 : kdump - fix: ensure .ssh directory exists for kdump_ssh_user on kdump_ssh_server
+#- Resolves RHEL-1499 : kdump - fix: Ensure authorized_keys management works with multiple hosts
 - Resolves:rhbz#2224648 : firewall - fix: reload on resetting to defaults
+#- Resolves RHEL-1495 : firewall - fix: files: overwrite firewalld.conf on previous replaced
+#- Resolves RHEL-1497 : storage - fix: use stat.pw_name, stat.gr_name instead of owner, group
   sshd README remove upstream only docs
   first RC for 1.22.0 rhel 8.9 and 9.3
   fix firewall reload test gather facts
diff --git a/sources b/sources
index c4469c7..78f046a 100644
--- a/sources
+++ b/sources
@@ -5,12 +5,12 @@ SHA512 (auto-maintenance-e010c878833e363195dd707d1334ff48a254b092.tar.gz) = 01c4
 SHA512 (certificate-1.2.1.tar.gz) = 7ca0dd56de62ffcfeb3d2d438f125f5bc04009357085053f2ab2fc281fd4fa659a9d77bf7aa37264c980f057db501e64cd6c72cd7545096850053e8b0a6c75f9
 SHA512 (cockpit-1.4.7.tar.gz) = 4241a400e26abfdc188d016dc367a62cb51979bcaa41f579714e9b01d2a84548ba06f24f011936248bfe18e05c706a70e5e1367307d306f4c65fdcd9a6a83fa6
 SHA512 (community-general-7.3.0.tar.gz) = 8f7b6d31b3b6c9c5534f984ec9c7954ab3e7c0c5cbe78bf4e9178398bba1aa8371773a83fcdf37abf4cb6df3c3ebda88c29f20aa506fd27d4b428150fc107bf5
-SHA512 (containers-podman-1.10.2.tar.gz) = b18122f4d5b2e68b6b6edfbb264a7ff98ce898db2bbf1f87e0d449f3dd7035d55d4bfcaed831159c2a0e7dcc61856ef38e22a553bb65ede4aced1830709b783e
+SHA512 (containers-podman-1.10.3.tar.gz) = 5234d12ab5a870bc08553e5a51d06f75dfa73f22764378ffb2053b55cb306fc7ec1f24d399f414cac8213de4c34211c33d947c02d823da6ef2ee31bdbb7c1fad
 SHA512 (crypto_policies-1.2.11.tar.gz) = b3bac1bf3b960b44f437ed2a42d2208406956166c18a1d0e711c44b75997ec26dd6628e0257b72ba1e540e62ac88d968287a47b0750b42961a90fa508febf1e3
-SHA512 (firewall-1.6.2.tar.gz) = f380781b54b6596a3387581c4f1987d360ebfa3d47204add724a6ce7ce8667d6255b9f0ca725f64d1e5937188e93e53dfa3b8cf095318345dbbe41f4e3fa1f90
+SHA512 (firewall-1.6.3.tar.gz) = 0e08a4494cd9c346d3bb1aace78deeb7868b3e121247d5baa024109b5f880a5aa7ed55a41d005b5a8252e9a92e0046a361e856138734741397c230998122fb5c
 SHA512 (ha_cluster-1.10.0.tar.gz) = 961145301b607def32352bd79f46f31d33866d3c3f588649135cab061966f65157a9fe3923881a294e80b87d6671697446a6074da4cf1b8645af11affc89500d
 SHA512 (journald-1.0.5.tar.gz) = 905d7b354f411f6b053e3ee6ada6771da8f5d310df5ef9c8eff5e88e6c31d968275cec1155bf8bbeeafa5c6436eb859f4d1dfdaefe097aa4feaea015559213cf
-SHA512 (kdump-1.3.4.tar.gz) = f9bedee4fc501f10c4a216f186d4ca85bef4d8a38c58ffe3e135d2bd25e013902a6f727e9b63d4c4668070b7c28107bfbd158727381ebc4cd469104c7a5de723
+SHA512 (kdump-1.3.6.tar.gz) = 196d49bde461e0325adeaa1c9dda41c567974e3e79e9134f7f7f185832b834ce2bcdbcc3bb2558afa0717c07c2fe56ea36377596c2f79c0436e06bb4fd8607eb
 SHA512 (kernel_settings-1.1.17.tar.gz) = 1d5fcb9d369a06409c718b84d052d123412c90d81ff29124f6ad0eaa31616b95fdda5b5a5e838acade9553f8c8a6ea1d1a33c4a6bf4cd334980b45c7ffbaa46b
 SHA512 (keylime_server-1.0.0.tar.gz) = 0366331302ad198da675abbb700ffe81c15b364357d834b89ab383b945fa57301ede1a48efa6ffb766c7f3b0b5165fd5c7961642d4826749dd079d71cf1c70a1
 SHA512 (logging-1.11.9.tar.gz) = ed06e51b86a7b23ed469afdb35e7f314812faa7e7e5a53022e5008d9d1a309ff3bfbdd61fdeb25d44ff8093bc31e2d786de0db00f265a39c2ccf99832104f1ce
@@ -24,7 +24,7 @@ SHA512 (postgresql-1.1.0.tar.gz) = fcc324a9ca431c441a911443db573a952e6f41e121c1a
 SHA512 (rhc-1.2.4.tar.gz) = e1b3599b0bb545144c4192e6264bde807db03f5dd7309f627624a79f7dedd427e55fc9579440f648f1561dbd6192ffa2659538761bb7e9956e77c0de727ecd4b
 SHA512 (selinux-1.6.1.tar.gz) = 05a8f341860cff7b20b1914401559a40ae1e2a84cb14e8e3ddb9a293940000053cf9c0f31a7b6f3c2b6964f6e60f9e1acd35741667eb0daa3a9d73bf33053d89
 SHA512 (ssh-1.2.1.tar.gz) = 6a83c1d730ca5003e025c90de9843362201d7b09b32646d32620c46edaf79c0fa2e431534ed31a5c4f661f6f499df725953e9dd532444a430bdf3db51b1b275e
-SHA512 (storage-1.12.2.tar.gz) = b9435a1d29f5de7d5d9e43604b821eafc3fdbab3c46f73c2ebe9c937e78ad9705fe8acb194751c255926c5d8ea7273b8a56ef7b1fb254a75605d6d80b0298717
+SHA512 (storage-1.12.3.tar.gz) = 54c06ca657e3c24565103e6f13c31cd8bcd51e63073d41ea57430bcca6d88411afb92166fb129adc77395c1599e9b0c11620445d7cb6fda85dcae94be3af2170
 SHA512 (systemd-1.0.1.tar.gz) = da7f765d7b3ced84dee4dbb888bfa492ac535a52fe589fc0a91d7840374a6fa6702f5f64b3b2dd96f5c6b8c5e5ba513de18ada6b9e551c64a80f273146667c6a
 SHA512 (timesync-1.7.6.tar.gz) = 20801e5bfa7ee97863d128a26f8a39e38cf8c5ce8140f73cecc5cce62e2ed71700c5d4c2c68d7cc366df9cddfc00a6d5311957fb42a1ef8fbaa75ca28e394d3c
 SHA512 (tlog-1.2.16.tar.gz) = 2c6ae40bfc90f839e7baa507687d04f3a83a2bcee01fe0de02f71820f8617f3e2bcb1257675bcf3aa3795f4fcc1b9efe74aa79d548502a79188be7659528d6bd