diff --git a/.gitignore b/.gitignore
index 5a4425f..e814518 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,13 @@
-SOURCES/certificate-1de54c5.tar.gz
+SOURCES/certificate-774914a.tar.gz
 SOURCES/kdump-0c2bb28.tar.gz
-SOURCES/kernel_settings-f760285.tar.gz
+SOURCES/kernel_settings-b8bc86b.tar.gz
 SOURCES/logging-95e2574.tar.gz
 SOURCES/metrics-e1ca747.tar.gz
-SOURCES/nbde_client-da2db56.tar.gz
-SOURCES/nbde_server-8110159.tar.gz
+SOURCES/nbde_client-4020978.tar.gz
+SOURCES/nbde_server-4b6cfca.tar.gz
 SOURCES/network-e0c7d55.tar.gz
 SOURCES/postfix-0.1.tar.gz
 SOURCES/selinux-6cd1ec8.tar.gz
-SOURCES/storage-36c4803.tar.gz
+SOURCES/storage-878de13.tar.gz
 SOURCES/timesync-924650d.tar.gz
-SOURCES/tlog-2b3ffab.tar.gz
+SOURCES/tlog-cfa70b6.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index f070da0..fc1d52c 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -1,13 +1,13 @@
-7d875380cd19a143b5e61ae6ca8042dc69fee88b SOURCES/certificate-1de54c5.tar.gz
+4eb09f50f9e08ee78906f4abb8f11ee149cf1211 SOURCES/certificate-774914a.tar.gz
 36b200d1c6a8d1cb1ea87e3e9aa8c4f6bbd8155d SOURCES/kdump-0c2bb28.tar.gz
-da22df6ef24c73b447638b6d26ff09bab2ead1c8 SOURCES/kernel_settings-f760285.tar.gz
+27144f3b423aa51b7a6ffeaee4c2d23c99fda614 SOURCES/kernel_settings-b8bc86b.tar.gz
 ec33cb64813a896c5dc3673ee22e0b343b60cfbf SOURCES/logging-95e2574.tar.gz
 20e613542ae7f17b050ffe6b94e46e76295ed891 SOURCES/metrics-e1ca747.tar.gz
-cbc09ce6f6460e828b46a7cfdc2fc32cb5b7b8d7 SOURCES/nbde_client-da2db56.tar.gz
-4a6b50b20e61a96e3d6448203a443d1d9b0c7d17 SOURCES/nbde_server-8110159.tar.gz
+dddead857f422156a0623c44be258dfed4cb8711 SOURCES/nbde_client-4020978.tar.gz
+e936390ddc7440e25190d6ff98cf5e5b3bf1fc3b SOURCES/nbde_server-4b6cfca.tar.gz
 5a9597aa5142df3564dd3d85c3bebc1bb62f465d SOURCES/network-e0c7d55.tar.gz
 66c82331f4ac9598c506c3999965b4d07dbfe49d SOURCES/postfix-0.1.tar.gz
 246383bd6823533ed3a51a0501b75e38ba852908 SOURCES/selinux-6cd1ec8.tar.gz
-b1f2825eca9a9e06c48d1ec4841a1bf1e52abf7b SOURCES/storage-36c4803.tar.gz
+a8c3f22a2d9f0ff8a6e63d6ad9b7e138f1086391 SOURCES/storage-878de13.tar.gz
 ffd2a706e4e3007684aa9874c8457ad5c8920050 SOURCES/timesync-924650d.tar.gz
-43783aa7130ae254e8d848ab1295556628d0b1ef SOURCES/tlog-2b3ffab.tar.gz
+66538d3279cb5972f73a70960a4407d2abe56883 SOURCES/tlog-cfa70b6.tar.gz
diff --git a/SOURCES/kdump-meta-el8.diff b/SOURCES/kdump-meta-el8.diff
new file mode 100644
index 0000000..d8f2764
--- /dev/null
+++ b/SOURCES/kdump-meta-el8.diff
@@ -0,0 +1,13 @@
+diff --git a/meta/main.yml b/meta/main.yml
+index 2478fa6..ad8f4c6 100644
+--- a/meta/main.yml
++++ b/meta/main.yml
+@@ -7,6 +7,6 @@ galaxy_info:
+   min_ansible_version: 2.4
+   platforms:
+     - name: Fedora
+-      versions: [ 27, 28 ]
++      versions: [ 31, 32 ]
+     - name: EL
+-      versions: [ 6, 7 ]
++      versions: [ 6, 7, 8 ]
diff --git a/SOURCES/postfix-meta-el8.diff b/SOURCES/postfix-meta-el8.diff
new file mode 100644
index 0000000..e9e7063
--- /dev/null
+++ b/SOURCES/postfix-meta-el8.diff
@@ -0,0 +1,16 @@
+diff --git a/meta/main.yml b/meta/main.yml
+index a0ef6f4..da22270 100644
+--- a/meta/main.yml
++++ b/meta/main.yml
+@@ -7,8 +7,8 @@ galaxy_info:
+   min_ansible_version: 2.2
+   platforms:
+   - name: Fedora
+-    versions: [ 24, 25 ]
++    versions: [ 31, 32 ]
+   - name: EL
+-    versions: [ 6, 7 ]
++    versions: [ 6, 7, 8 ]
+ 
+ 
+ 
\ No newline at end of file
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 52911e1..c539b52 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: 14%{?dist}
+Release: 15%{?dist}
 
 #Group: Development/Libraries
 License: GPLv3+ and MIT and BSD
@@ -46,7 +46,7 @@ License: GPLv3+ and MIT and BSD
 %global rolename5 network
 #%%deftag 5 1.0.0
 
-%defcommit 6 36c4803f636b3d4f5830d650cd0b5584540a33d3
+%defcommit 6 878de13ba508a1a21e54781cb3181bb1596b8c24
 %global rolename6 storage
 #%%deftag 6 1.0.2
 
@@ -54,11 +54,11 @@ License: GPLv3+ and MIT and BSD
 %global rolename7 metrics
 #%%deftag 7 0.1.0
 
-%defcommit 8 2b3ffabedc05e93b6157c186d143644ef61301a9
+%defcommit 8 cfa70b6b5910b3198aba2679f8fc36aad45ca45a
 %global rolename8 tlog
 #%%deftag 8 0.2.0
 
-%defcommit 9 f760285362332e4be7027aae5e0e7265efd428da
+%defcommit 9 b8bc86b70b49bf703205a145b3905a827a41230c
 %global rolename9 kernel_settings
 #%%deftag 9 0.2.0
 
@@ -66,15 +66,15 @@ License: GPLv3+ and MIT and BSD
 %global rolename10 logging
 #%%deftag 10 0.2.0
 
-%defcommit 11 81101597d48f69ecae6a7dfa3f3d0677e95d9df4
+%defcommit 11 4b6cfca4dd24e53a4bc4e07635601d7c104346c1
 %global rolename11 nbde_server
 #%%deftag 11 0.1.0
 
-%defcommit 12 da2db56bed495a68fe96fb3eda0a85e120a4f752
+%defcommit 12 402097869d691409840282f6f5f30eb9b4d272a9
 %global rolename12 nbde_client
 #%%deftag 12 0.1.0
 
-%defcommit 13 1de54c5447fc98dd6e665e233611bf03f3701764
+%defcommit 13 774914a82cfaab457acdd810ea1489d16b0b19dd
 %global rolename13 certificate
 #%%deftag 13 0.1.0
 
@@ -104,9 +104,11 @@ Patch6: rhel-system-roles-%{rolename6}-prefix.diff
 %endif
 
 Patch11: rhel-system-roles-postfix-pr5.diff
+Patch12: postfix-meta-el8.diff
 Patch101: rhel-system-roles-kdump-pr22.diff
 
 Patch102: kdump-tier1-tags.diff
+Patch103: kdump-meta-el8.diff
 
 Patch21: selinux-tier1-tags.diff
 
@@ -148,12 +150,14 @@ of Fedora, Red Hat Enterprise Linux & CentOS.
 cd %{rolename0}-%{id0}
 %patch101 -p1
 %patch102 -p1
+%patch103 -p1
 cd ..
 cd %{rolename1}-%{id1}
 %if "%{roleprefix}" != "linux-system-roles."
 %patch1 -p1
 %endif
 %patch11 -p1
+%patch12 -p1
 cd ..
 cd %{rolename2}-%{id2}
 %if "%{roleprefix}" != "linux-system-roles."
@@ -452,6 +456,18 @@ cp -p $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{roleprefix}certificate/README.m
 %license %{_datadir}/ansible/roles/%{roleprefix}certificate/LICENSE
 
 %changelog
+* Fri Jul 31 2020 Pavel Cahyna <pcahyna@redhat.com> - 1.0-15
+- Rebase storage role to latest upstream, resolves rhbz#1854191, rhbz#1848250,
+  rhbz#1850790 (including test)
+- Rebase nbde_client role to latest upstream, adds test for rhbz#1850790
+- Rebase certificate role to latest upstream, adds test for rhbz#1850790
+- Rebase nbde_server role to latest upstream, resolves rhbz#1850790
+  (including test)
+- Rebase tlog role to latest upstream, resolves rhbz#1855424
+- Rebase kernel_settings role to rev b8bc86b, resolves rhbz#1850790
+- Add EL 8 to supported versions in postfix and kdump role metadata,
+  resolves rhbz#1861661
+
 * Mon Jul 20 2020 Rich Megginson <rmeggins@redhat.com> - 1.0-14
 - Rebase certificate role to latest upstream, resolves rhbz#1858840