diff --git a/firmware.scons b/firmware.scons
index 935c12dca..c06cf40cb 100644
--- a/firmware.scons
+++ b/firmware.scons
@@ -41,15 +41,11 @@ env = ENV.Clone(
     FW_LIB_OPTS={
         "Default": {
             "CCFLAGS": [
-                "-Og"
-                if ENV["LIB_DEBUG"] and fw_build_meta["type"] == "firmware"
-                else "-Os",
+                "-Og" if ENV["LIB_DEBUG"] else "-Os",
             ],
             "CPPDEFINES": [
                 "NDEBUG",
-                "FURI_DEBUG"
-                if ENV["LIB_DEBUG"] and fw_build_meta["type"] == "firmware"
-                else "FURI_NDEBUG",
+                "FURI_DEBUG" if ENV["LIB_DEBUG"] else "FURI_NDEBUG",
             ],
             # You can add other entries named after libraries
             # If they are present, they have precedence over Default
@@ -61,20 +57,16 @@ env = ENV.Clone(
             ],
             "CPPDEFINES": [
                 "NDEBUG",
-                "FURI_DEBUG"
-                if ENV["DEBUG"] and fw_build_meta["type"] == "firmware"
-                else "FURI_NDEBUG",
+                "FURI_DEBUG" if ENV["DEBUG"] else "FURI_NDEBUG",
             ],
         },
         "flipper_application": {
             "CCFLAGS": [
-                "-Og" if fw_build_meta["type"] == "firmware" else "-Os",
+                "-Og",
             ],
             "CPPDEFINES": [
                 "NDEBUG",
-                "FURI_DEBUG"
-                if ENV["DEBUG"] and fw_build_meta["type"] == "firmware"
-                else "FURI_NDEBUG",
+                "FURI_DEBUG" if ENV["DEBUG"] else "FURI_NDEBUG",
             ],
         },
     },