-docker run --rm -it $usb_args -v "$dir":/qmk_firmware qmkfm/qmk_firmware \
- /bin/bash -c "make git-submodule; make \"$keyboard${keymap:+:$keymap}${target:+:$target}\""
+docker run --rm -it $usb_args -w /qmk_firmware/ -v "$dir":/qmk_firmware qmkfm/base_container \
+ make "$keyboard${keymap:+:$keymap}${target:+:$target}"