diff --git a/mame-module.yml b/mame-module.yml
index 0dd28c5..3c80ece 100644
--- a/mame-module.yml
+++ b/mame-module.yml
@@ -6,12 +6,13 @@ modules:
     build-options:
       no-debuginfo: true
       strip: true
+    env:
+      CC: clang
+      CXX: clang++
+      LD: lld
     build-commands:
       - make
           -j ${FLATPAK_BUILDER_N_JOBS}
-          CC=clang
-          CXX=clang++
-          LD=lld
           CFLAGS+=-Wno-error=restrict
           USE_QTDEBUG=0 
           USE_WAYLAND=1
diff --git a/net.retrodeck.mame.yml b/net.retrodeck.mame.yml
index 8ed8f85..a3451f9 100644
--- a/net.retrodeck.mame.yml
+++ b/net.retrodeck.mame.yml
@@ -44,14 +44,13 @@ modules:
     build-options:
       no-debuginfo: true
       strip: true
-    env:
-      CC: clang
-      CXX: clang++
-      LD: lld
     build-commands:
       - make
           -j echo $(nproc)
           CFLAGS+=-Wno-error=restrict
+          CC=clang
+          CXX=clang++
+          LD=lld
           USE_QTDEBUG=0 
           USE_WAYLAND=1
           USE_SYSTEM_LIB_FLAC=1