diff --git a/Makefile b/Makefile
index bce7fde..08282c7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ WIEN2K_SOURCE ?= WIEN2k_23.2.tar
 
 wien2k:
 	cp $(WIEN2K_SOURCE) stack/wien2k
-	@source_file=`basename "$$WIEN2K_SOURCE"` ;\
-	docker build -t wien2k stack/wien2k --build-arg WIEN2K_SOURCE=$$source_file ;\
+	@source_file=`basename ${WIEN2K_SOURCE}` &&\
+	docker build -t wien2k stack/wien2k --build-arg WIEN2K_SOURCE=$$source_file &&\
 	rm stack/wien2k/$$source_file
 
 aiida: wien2k
diff --git a/stack/wien2k/siteconfig_lapw_inputs b/stack/wien2k/siteconfig_lapw_inputs
index 11b566a..46a5e38 100644
--- a/stack/wien2k/siteconfig_lapw_inputs
+++ b/stack/wien2k/siteconfig_lapw_inputs
@@ -15,7 +15,7 @@ lib
 fftw3
 Y
 R
-/usr/lib/aarch64-linux-gnu/openblas-pthread/libopenblas.so.0 -lpthread
+/usr/lib/`$uname -m`-linux-gnu/openblas-pthread/libopenblas.so.0 -lpthread
 S
 
 y