diff --git a/Desktop_Interface/Labrador.pro b/Desktop_Interface/Labrador.pro
index 326a36857..a760db15f 100644
--- a/Desktop_Interface/Labrador.pro
+++ b/Desktop_Interface/Labrador.pro
@@ -105,7 +105,10 @@ win32 {
     lib_deploy.path = /
 
     firmware.path = /firmware
-    firmware.files = $$files(resources/firmware/*)
+    firmware.files = $$files(resources/firmware/labrafirm*)
+    # Windows special for firmware update
+    firmware.files += $$files(resources/firmware/*.bat)
+    firmware.files += $$files(resources/firmware/*.exe)
 
     waveforms.path = /waveforms
     waveforms.files = $$files(resources/waveforms/*)
@@ -164,7 +167,7 @@ unix:!android:!macx {
     lib_deploy.files += build_linux/libdfuprog/lib/$${QT_ARCH}/libdfuprog-0.9.so
 
     firmware.path = $$PREFIX/share/EspoTek/Labrador/firmware
-    firmware.files += $$files(resources/firmware/labrafirm*)
+    firmware.files = $$files(resources/firmware/labrafirm*)
 
     waveforms.path = $$PREFIX/share/EspoTek/Labrador/waveforms
     waveforms.files += $$files(resources/waveforms/*)
@@ -302,7 +305,7 @@ android {
     ANDROID_PERMISSIONS += android.permission.READ_EXTERNAL_STORAGE
 
     firmware.path = /assets/firmware
-    firmware.files = resources/firmware/labrafirm_0007_02.hex
+    firmware.files = $$files(resources/firmware/labrafirm*)
 
     waveforms.path = /assets/waveforms
     waveforms.files = $$files(resources/waveforms/*)
diff --git a/Desktop_Interface/build_win/Labrador.aip b/Desktop_Interface/build_win/Labrador.aip
index be0fcf775..292acbaa0 100644
--- a/Desktop_Interface/build_win/Labrador.aip
+++ b/Desktop_Interface/build_win/Labrador.aip
@@ -174,8 +174,8 @@
     <ROW File="libusbK.dll_1" Component_="libusbK.dll_1" FileName="libusbK.dll" Attributes="0" SourcePath="bin32\libusbK.dll" SelfReg="false"/>
     <ROW File="dfuprogrammer.exe_1" Component_="dfuprogrammer.exe_1" FileName="DFU-PR~1.EXE|dfu-programmer.exe" Attributes="0" SourcePath="bin64\firmware\dfu-programmer.exe" SelfReg="false" DigSign="true"/>
     <ROW File="flash.bat" Component_="flash.bat" FileName="flash.bat" Attributes="0" SourcePath="bin64\firmware\flash.bat" SelfReg="false"/>
-    <ROW File="labrafirm_0007_01.hex" Component_="flash.bat" FileName="LABRA~10.HEX|labrafirm_0007_01.hex" Attributes="0" SourcePath="bin64\firmware\labrafirm_0007_01.hex" SelfReg="false"/>
-    <ROW File="labrafirm_0007_02.hex" Component_="flash.bat" FileName="LABRA~11.HEX|labrafirm_0007_02.hex" Attributes="0" SourcePath="bin64\firmware\labrafirm_0007_02.hex" SelfReg="false"/>
+    <ROW File="labrafirm_0007_01.hex" Component_="flash.bat" FileName="LABRAF~8.HEX|labrafirm_0007_01.hex" Attributes="0" SourcePath="bin64\firmware\labrafirm_0007_01.hex" SelfReg="false"/>
+    <ROW File="labrafirm_0007_02.hex" Component_="flash.bat" FileName="LABRAF~9.HEX|labrafirm_0007_02.hex" Attributes="0" SourcePath="bin64\firmware\labrafirm_0007_02.hex" SelfReg="false"/>
     <ROW File="wipe.bat" Component_="flash.bat" FileName="wipe.bat" Attributes="0" SourcePath="bin64\firmware\wipe.bat" SelfReg="false"/>
     <ROW File="DC.tlw" Component_="DC.tlw" FileName="DC.tlw" Attributes="0" SourcePath="bin64\waveforms\DC.tlw" SelfReg="false"/>
     <ROW File="Sawtooth.tlw" Component_="DC.tlw" FileName="Sawtooth.tlw" Attributes="0" SourcePath="bin64\waveforms\Sawtooth.tlw" SelfReg="false"/>
@@ -205,8 +205,8 @@
     <ROW File="qt_sk.qm" Component_="qt_ar.qm" FileName="qt_sk.qm" Attributes="0" SourcePath="bin64\translations\qt_sk.qm" SelfReg="false"/>
     <ROW File="qt_uk.qm" Component_="qt_ar.qm" FileName="qt_uk.qm" Attributes="0" SourcePath="bin64\translations\qt_uk.qm" SelfReg="false"/>
     <ROW File="flash.bat_1" Component_="flash.bat_1" FileName="flash.bat" Attributes="0" SourcePath="bin32\firmware\flash.bat" SelfReg="false"/>
-    <ROW File="labrafirm_0007_01.hex_1" Component_="flash.bat_1" FileName="LABRA~10.HEX|labrafirm_0007_01.hex" Attributes="0" SourcePath="bin32\firmware\labrafirm_0007_01.hex" SelfReg="false"/>
-    <ROW File="labrafirm_0007_02.hex_1" Component_="flash.bat_1" FileName="LABRA~11.HEX|labrafirm_0007_02.hex" Attributes="0" SourcePath="bin32\firmware\labrafirm_0007_02.hex" SelfReg="false"/>
+    <ROW File="labrafirm_0007_01.hex_1" Component_="flash.bat_1" FileName="LABRAF~8.HEX|labrafirm_0007_01.hex" Attributes="0" SourcePath="bin32\firmware\labrafirm_0007_01.hex" SelfReg="false"/>
+    <ROW File="labrafirm_0007_02.hex_1" Component_="flash.bat_1" FileName="LABRAF~9.HEX|labrafirm_0007_02.hex" Attributes="0" SourcePath="bin32\firmware\labrafirm_0007_02.hex" SelfReg="false"/>
     <ROW File="wipe.bat_1" Component_="flash.bat_1" FileName="wipe.bat" Attributes="0" SourcePath="bin32\firmware\wipe.bat" SelfReg="false"/>
     <ROW File="qt_ar.qm_1" Component_="qt_ar.qm_1" FileName="qt_ar.qm" Attributes="0" SourcePath="bin32\translations\qt_ar.qm" SelfReg="false"/>
     <ROW File="qt_bg.qm_1" Component_="qt_ar.qm_1" FileName="qt_bg.qm" Attributes="0" SourcePath="bin32\translations\qt_bg.qm" SelfReg="false"/>