diff --git a/.gitignore b/.gitignore
index 8ffa0ac..6cc3473 100644
--- a/.gitignore
+++ b/.gitignore
@@ -355,3 +355,5 @@ SOURCES/vpn-1.5.3.tar.gz
 /nbde_server-1.4.3.tar.gz
 /cockpit-1.5.4.tar.gz
 /ad_integration-1.4.2.tar.gz
+/ansible-sshd-v0.23.2.tar.gz
+/podman-1.4.7.tar.gz
diff --git a/rhel-system-roles.spec b/rhel-system-roles.spec
index e1040fc..82243dd 100644
--- a/rhel-system-roles.spec
+++ b/rhel-system-roles.spec
@@ -19,7 +19,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
 Version: 1.23.0
-Release: 2.17%{?dist}
+Release: 2.18%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -130,7 +130,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %global forgeorg15 https://github.com/willshersystems
 %global repo15 ansible-sshd
 %global rolename15 sshd
-%deftag 15 v0.23.1
+%deftag 15 v0.23.2
 
 %global rolename16 ssh
 %deftag 16 1.3.2
@@ -148,7 +148,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 20 1.5.4
 
 %global rolename21 podman
-%deftag 21 1.4.6
+%deftag 21 1.4.7
 
 %global rolename22 ad_integration
 %deftag 22 1.4.2
@@ -672,6 +672,12 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Tue Feb 20 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.18
+- Resolves: RHEL-22229 : podman - user linger needed before secrets
+  fixed issue with ANSIBLE_GATHERING=explicit
+- Resolves: RHEL-5985 ansible-sshd - Manage SSH certificates
+  fixed issue with RHEL7 tests
+
 * Thu Feb 15 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.17
 - Resolves: RHEL-25509 : nbde_server - fix: Allow tangd socket override directory to be managed outside of the role
 - Resolves: RHEL-21491 : network - Add blackhole type route to rhel-system-roles.network
diff --git a/sources b/sources
index 78bd657..957ddda 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
 SHA512 (ad_integration-1.4.2.tar.gz) = 1772eb6a61a6246f69681c8539178b1aade85ca1bdb8dcb3d6ceb10de758c128e31a62f7e20948814c16928b00df9de412c56f487ec4929c0f9c831afae4cc27
 SHA512 (ansible-posix-1.5.4.tar.gz) = 63321c2b439bb2c707c5bea2fba61eaefecb0ce1c832c4cfc8ee8bb89448c8af10e447bf580e8ae6d325c0b5891b609683ff2ba46b78040e2c4d3d8b6bdcd724
-SHA512 (ansible-sshd-v0.23.1.tar.gz) = 6edadbf23ebce8ee0df48c364de2d70d6b876149d9debdbd884495d4cca07c5586a5a0c6ba93f47b947e900d38fb6ac250b94bf7a08093f751e6122e420d0495
+SHA512 (ansible-sshd-v0.23.2.tar.gz) = 49b5919fe50486574889b300b30804055a3be91969e1e7065ca97fbeac8ed0f5dd9a2747d194e5aa6a8e4c01f9ae28a73f6d68dab48dae6eccb78f4ebf71b056
 SHA512 (auto-maintenance-73571b5a12ba0b8c094fef5d1eb298fed36be984.tar.gz) = 175e980ec786aebc475614c37d754660447f82e6d7dee5bea7410b752a1ad6d5ae3e31ac5883b11dbb8c17c7cfad63354e7fd72665e19ff27707bb01242ee39c
 SHA512 (bootloader-1.0.1.tar.gz) = eab0af5281717608ac85fb3d1475264ddd4299139e8ea532be5c0cb1752daf45c15e5a67f9d53ec12ff9b6cb7b3492e73ba935ace73c059c1e086371e9586362
 SHA512 (certificate-1.3.3.tar.gz) = f459cf3f388b7e8d686ad1502c976900b3fe95e8a63f16c1ec2b739fad86de1adf4cabe41e1b8d0173f408db6465aa08ab5bd4d13f00e6e4c57520adc5b44c3b
@@ -20,7 +20,7 @@ SHA512 (metrics-1.10.1.tar.gz) = 648c1f7ff8b35048c7ef272df5db8240f0b62fb4de998fa
 SHA512 (nbde_client-1.2.17.tar.gz) = f11189c4cf42478d166c8528b75ea02d32bb412e16fa6c47e205905b731e02c1791b6e564d89d8568448d2d3f8995b263116199801f1cc69593aafc0aa503818
 SHA512 (nbde_server-1.4.3.tar.gz) = ed309ae3890ac9e9c05f70206044ed1e2d0876733a2b2e8f3064411870dd17e09d0072e843c1e4394e3ac7a1891f40ef69604836cc4577dcf0b2ef024ba256df
 SHA512 (network-1.15.1.tar.gz) = b1b504a66ab2975fb01ce7129343bab18013c91d3c7f4c633b696488364f48e5e59980c1101fa506aa789bc784d7f6aff7d1536875aa43016bcb40986a175e5c
-SHA512 (podman-1.4.6.tar.gz) = 0ec5905816bc6b8a0c60364e431e5c22a22a7469f59e47469d939d65016fd87a76981eb0435e692964e7f9a3b5c4b6b1bf2b9cc1ac91255ba193a7deb9c75679
+SHA512 (podman-1.4.7.tar.gz) = ff25604e0d38acf648863de3ca8681466adab37aabe9bea3ff295afb94a2c682bade9563b274b8630cb46670f0d82b6431e366551594bfe47145da024fc3d726
 SHA512 (postfix-1.4.3.tar.gz) = 8948272377051ff77139cfe2e4ec58e94d931fc9107f7fda3755db7371d13d73d6c626a8291dcf3d0c2af07655d01a1c50e8645b1f6d5bf19db90dc920568ed4
 SHA512 (postgresql-1.3.4.tar.gz) = ee260af173ec731b9b01613681cb7441662aa096d65e6b3b0d958f0e29dcf6c39982ea1769ba35d41478d97e216ed58fa877826620832c1ddf2e20eb4e22d911
 SHA512 (rhc-1.5.1.tar.gz) = 83d5d7dca05ec389a9f590c1452fe7d15c3e755e8189e646225ddc6387e91204d50d3673bcd8cabae703cc8d785bda5e56fd3465c7779afe1eef2bcaabeb1563