diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-almalinux-default-prefs.js.rhel6
similarity index 96%
rename from SOURCES/thunderbird-redhat-default-prefs.js.rhel6
rename to SOURCES/thunderbird-almalinux-default-prefs.js.rhel6
index 26e8d17..999de89 100644
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
+++ b/SOURCES/thunderbird-almalinux-default-prefs.js.rhel6
@@ -2,7 +2,7 @@ pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
 # Allow users to set custom colors
 # pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendor", "AlmaLinux");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-almalinux-default-prefs.js.rhel7
similarity index 96%
rename from SOURCES/thunderbird-redhat-default-prefs.js.rhel7
rename to SOURCES/thunderbird-almalinux-default-prefs.js.rhel7
index 26e8d17..999de89 100644
--- a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
+++ b/SOURCES/thunderbird-almalinux-default-prefs.js.rhel7
@@ -2,7 +2,7 @@ pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
 # Allow users to set custom colors
 # pref("browser.display.use_system_colors",   true);
-pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendor", "AlmaLinux");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index 2e3bdd0..de0d174 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -25,6 +25,8 @@ end}
 
 %global rhel_minor_version %{lua:print(dist_to_rhel_minor(rpm.expand("%dist")))}
 
+%global dist %{?dist}.alma
+
 %global system_nss        1
 %global bundle_nss        0
 
@@ -234,8 +236,8 @@ Source301:      yasm-1.2.0-3.el5.src.rpm
 Source303:      libffi-3.0.13-18.el7_3.src.rpm
 Source304:      nodejs-10.21.0-5.fc32.src.rpm
 Source305:      openssl-1.0.2k-19.6.bundle.el7_7.src.rpm
-Source601:      thunderbird-redhat-default-prefs.js.rhel6
-Source701:      thunderbird-redhat-default-prefs.js.rhel7
+Source601:      thunderbird-almalinux-default-prefs.js.rhel6
+Source701:      thunderbird-almalinux-default-prefs.js.rhel7
 
 ## Firefox patches
 
@@ -292,13 +294,6 @@ Patch514:        mozilla-s390x-skia-gradient.patch
 Patch515:        mozilla-bmo1626236.patch
 Patch516:        D87019-thin-vec-big-endian.diff
 
-
-# CentOS patches
-%if 0%{?centos}
-Patch10000:      Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
-Patch10001:      Bug-1526653---fix_user_vfp_armv7.patch
-%endif
-
 # RHEL6 patches
 Patch600:        rhel6-dbusver.patch
 Patch601:        rhel6-kernel.patch
@@ -630,12 +625,6 @@ sed -ie 's|/usr/include|/app/include|' %_sourcedir/firefox-pipewire-0-3.patch
 %patch608 -p1 -b .rhel6-clock_gettime
 %endif
 
-# CentOS patches
-%if 0%{?centos}
-%patch10000 -p1 -b .mozilla-1238661
-%patch10001 -p1 -b .mozilla-1526653
-%endif
-
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
 function add_to_mozconfig() {