diff --git a/.gitignore b/.gitignore
index cb8bc18..ce03a8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ SOURCES/crypto_policies-76b2d5b0460dba22c5d290c1af96e4fdb3434cb9.tar.gz
 SOURCES/kdump-77596fdd976c6160d6152c200a5432c609725a14.tar.gz
 SOURCES/kernel_settings-1.0.1.tar.gz
 SOURCES/logging-fe3f658e72b2883d2a1460d453105c7a53dd70e8.tar.gz
-SOURCES/metrics-7f94b49688902eb507e0ebeda1fbf08621bc3c6b.tar.gz
+SOURCES/metrics-e81b2650108727f38b1c856699aad26af0f44a46.tar.gz
 SOURCES/nbde_client-1.0.1.tar.gz
 SOURCES/nbde_server-1.0.1.tar.gz
 SOURCES/network-675c7e8073f33ead5143cd5fc11e332f18524317.tar.gz
diff --git a/.rhel-system-roles.metadata b/.rhel-system-roles.metadata
index 3bc1b4b..47bb0d8 100644
--- a/.rhel-system-roles.metadata
+++ b/.rhel-system-roles.metadata
@@ -5,7 +5,7 @@ dbf1f7ca7cb0bb6ba7cb7f6f85489591e481337c SOURCES/auto-maintenance-627b7a83a2c5b2
 fa3d5daf6cf1ceeaa87f58c16e11153cf250e2fa SOURCES/kdump-77596fdd976c6160d6152c200a5432c609725a14.tar.gz
 61be37db19fe593f418e5b69798152f4c5e84cc7 SOURCES/kernel_settings-1.0.1.tar.gz
 9f365ee569d0d6e542983842ffd7c81c82e2c3ca SOURCES/logging-fe3f658e72b2883d2a1460d453105c7a53dd70e8.tar.gz
-3c25f49356e9325ba694d14ece036c8ea3aa16f6 SOURCES/metrics-7f94b49688902eb507e0ebeda1fbf08621bc3c6b.tar.gz
+821d8ebef2d30a41f0fa65bdc5e550f09b375370 SOURCES/metrics-e81b2650108727f38b1c856699aad26af0f44a46.tar.gz
 2acad85c458a08a36ca2f2e6b6c12b9b63c42dae SOURCES/nbde_client-1.0.1.tar.gz
 c55d45d134042b00ece17f2a21bb945c571310b3 SOURCES/nbde_server-1.0.1.tar.gz
 7b3fe217917edd822513e5894f4467885334c8a5 SOURCES/network-675c7e8073f33ead5143cd5fc11e332f18524317.tar.gz
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index f5791f2..5fc705e 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: 25%{?dist}
+Release: 26%{?dist}
 
 #Group: Development/Libraries
 License: GPLv3+ and MIT and BSD
@@ -103,7 +103,7 @@ Requires: ansible >= 2.9.10
 %global rolename6 storage
 %deftag 6 1.2.2
 
-%defcommit 7 7f94b49688902eb507e0ebeda1fbf08621bc3c6b
+%defcommit 7 e81b2650108727f38b1c856699aad26af0f44a46
 %global rolename7 metrics
 #%%deftag 7 0.1.0
 
@@ -620,6 +620,9 @@ cd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
 %{ansible_collection_files}
 
 %changelog
+* Wed Feb  3 2021 Pavel Cahyna <pcahyna@redhat.com> - 1.0.0-26
+- Rebase the metrics role, Resolves rhbz#1895188, rhbz#1893908
+
 * Tue Jan 26 2021 Pavel Cahyna <pcahyna@redhat.com> - 1.0.0-25
 - Apply storage PR #153 to fix a problem with partition name on NVMe devices
   Resolves: rhbz1865990