diff --git a/.gitignore b/.gitignore
index e1d454e..374d520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/certificate-774914a.tar.gz
+SOURCES/certificate-fedef6e.tar.gz
 SOURCES/kdump-0c2bb28.tar.gz
 SOURCES/kernel_settings-b8bc86b.tar.gz
 SOURCES/logging-e629293.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index 2034d2e..3bb8c04 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -1,4 +1,4 @@
-4eb09f50f9e08ee78906f4abb8f11ee149cf1211 SOURCES/certificate-774914a.tar.gz
+5aa98ec9e109c5ebfae327718e5cad1d3c837e4f SOURCES/certificate-fedef6e.tar.gz
 36b200d1c6a8d1cb1ea87e3e9aa8c4f6bbd8155d SOURCES/kdump-0c2bb28.tar.gz
 27144f3b423aa51b7a6ffeaee4c2d23c99fda614 SOURCES/kernel_settings-b8bc86b.tar.gz
 0029b279a1f1a96ca52e130378ad0c0a3a15ea62 SOURCES/logging-e629293.tar.gz
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 85410df..d3e66a4 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -5,7 +5,7 @@ Name: linux-system-roles
 %endif
 Summary: Set of interfaces for unified system management
 Version: 1.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 
 #Group: Development/Libraries
 License: GPLv3+ and MIT and BSD
@@ -74,7 +74,7 @@ License: GPLv3+ and MIT and BSD
 %global rolename12 nbde_client
 #%%deftag 12 0.1.0
 
-%defcommit 13 774914a82cfaab457acdd810ea1489d16b0b19dd
+%defcommit 13 fedef6e7844bb623bb54695a602137e332f5509f
 %global rolename13 certificate
 #%%deftag 13 0.1.0
 
@@ -456,6 +456,9 @@ cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}certificate/README.m
 %license %{_datadir}/ansible/roles/%{roleprefix}certificate/LICENSE
 
 %changelog
+* Fri Aug 21 2020 Pavel Cahyna <pcahyna@redhat.com> - 1.0-17
+- Rebase certificate role to latest upstream, resolves rhbz#1859547
+
 * Mon Aug 10 2020 Pavel Cahyna <pcahyna@redhat.com> - 1.0-16
 - Rebase logging role to latest upstream, resolves rhbz#1854546, rhbz#1861318,
   rhbz#1860896, adds test for rhbz#1850790