diff --git a/site_scons/commandline.scons b/site_scons/commandline.scons
index c4c2fb5ab..21a02414a 100644
--- a/site_scons/commandline.scons
+++ b/site_scons/commandline.scons
@@ -69,7 +69,7 @@ vars.AddVariables(
     BoolVariable(
         "DEBUG",
         help="Enable debug build",
-        default=True,
+        default=False,
     ),
     BoolVariable(
         "LIB_DEBUG",
@@ -79,7 +79,7 @@ vars.AddVariables(
     BoolVariable(
         "COMPACT",
         help="Optimize for size",
-        default=False,
+        default=True,
     ),
     EnumVariable(
         "TARGET_HW",
diff --git a/site_scons/firmwareopts.scons b/site_scons/firmwareopts.scons
index 6af861324..4ef210f89 100644
--- a/site_scons/firmwareopts.scons
+++ b/site_scons/firmwareopts.scons
@@ -28,7 +28,7 @@ else:
             "NDEBUG",
         ],
         CCFLAGS=[
-            "-Og",
+            "-Os",
         ],
     )