diff --git a/.gitignore b/.gitignore
index aa4e327..48b2ab6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
 SOURCES/ansible-sshd-e1de59b3c54e9d48a010eeca73755df339c7e628.tar.gz
 SOURCES/auto-maintenance-e5ed203b2d7224c0bf0c3fd55452456c8f468cad.tar.gz
-SOURCES/certificate-daecdc51cedaf67bf821f1f9f8f6c3cc0ca0d03f.tar.gz
+SOURCES/certificate-50041ce55348fcce34aba4cbe3ea160c5d890ab3.tar.gz
 SOURCES/crypto_policies-76b2d5b0460dba22c5d290c1af96e4fdb3434cb9.tar.gz
 SOURCES/ha_cluster-779bb78559de58bb5a1f25a4b92039c373ef59a4.tar.gz
 SOURCES/kdump-77596fdd976c6160d6152c200a5432c609725a14.tar.gz
 SOURCES/kernel_settings-e5e5abb35fb695e22ccffa855c98ab882650480e.tar.gz
-SOURCES/logging-193e9034f9f74bbd8a0e9cd5b30e782a7e77dc6a.tar.gz
+SOURCES/logging-4b07edf4e84882c9d0fb979092ba5953aac0b4d5.tar.gz
 SOURCES/metrics-e81b2650108727f38b1c856699aad26af0f44a46.tar.gz
 SOURCES/nbde_client-3af7452e4861ee2363b29b23bf78bf11e06be142.tar.gz
 SOURCES/nbde_server-1.0.1.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index 2703529..dedf84c 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -1,11 +1,11 @@
 77e952b62e634c69e36115845b4f24ee3bfe76b7 SOURCES/ansible-sshd-e1de59b3c54e9d48a010eeca73755df339c7e628.tar.gz
 c354a1d24b522a356ef487cf8a3f357ab6213b41 SOURCES/auto-maintenance-e5ed203b2d7224c0bf0c3fd55452456c8f468cad.tar.gz
-7ce3047f661184ba1df8f61b434998ea707b2237 SOURCES/certificate-daecdc51cedaf67bf821f1f9f8f6c3cc0ca0d03f.tar.gz
+20590d1e4ed8df7578926b7aab79e8fa1344be73 SOURCES/certificate-50041ce55348fcce34aba4cbe3ea160c5d890ab3.tar.gz
 513057251590e81b629a69a4ed704b0976b1bc44 SOURCES/crypto_policies-76b2d5b0460dba22c5d290c1af96e4fdb3434cb9.tar.gz
 838ed06d8d092271fff04bd5e7c16db4661e8567 SOURCES/ha_cluster-779bb78559de58bb5a1f25a4b92039c373ef59a4.tar.gz
 fa3d5daf6cf1ceeaa87f58c16e11153cf250e2fa SOURCES/kdump-77596fdd976c6160d6152c200a5432c609725a14.tar.gz
 c81700b81d7acf48b9eadb1ed7a9bf04b994cdb1 SOURCES/kernel_settings-e5e5abb35fb695e22ccffa855c98ab882650480e.tar.gz
-0b1f9c82ca9272d8a82acd3c322635a26bd931b0 SOURCES/logging-193e9034f9f74bbd8a0e9cd5b30e782a7e77dc6a.tar.gz
+3c94b12780f01bbdb8b77fc3515ccef1200ec1f6 SOURCES/logging-4b07edf4e84882c9d0fb979092ba5953aac0b4d5.tar.gz
 821d8ebef2d30a41f0fa65bdc5e550f09b375370 SOURCES/metrics-e81b2650108727f38b1c856699aad26af0f44a46.tar.gz
 a59b3d28bf5da0abbb3e2e188b0b65b2a78cd500 SOURCES/nbde_client-3af7452e4861ee2363b29b23bf78bf11e06be142.tar.gz
 c55d45d134042b00ece17f2a21bb945c571310b3 SOURCES/nbde_server-1.0.1.tar.gz
diff --git a/SOURCES/collection_readme.sh b/SOURCES/collection_readme.sh
index 632d386..a229311 100755
--- a/SOURCES/collection_readme.sh
+++ b/SOURCES/collection_readme.sh
@@ -5,7 +5,7 @@ set -euxo pipefail
 readme_md=${1:-"lsr_role2collection/collection_readme.md"}
 
 sed -i -e '/## Currently supported distributions/{:1;/## Dependencies/!{N;b 1};s|.*|## Dependencies|}' \
-    -e 's/\(Linux System Roles is a collection of roles for managing Linux system components.\)/\1\n\nThis collection is available as a Technology Preview./' \
+    -e 's/\(Linux System Roles is a set of roles for managing Linux system components.\)/\1\n\nThis collection is available as a Technology Preview./' \
     -e 's/Linux/RHEL/g' \
     -e 's/Ansible Galaxy/Automation Hub/g' \
     -e 's/fedora\(.\)linux_system_roles/redhat\1rhel_system_roles/g' \
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 9e6cda6..f0b2a24 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -12,7 +12,7 @@ Name: linux-system-roles
 Url: https://github.com/linux-system-roles/
 Summary: Set of interfaces for unified system management
 Version: 1.0.0
-Release: 29%{?dist}
+Release: 31%{?dist}
 
 #Group: Development/Libraries
 License: GPLv3+ and MIT and BSD
@@ -135,7 +135,7 @@ BuildRequires: ansible >= 2.9.10
 %global rolename9 kernel_settings
 #%%deftag 9 1.0.1
 
-%defcommit 10 193e9034f9f74bbd8a0e9cd5b30e782a7e77dc6a
+%defcommit 10 4b07edf4e84882c9d0fb979092ba5953aac0b4d5
 %global rolename10 logging
 #%%deftag 10 0.2.0
 
@@ -147,7 +147,7 @@ BuildRequires: ansible >= 2.9.10
 %global rolename12 nbde_client
 #%%deftag 12 1.0.1
 
-%defcommit 13 daecdc51cedaf67bf821f1f9f8f6c3cc0ca0d03f
+%defcommit 13 50041ce55348fcce34aba4cbe3ea160c5d890ab3
 %global rolename13 certificate
 #%%deftag 13 1.0.1
 
@@ -345,9 +345,10 @@ mkdir .collections
 %if 0%{?rhel}
 # Convert the upstream collection readme to the downstream one
 %{SOURCE998} lsr_role2collection/collection_readme.md
+%endif
 ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" > galaxy.yml.tmp
 mv galaxy.yml.tmp galaxy.yml
-%endif
+
 for role in %{rolename1} %{rolename2} %{rolename3} \
     %{rolename4} %{rolename5} %{rolename6} \
     %{rolename7} %{rolename8} %{rolename9} \
@@ -666,6 +667,7 @@ cd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
 %doc %{installbase}/%{roleinstprefix}certificate/README.md
 %doc %{installbase}/%{roleinstprefix}crypto_policies/README.md
 %doc %{installbase}/%{roleinstprefix}sshd/README.md
+%doc %{installbase}/%{roleinstprefix}ssh/README.md
 %doc %{installbase}/%{roleinstprefix}kdump/README.html
 %doc %{installbase}/%{roleinstprefix}postfix/README.html
 %doc %{installbase}/%{roleinstprefix}selinux/README.html
@@ -708,6 +710,18 @@ cd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
 %{ansible_collection_files}
 
 %changelog
+* Mon Feb 22 2021 Pavel Cahyna <pcahyna@redhat.com> - 1.0.0-31
+- Rebase certificate role to pick up a test fix, Resolves rhbz#1931568
+- Rebase logging role to fix default private key path,
+  upstream PR #218
+
+* Mon Feb 22 2021 Pavel Cahyna <pcahyna@redhat.com> - 1.0.0-30
+- Correct merge botch in previous (ssh/README.md is a doc file)
+- Update galaxy.yml even on Fedora, auto-maintenance may not have
+  a consistent version number
+- Update collection doc transformation to match a modified text
+  and include the Tech Preview note again
+
 * Thu Feb 18 2021 Pavel Cahyna <pcahyna@redhat.com> - 1.0.0-29
 - Change internal role prefix to more descriptive private_${role}_subrole_
 - Sync spec improvements from Fedora and introduce helper macros