diff --git a/SOURCES/shim.rpmmacros b/SOURCES/shim.rpmmacros
index 4642e75..5f23bce 100644
--- a/SOURCES/shim.rpmmacros
+++ b/SOURCES/shim.rpmmacros
@@ -3,6 +3,8 @@
 %global vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
 %global vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
 
+%global efi_has_alt_arch 0
+
 %global bootcsvaa64 %{expand:%{SOURCE10}}
 %global bootcsvx64 %{expand:%{SOURCE12}}
 #%%global bootcsvarm %%{expand:%%{SOURCE13}}
@@ -19,8 +21,8 @@
 %global mmefix64 %{expand:%{SOURCE42}}
 #%%global mmefiarm %%{expand:%%{SOURCE43}
 
-%global shimveraa64 15-6.el9
-%global shimverx64 15.6-1.el9.inferit
+%global shimveraa64 15-6.el8
+%global shimverx64 15.6-1.el8.inferit
 #%%global shimverarm 15-1.el8
 
 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
diff --git a/SPECS/shim.spec b/SPECS/shim.spec
index 2505f04..9f94092 100644
--- a/SPECS/shim.spec
+++ b/SPECS/shim.spec
@@ -66,7 +66,6 @@ rm -rf shim-%{version}
 mkdir shim-%{version}
 
 %build
-export PS4='${LINENO}: '
 
 cd shim-%{version}
 %if %{efi_has_alt_arch}