diff --git a/.gitignore b/.gitignore
index fc0b7c2..28cb40a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -736,3 +736,7 @@
 /rhc-1.6.0.tar.gz
 /snapshot-1.3.1.tar.gz
 /auto-maintenance-11ad785c9bb72611244e7909450ca4247e12db4d.tar.gz
+/bootloader-1.0.2.tar.gz
+/cockpit-1.5.5.tar.gz
+/postgresql-1.3.5.tar.gz
+/bootloader-1.0.3.tar.gz
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index e5260aa..59c1bf5 100644
--- a/linux-system-roles.spec
+++ b/linux-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.20%{?dist}
+Release: 2.21%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -145,7 +145,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 19 1.7.4
 
 %global rolename20 cockpit
-%deftag 20 1.5.4
+%deftag 20 1.5.5
 
 %global rolename21 podman
 %deftag 21 1.4.7
@@ -160,7 +160,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 24 1.2.3
 
 %global rolename25 postgresql
-%deftag 25 1.3.4
+%deftag 25 1.3.5
 
 %global rolename26 systemd
 %deftag 26 1.1.2
@@ -172,7 +172,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 28 1.1.1
 
 %global rolename29 bootloader
-%deftag 29 1.0.1
+%deftag 29 1.0.3
 
 %global rolename30 snapshot
 %deftag 30 1.3.1
@@ -228,7 +228,12 @@ BuildArch: noarch
 # there is no ansible on i686, so when we get a builder that uses
 # this arch, the build fails with
 # No matching package to install: 'ansible-core >= 2.11.0'
-ExcludeArch: i686
+# unfortunately, this causes the src rpm build tasks to be reported
+# with the arch of the builder :-( which causes problems with internal
+# test infrastructure - while we get those issues sorted out, revert
+# this change - this means that centpkg builds may fail and may have
+# to be retried
+# ExcludeArch: i686
 
 # Requirements for galaxy_transform.py
 BuildRequires: python3
@@ -672,6 +677,13 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Mon Feb 26 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.21
+- Resolves: RHEL-16336 : bootloader - Create bootloader role (MVP)
+  fix issue with path on arches other than x86_64, and EFI systems
+- Resolves: RHEL-3253 : RHEL for Edge support in system roles
+  cockpit - fixed issue with test cleanup
+  postgresql - fixed issue with test cleanup
+
 * Wed Feb 21 2024 Rich Megginson <rmeggins@redhat.com> - 1.23.0-2.20
 - Resolves: RHEL-16964 : rhc - new rhc_insights.display_name parameter
 - Resolves: RHEL-16552 : snapshot - New Role for storage snapshot management (lvm, etc.)
diff --git a/sources b/sources
index b21d0d9..26308bd 100644
--- a/sources
+++ b/sources
@@ -2,9 +2,9 @@ SHA512 (ad_integration-1.4.2.tar.gz) = 1772eb6a61a6246f69681c8539178b1aade85ca1b
 SHA512 (ansible-posix-1.5.4.tar.gz) = 63321c2b439bb2c707c5bea2fba61eaefecb0ce1c832c4cfc8ee8bb89448c8af10e447bf580e8ae6d325c0b5891b609683ff2ba46b78040e2c4d3d8b6bdcd724
 SHA512 (ansible-sshd-v0.23.2.tar.gz) = 49b5919fe50486574889b300b30804055a3be91969e1e7065ca97fbeac8ed0f5dd9a2747d194e5aa6a8e4c01f9ae28a73f6d68dab48dae6eccb78f4ebf71b056
 SHA512 (auto-maintenance-11ad785c9bb72611244e7909450ca4247e12db4d.tar.gz) = a8347b15e420ba77e1086193154dec9e0305474050493cb0be156a7afeb00d0bc02617cadcc77ac48d9cd9d749e1bd4f788d4def01b51a3356a4bd74c65912ea
-SHA512 (bootloader-1.0.1.tar.gz) = eab0af5281717608ac85fb3d1475264ddd4299139e8ea532be5c0cb1752daf45c15e5a67f9d53ec12ff9b6cb7b3492e73ba935ace73c059c1e086371e9586362
+SHA512 (bootloader-1.0.3.tar.gz) = 5838e37e9e9f55f757d12ba0ae75b4a707b2f0731cd9d866fbde8fad8ae25c5fdb05c83bada0919cb39f7daca9f56fc06740c7da5fdce017da32ae22a0619a10
 SHA512 (certificate-1.3.3.tar.gz) = f459cf3f388b7e8d686ad1502c976900b3fe95e8a63f16c1ec2b739fad86de1adf4cabe41e1b8d0173f408db6465aa08ab5bd4d13f00e6e4c57520adc5b44c3b
-SHA512 (cockpit-1.5.4.tar.gz) = 93e6f0f18a41ce87f986b71c30c8b6e560e5c926972a3c8f831f0393b743c5080cb8b5a2034b4dfabcd481b110b21f72551e6c0baf312f5fb0900e41a6ffefa2
+SHA512 (cockpit-1.5.5.tar.gz) = 728c858de1133dc8dd62337cb58d06794d57a571e41d30c172fe687942cb8be45ae3d15b71816eb5f3d9462f451b94c47c946c7bb5e4f9a541d3b161d4b1c497
 SHA512 (community-general-8.3.0.tar.gz) = 674123b7e72ecfe24d82980dae075123999202e7e5de759506a8f9b5df2b072afefbf199516a64dd217d8e6d45ab2952838cf5ad534df20ee3f58e06c8837736
 SHA512 (containers-podman-1.12.0.tar.gz) = c568b6e5ed36c3f46aba854489317aa992872b32a8b27e06e1561fd0362b455c063e923bddc8201788834043a90c20568ce8f69f7b9e6f7c864864e11f1ea733
 SHA512 (crypto_policies-1.3.2.tar.gz) = 8007402391778b7c8625af8fd6b96d77ec930180746a87c1c2ade0f4f7a17deaac66e28d94f18e25b0fea68274ad88e0f1ce9eec40fd3abc10d8a4891dd04b53
@@ -22,7 +22,7 @@ SHA512 (nbde_server-1.4.3.tar.gz) = ed309ae3890ac9e9c05f70206044ed1e2d0876733a2b
 SHA512 (network-1.15.1.tar.gz) = b1b504a66ab2975fb01ce7129343bab18013c91d3c7f4c633b696488364f48e5e59980c1101fa506aa789bc784d7f6aff7d1536875aa43016bcb40986a175e5c
 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 (postgresql-1.3.5.tar.gz) = f3d2fb191a2b820bb74ec4394d3795e695507b5a20ce8341698a474b7968a31a6f6886abb2575e03b866064ab5c6667f83a8d0cc7ad544da5a2d2f2125be2089
 SHA512 (rhc-1.6.0.tar.gz) = 285cbda3cb6a62bfb093df6300c5607b94d83aa5652b4b63ee3022d369d81745976ba3137a8e08a8eacd4772f28c7276b26bdddd2ce36dc3f268487990b7a597
 SHA512 (selinux-1.7.4.tar.gz) = 6fcbd51ea51c7674363e137a2b194340254663ebb7312b76613d0efa52ead65226211d800be48354d394d4a159fe8172369bba4f5876980999b15c8112016863
 SHA512 (snapshot-1.3.1.tar.gz) = f50f6509669c612d3ce95de32a841ca2a34095478614c27b94dee6bb6ab2da8d28b258383c54398b9404304ccbb63cbe51da5f9b3dc59efe515e013dc6a11317