diff --git a/Makefile b/Makefile
index b4736702..dd30daff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,8 @@
-.PHONY: git-submodule, qmk-clean, qmk-init-%, qmk-compile-%, qmk-flash-%, qmk-clean-%
+.PHONY: git-submodule, qmk-clean, qmk-init, qmk-compile, qmk-flash
+
+KB := crkbd
+KR := rev1
+KM := via
 
 git-submodule:
 	git submodule update --remote
@@ -8,20 +12,22 @@ qmk-clean:
 	rm -rf firmwares/qmk/qmk_firmware/keyboards/tmp
 	cd firmwares/qmk/qmk_firmware; qmk clean
 
-qmk-init-%:
-	$(eval KBD := ${@:qmk-init-%=%})
-	rm -rf firmwares/qmk/qmk_firmware/keyboards/tmp/${KBD}
-	mkdir -p firmwares/qmk/qmk_firmware/keyboards/tmp/${KBD}
-	cp -r keyboards/crkbd/qmk/qmk_firmware/ firmwares/qmk/qmk_firmware/keyboards/tmp/${KBD}
+qmk-init:
+	$(eval KB := ${kb})
+	$(eval KR := ${kr})
+	$(eval KM := ${km})
+	rm -rf firmwares/qmk/qmk_firmware/keyboards/tmp/${KB}
+	mkdir -p firmwares/qmk/qmk_firmware/keyboards/tmp/${KB}
+	cp -r keyboards/${KB}/qmk/qmk_firmware/ firmwares/qmk/qmk_firmware/keyboards/tmp/${KB}
 
-qmk-compile-%:
-	$(eval KBD := ${@:qmk-compile-%=%})
-	cd firmwares/qmk/qmk_firmware; qmk compile -kb tmp/${KBD} -km default
+qmk-compile:
+	$(eval KB := ${kb})
+	$(eval KR := ${kr})
+	$(eval KM := ${km})
+	cd firmwares/qmk/qmk_firmware; qmk compile -kb tmp/${KB}/${KR} -km ${KM}
 
-qmk-flash-%:
-	$(eval KBD := ${@:qmk-flash-%=%})
-	cd firmwares/qmk/qmk_firmware; qmk flash -kb tmp/${KBD} -km default
-
-qmk-clean-%:
-	$(eval KBD := ${@:qmk-flash-%=%})
-	rm -rf firmwares/qmk/qmk_firmware/keyboards/tmp/${KBD}
+qmk-flash:
+	$(eval KB := ${kb})
+	$(eval KR := ${kr})
+	$(eval KM := ${km})
+	cd firmwares/qmk/qmk_firmware; qmk flash -kb tmp/${KB}/${KR} -km ${KM}