diff --git a/core/SConscript.bootloader_ci b/core/SConscript.bootloader_ci
index 0e4380927..2d2eda3ce 100644
--- a/core/SConscript.bootloader_ci
+++ b/core/SConscript.bootloader_ci
@@ -132,7 +132,7 @@ else:
     raise ValueError('Unknown Trezor model')
 
 env.Replace(
-    COPT=env.get('ENV').get('OPTIMIZE', '-Og'),
+    COPT=env.get('ENV').get('OPTIMIZE', '-Os'),
     CCFLAGS='$COPT '
     '-g3 '
     '-nostdlib '
diff --git a/core/SConstruct b/core/SConstruct
index 0f05872d3..446d2b4c4 100644
--- a/core/SConstruct
+++ b/core/SConstruct
@@ -2,8 +2,8 @@
 
 SConscript('SConscript.boardloader', variant_dir='build/boardloader', duplicate=False)
 SConscript('SConscript.bootloader', variant_dir='build/bootloader', duplicate=False)
-SConscript('SConscript.reflash', variant_dir='build/reflash', duplicate=False)
-SConscript('SConscript.prodtest', variant_dir='build/prodtest', duplicate=False)
+SConscript('SConscript.bootloader_ci', variant_dir='build/bootloader_ci', duplicate=False)
 SConscript('SConscript.firmware', variant_dir='build/firmware', duplicate=False)
+SConscript('SConscript.prodtest', variant_dir='build/prodtest', duplicate=False)
+SConscript('SConscript.reflash', variant_dir='build/reflash', duplicate=False)
 SConscript('SConscript.unix', variant_dir='build/unix', duplicate=False)
-SConscript('SConscript.bootloader_ci', variant_dir='build/bootloader_ci', duplicate=False)