diff --git a/SOURCES/udisks-2.9.1-btrfs-Always-flush-interface-property-changes.patch b/SOURCES/udisks-2.9.1-btrfs-Always-flush-interface-property-changes.patch
new file mode 100644
index 0000000..4c25dda
--- /dev/null
+++ b/SOURCES/udisks-2.9.1-btrfs-Always-flush-interface-property-changes.patch
@@ -0,0 +1,24 @@
+From de173bbeae5d0d336c233a4e40e1682d1eb6808b Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Fri, 26 Jun 2020 17:56:27 +0200
+Subject: [PATCH] btrfs: Always flush interface property changes
+
+---
+ modules/btrfs/udiskslinuxfilesystembtrfs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/btrfs/udiskslinuxfilesystembtrfs.c b/modules/btrfs/udiskslinuxfilesystembtrfs.c
+index e2aed24c..c7558a6c 100644
+--- a/modules/btrfs/udiskslinuxfilesystembtrfs.c
++++ b/modules/btrfs/udiskslinuxfilesystembtrfs.c
+@@ -270,6 +270,7 @@ udisks_linux_filesystem_btrfs_update (UDisksLinuxFilesystemBTRFS *l_fs_btrfs,
+   udisks_filesystem_btrfs_set_used (fs_btrfs, btrfs_info->used);
+ 
+ out:
++  g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (fs_btrfs));
+   if (btrfs_info)
+     bd_btrfs_filesystem_info_free (btrfs_info);
+   if (error)
+-- 
+2.31.1
+
diff --git a/SPECS/udisks2.spec b/SPECS/udisks2.spec
index bb6d6fd..f8dca03 100644
--- a/SPECS/udisks2.spec
+++ b/SPECS/udisks2.spec
@@ -31,6 +31,11 @@
 %define with_btrfs 0
 %endif
 
+# ... but CentOS Hyperscale SIG restores Btrfs support
+%if 0%{?rhel} > 7 && 0%{?centos_hs}
+%define with_btrfs 1
+%endif
+
 # vdo is not available on Fedora
 %if (0%{?fedora}) || %{with_vdo} == 0
 %define with_vdo 0
@@ -56,7 +61,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     https://github.com/storaged-project/udisks
@@ -77,6 +82,10 @@ Patch20: udisks-2.10.0-tests-drive_ata-apm.patch
 Patch21: udisks-2.10.0-tests-no-dev_disk-by-path.patch
 Patch22: tests-disable-zram.patch
 
+# Hyperscale changes
+## Backports from upstream udisks
+Patch1001: udisks-2.9.1-btrfs-Always-flush-interface-property-changes.patch
+
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
 BuildRequires: libgudev1-devel >= %{systemd_version}
@@ -295,6 +304,10 @@ This package contains module for VDO management.
 %patch22 -p1
 sed -i udisks/udisks2.conf.in -e "s/encryption=luks1/encryption=%{default_luks_encryption}/"
 
+%if 0%{?centos_hs}
+%patch1001 -p1
+%endif
+
 %build
 autoreconf -ivf
 # modules need to be explicitly enabled
@@ -485,6 +498,9 @@ fi
 %endif
 
 %changelog
+* Mon May 17 2021 Neal Gompa <ngompa@centosproject.org> - 2.9.0-8
+- Enable Btrfs for CentOS Hyperscale SIG
+
 * Fri Apr 23 2021 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-7
 - Do not build udisks2-zram (#1923078)
 - Fix Drive.ATA test failures (#1926827)