diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae8869309f9e2f36a32ec17bc1849dcb3b177caa..1de017b9e6e40acbe93dbe02053514893eb52f38 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,15 +34,13 @@ build-flasher:
   stage: build-flasher
   script:
     - rm -rf flasher; mkdir flasher
-    - cd ..
-    - git clone https://gitlab.scd31.com/cats/firmware-flasher
-    - cd firmware-flasher
-    - cp ../mobile-transceiver-software/firmware.bin firmware.bin
+    - cd firmware-flasher # cd into submodule
+    - cp ../firmware.bin firmware.bin
     - cargo build --release --target arm-unknown-linux-gnueabihf
     - cargo build --release --target x86_64-pc-windows-gnu
-    - cp target/arm-unknown-linux-gnueabihf/release/stm32-firmware-flasher ../mobile-transceiver-software/flasher/flasher-linux
-    - arm-linux-gnueabihf-strip ../mobile-transceiver-software/flasher/flasher-linux
-    - cp target/x86_64-pc-windows-gnu/release/stm32-firmware-flasher.exe ../mobile-transceiver-software/flasher/flasher-windows.exe
+    - cp target/arm-unknown-linux-gnueabihf/release/stm32-firmware-flasher ../flasher/flasher-linux
+    - arm-linux-gnueabihf-strip ../flasher/flasher-linux
+    - cp target/x86_64-pc-windows-gnu/release/stm32-firmware-flasher.exe ../flasher/flasher-windows.exe
   artifacts:
     paths:
       - flasher/*
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..99effa4abab547a0f7100d446330110223540b95
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "firmware-flasher"]
+	path = firmware-flasher
+	url = https://gitlab.scd31.com/cats/firmware-flasher
diff --git a/firmware-flasher b/firmware-flasher
new file mode 160000
index 0000000000000000000000000000000000000000..87fb2352473381232e46592a75f6876a816cc171
--- /dev/null
+++ b/firmware-flasher
@@ -0,0 +1 @@
+Subproject commit 87fb2352473381232e46592a75f6876a816cc171