diff --git a/.gitignore b/.gitignore
index 601f1a9..77aa995 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,11 +4,11 @@ SOURCES/ansible-sshd-v0.18.0.tar.gz
 SOURCES/auto-maintenance-e3ac549bee05349d7ae033971448f861415ad608.tar.gz
 SOURCES/certificate-1.1.6.tar.gz
 SOURCES/cockpit-1.4.2.tar.gz
-SOURCES/community-general-6.1.0.tar.gz
+SOURCES/community-general-6.2.0.tar.gz
 SOURCES/containers-podman-1.10.1.tar.gz
 SOURCES/crypto_policies-1.2.6.tar.gz
 SOURCES/firewall-1.4.1.tar.gz
-SOURCES/ha_cluster-1.8.3.tar.gz
+SOURCES/ha_cluster-1.8.5.tar.gz
 SOURCES/kdump-1.2.5.tar.gz
 SOURCES/kernel_settings-1.1.10.tar.gz
 SOURCES/logging-1.11.4.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index 0524be4..960e793 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -4,11 +4,11 @@ e699d31bfa020050818f133b7c65a49d2e459178 SOURCES/ansible-posix-1.4.0.tar.gz
 d7aa4c69b339bf109227ea9c289b242a808ca0f5 SOURCES/auto-maintenance-e3ac549bee05349d7ae033971448f861415ad608.tar.gz
 25e2045c8fc9d6455d7c5b0c7d32d4976ebc5178 SOURCES/certificate-1.1.6.tar.gz
 3a9049ce1802f288df9e3550e2413faa509583ae SOURCES/cockpit-1.4.2.tar.gz
-6e23cc0cc60a1b1f4b6edff5f64b651d58e117d3 SOURCES/community-general-6.1.0.tar.gz
+3e4ef8fa268793a8e8ef48291571ff8e5d0b8f95 SOURCES/community-general-6.2.0.tar.gz
 ccb070885fd455bb6e7f2b8ca050d40d30609fec SOURCES/containers-podman-1.10.1.tar.gz
 56bc0763e0b549c3499a80e95d0953ee6769136a SOURCES/crypto_policies-1.2.6.tar.gz
 c7dedc3157260d205429bed8d8956f2d0590906d SOURCES/firewall-1.4.1.tar.gz
-ddfe8a8c11a9de56af6abe3fa9240977f22a9bc9 SOURCES/ha_cluster-1.8.3.tar.gz
+1741e0a109ad63297f4ce1bd6425bd904912f11f SOURCES/ha_cluster-1.8.5.tar.gz
 6ae0614d51db00957943fad6967674c0de88862c SOURCES/kdump-1.2.5.tar.gz
 17f28f701d7842499b232a7b28daae5f51ea631b SOURCES/kernel_settings-1.1.10.tar.gz
 dfbe3c7748362f08243eb6fe7d7f02faf6f89531 SOURCES/logging-1.11.4.tar.gz
diff --git a/SOURCES/CHANGELOG.md b/SOURCES/CHANGELOG.md
index 6527d51..bbd5109 100644
--- a/SOURCES/CHANGELOG.md
+++ b/SOURCES/CHANGELOG.md
@@ -1,6 +1,18 @@
 Changelog
 =========
 
+[1.21.0-0.14] - 2023-01-13
+----------------------------
+
+### New Features
+
+- [ha_cluster - Allow quorum device configuration](https://bugzilla.redhat.com/show_bug.cgi?id=2143814)
+
+### Bug Fixes
+
+- [ha_cluster - Allow enabled SBD on disabled cluster](https://bugzilla.redhat.com/show_bug.cgi?id=2153081)
+- [ha_cluster - use no_log in tasks looping over pot. secret parameters](https://bugzilla.redhat.com/show_bug.cgi?id=2127497)
+
 [1.21.0-0.13] - 2022-12-16
 ----------------------------
 
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 842d285..61ebaa0 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -30,7 +30,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles
 Summary: Set of interfaces for unified system management
 Version: 1.21.0
-Release: 0.13%{?dist}
+Release: 0.14%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -127,7 +127,7 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 %global rolename5 network
 %deftag 5 1.11.0
 
-#%%defcommit 6 50d2b8ccc98a8f4cb9d1d550d21adc227181e9fa
+#%%defcommit 6 d7c5eac5d289f141e55ae330d4584eb26fabde39
 %global rolename6 storage
 %deftag 6 1.9.4
 
@@ -175,7 +175,7 @@ Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 
 #%%defcommit 17 f901239cb91878719c9e7461760ef8d4789d626d
 %global rolename17 ha_cluster
-%deftag 17 1.8.3
+%deftag 17 1.8.5
 
 #%%defcommit 18 d21c896c0d5de83ec3a92d6adf8d14f0324803ca
 %global rolename18 vpn
@@ -224,11 +224,11 @@ Source22: %{archiveurl22}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/SourceURL/#_do_not_conditionalize_sources
 # Collections to vendor on RHEL only, Fedora has these available from RPMs
 Source801: https://galaxy.ansible.com/download/ansible-posix-1.4.0.tar.gz
-Source901: https://galaxy.ansible.com/download/community-general-6.1.0.tar.gz
+Source901: https://galaxy.ansible.com/download/community-general-6.2.0.tar.gz
 Source902: https://galaxy.ansible.com/download/containers-podman-1.10.1.tar.gz
 %if 0%{?rhel}
 Provides: bundled(ansible-collection(ansible.posix)) = 1.4.0
-Provides: bundled(ansible-collection(community.general)) = 6.1.0
+Provides: bundled(ansible-collection(community.general)) = 6.2.0
 Provides: bundled(ansible-collection(containers.podman)) = 1.10.1
 %endif
 
@@ -453,11 +453,13 @@ rm -rf .external
 # This is for the "roles calling other roles" case
 # for podman, change the FQCN - using a non-FQCN module name doesn't seem to work,
 # even for the legacy role format
+# replace community.general for rhc
 for rolename in %{rolenames}; do
     find $rolename -type f -exec \
          sed -e "s/linux-system-roles[.]${rolename}\\>/%{roleinstprefix}${rolename}/g" \
              -e "s/fedora[.]linux_system_roles[.]/%{collection_namespace}.%{collection_name}./g" \
              -e "s/containers[.]podman[.]/%{collection_namespace}.%{collection_name}./g" \
+             -e "s/community[.]general[.]/%{collection_namespace}.%{collection_name}./g" \
              -i {} \;
 done
 %endif
@@ -768,6 +770,13 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Fri Jan 13 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.14
+- Resolves:rhbz#2143814 : ha_cluster - Allow quorum device configuration
+- Resolves:rhbz#2153081 : ha_cluster - Allow enabled SBD on disabled cluster
+- Resolves:rhbz#2127497 : ha_cluster - use no_log in tasks looping over pot. secret parameters
+- community.general 6.2.0
+- replace community.general with namespace.name for rhc role
+
 * Thu Dec 15 2022 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.13
 - Resolves:rhbz#2151355 : storage - [RHEL8] disks_needed need to be set for the raid test cases
 - Resolves:rhbz#2154143 : storage - [RHEL8] tests_create_thinp_then_remove_scsi_generated.yml failed at "assertion": "(storage_test_expected_size|int - storage_test_actual_size.bytes)|abs / storage_test_expected_size|int < 0.01"