diff --git a/.gitignore b/.gitignore
index 608c3c4..0fb0a85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/ad_integration-1.0.1.tar.gz
+SOURCES/ad_integration-1.0.2.tar.gz
 SOURCES/ansible-posix-1.5.1.tar.gz
 SOURCES/ansible-sshd-v0.18.1.tar.gz
 SOURCES/auto-maintenance-d6a8e0167e9ed8d089093b7ead1e298241b534e1.tar.gz
@@ -8,7 +8,7 @@ SOURCES/community-general-6.3.0.tar.gz
 SOURCES/containers-podman-1.10.1.tar.gz
 SOURCES/crypto_policies-1.2.7.tar.gz
 SOURCES/firewall-1.4.2.tar.gz
-SOURCES/ha_cluster-1.8.6.tar.gz
+SOURCES/ha_cluster-1.8.7.tar.gz
 SOURCES/journald-1.0.0.tar.gz
 SOURCES/kdump-1.2.6.tar.gz
 SOURCES/kernel_settings-1.1.11.tar.gz
@@ -19,6 +19,7 @@ SOURCES/nbde_server-1.3.3.tar.gz
 SOURCES/network-1.11.1.tar.gz
 SOURCES/podman-1.1.2.tar.gz
 SOURCES/postfix-1.3.3.tar.gz
+SOURCES/rhc-1.1.0.tar.gz
 SOURCES/selinux-1.5.6.tar.gz
 SOURCES/ssh-1.1.12.tar.gz
 SOURCES/storage-1.9.6.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index e529f94..0f8ff7f 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -1,4 +1,4 @@
-4f5c92974541d578dbd1bfa81b3770d9b15c4663 SOURCES/ad_integration-1.0.1.tar.gz
+c531e83edf95f96389a6c1c10ea80ccd2b42cc75 SOURCES/ad_integration-1.0.2.tar.gz
 f36cb7b1662ecda55c27f5bc15e0a22a1f11a361 SOURCES/ansible-posix-1.5.1.tar.gz
 71c988d6ad9b916727cd93b8e2a2154183f5035a SOURCES/ansible-sshd-v0.18.1.tar.gz
 a59d5ba01d5e536e800bc847528f16c16b961375 SOURCES/auto-maintenance-d6a8e0167e9ed8d089093b7ead1e298241b534e1.tar.gz
@@ -8,7 +8,7 @@ b97ec0ef0ff1390c137323192527129159b7c76f SOURCES/community-general-6.3.0.tar.gz
 ccb070885fd455bb6e7f2b8ca050d40d30609fec SOURCES/containers-podman-1.10.1.tar.gz
 47e3a2db8790c98fd5c09ab1887318b6ba56ce49 SOURCES/crypto_policies-1.2.7.tar.gz
 1c414411b4960040eebcef2ddd528eea0b47f05f SOURCES/firewall-1.4.2.tar.gz
-6b4f61983aee333a6f437830a6e86974dac9bfbf SOURCES/ha_cluster-1.8.6.tar.gz
+7cfd7d6fa2164fcb757a316e123cbe048f8f0ac9 SOURCES/ha_cluster-1.8.7.tar.gz
 97edc58624de8ccb3f4b628a48811094a0dc1513 SOURCES/journald-1.0.0.tar.gz
 439ea600c242c914c90933f287f3caf8c7869c12 SOURCES/kdump-1.2.6.tar.gz
 49f4bc8f273339cde0cdecccffa7b902359b2601 SOURCES/kernel_settings-1.1.11.tar.gz
@@ -19,6 +19,7 @@ cf27267d3d54f1537ddda89f6d4db7abbe55b357 SOURCES/nbde_client-1.2.10.tar.gz
 619b8b44b622f373fdc899bb4e12abb6a0839df0 SOURCES/network-1.11.1.tar.gz
 fe48a68775bcb87daf3f62ab58a1998ffaa4e6be SOURCES/podman-1.1.2.tar.gz
 9244301089661fecca31dfee431b32d4876063be SOURCES/postfix-1.3.3.tar.gz
+f710c55d3b70b2c278f55d234bab214c803e4504 SOURCES/rhc-1.1.0.tar.gz
 bac983e0dcc5041a4c7d4d25849ed31aaf462df7 SOURCES/selinux-1.5.6.tar.gz
 1bb35bc413249ce3209e471687afd60e0e25dddb SOURCES/ssh-1.1.12.tar.gz
 0eea1b45136cb807740fa12435b02eccdb35a7ac SOURCES/storage-1.9.6.tar.gz
diff --git a/SOURCES/CHANGELOG.md b/SOURCES/CHANGELOG.md
index eef5f54..fb88c5a 100644
--- a/SOURCES/CHANGELOG.md
+++ b/SOURCES/CHANGELOG.md
@@ -1,6 +1,24 @@
 Changelog
 =========
 
+[1.21.0-0.19] - 2023-02-16
+----------------------------
+
+### New Features
+
+- [rhc - New role for subscription management/registration/insights](https://bugzilla.redhat.com/show_bug.cgi?id=2144877)
+
+### Bug Fixes
+
+- [ha_cluster - Fix stonith watchdog timeout](https://bugzilla.redhat.com/show_bug.cgi?id=2167941)
+
+[1.21.0-0.18] - 2023-02-15
+----------------------------
+
+### New Features
+
+- [rhc - New role for subscription management/registration/insights](https://bugzilla.redhat.com/show_bug.cgi?id=2144877)
+
 [1.21.0-0.17] - 2023-02-09
 ----------------------------
 
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index d51e500..0ee7e7a 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.17%{?dist}
+Release: 0.19%{?dist}
 
 License: GPLv3+ and MIT and BSD and Python
 %global _pkglicensedir %{_licensedir}/%{name}
@@ -162,7 +162,7 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 16 1.1.12
 
 %global rolename17 ha_cluster
-%deftag 17 1.8.6
+%deftag 17 1.8.7
 
 %global rolename18 vpn
 %deftag 18 1.5.3
@@ -177,10 +177,10 @@ Source: %{url}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar
 %deftag 21 1.1.2
 
 %global rolename22 ad_integration
-%deftag 22 1.0.1
+%deftag 22 1.0.2
 
-#%%global rolename23 rhc
-#%%deftag 23 1.0.0
+%global rolename23 rhc
+%deftag 23 1.1.0
 
 %global rolename24 journald
 %deftag 24 1.0.0
@@ -207,7 +207,7 @@ Source19: %{archiveurl19}
 Source20: %{archiveurl20}
 Source21: %{archiveurl21}
 Source22: %{archiveurl22}
-#Source23: %{archiveurl23}
+Source23: %{archiveurl23}
 Source24: %{archiveurl24}
 # END AUTOGENERATED SOURCES
 
@@ -275,7 +275,7 @@ end
 
 %prep
 # BEGIN AUTOGENERATED SETUP
-%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a24 -n %{getarchivedir 0}
+%setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -n %{getarchivedir 0}
 # END AUTOGENERATED SETUP
 
 %if 0%{?rhel}
@@ -371,7 +371,9 @@ done
 #   - library:
 #     - Module seport, sefcontext and selogin for the selinux role rolename2
 #     - Module ini_file for role tlog
-module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog" )
+#     - rhc modules
+module_map=( ["seport.py"]="selinux" ["sefcontext.py"]="selinux" ["selogin.py"]="selinux" ["ini_file.py"]="tlog"
+  ["redhat_subscription.py"]="rhc" ["rhsm_release.py"]="rhc" ["rhsm_repository.py"]="rhc" )
 for module in "${!module_map[@]}"; do
   role="${module_map[${module}]}"
   if [ ! -d $role/library ]; then
@@ -746,6 +748,15 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
+* Thu Feb 16 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.19
+- Resolves:rhbz#2144877 : rhc - new role for subscription management/registration/insights
+- vendor in modules required by rhc role
+- Resolves:rhbz#2167941 : ha_cluster - Fix stonith watchdog timeout
+
+* Wed Feb 15 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.18
+- Resolves:rhbz#2144877 : rhc - new role for subscription management/registration/insights
+- ad_integration - fix issue with using the network role to configure DNS
+
 * Thu Feb 09 2023 Rich Megginson <rmeggins@redhat.com> - 1.21.0-0.17
 - Resolves:rhbz#2164879 : selinux - managing modules is not idempotent
 - Fix nbde_server test issue