diff --git a/efi-rpm-macros.spec b/efi-rpm-macros.spec
index c5739ea..8573047 100644
--- a/efi-rpm-macros.spec
+++ b/efi-rpm-macros.spec
@@ -1,7 +1,7 @@
 Summary: Common RPM Macros for building EFI-related packages
 Name: efi-rpm-macros
 Version: 6
-Release: 4%{?dist}.alma.1
+Release: 6%{?dist}.alma.1
 License: GPL-3.0-or-later
 URL: https://github.com/rhboot/%{name}/
 BuildRequires: git sed
@@ -68,9 +68,17 @@ git config --local --add efi.arches "%{x86_64} aarch64 %{arm} %{ix86}"
 %dir /boot/efi/EFI/%{_efi_vendor_}
 
 %changelog
-* Thu Sep 26 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 6-4.alma.1
+* Tue Dec 17 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 6-6.alma.1
 - Add support for versioned x86_64 arches
 
+* Thu Dec 12 2024 Nicolas Frayer <nfrayer@redhat.com> - 6-6
+- Bump release for previous commit
+- Related: #RHELMISC-8249
+
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6-5
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
 * Fri Sep 20 2024 Nicolas Frayer <nfrayer@redhat.com> - 6-4
 - source: Updated the archive to match upstream
 - Resolves: #RHEL-54694
diff --git a/tests/macros.efi-srpm_test.sh b/tests/macros.efi-srpm_test.sh
old mode 100644
new mode 100755
index 7875cea..442e3ff
--- a/tests/macros.efi-srpm_test.sh
+++ b/tests/macros.efi-srpm_test.sh
@@ -3,6 +3,8 @@
 # exit when any command fails
 set -e
 
+os_name=$(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/' -e 's/\"//g')
+
 declare -A archs
 archs[ia64]="efi_alt_arch=none
 	efi_alt_arch_upper=NONE
@@ -10,11 +12,11 @@ archs[ia64]="efi_alt_arch=none
 	efi_arch_upper=IA64
 	efi_has_alt_arch=00
 	efi_has_arch=01"
-archs[x86_64]="efi_alt_arch=ia32
-	efi_alt_arch_upper=IA32
+archs[x86_64]="efi_alt_arch=none
+	efi_alt_arch_upper=NONE
 	efi_arch=x64
 	efi_arch_upper=X64
-	efi_has_alt_arch=01
+	efi_has_alt_arch=00
 	efi_has_arch=01"
 archs["%{ix86}"]="efi_alt_arch=none
 	efi_alt_arch_upper=NONE
@@ -36,10 +38,10 @@ archs["%{arm}"]="efi_alt_arch=none
 	efi_has_arch=01"
 
 common="efi_esp_boot=/boot/efi/EFI/BOOT
-	efi_esp_dir=/boot/efi/EFI/redhat
+	efi_esp_dir=/boot/efi/EFI/$os_name
 	efi_esp_efi=/boot/efi/EFI
 	efi_esp_root=/boot/efi
-	efi_vendor=redhat"
+	efi_vendor=$os_name"
 
 output=$(mktemp)