diff --git a/Makefile b/Makefile
index db80ed3e..2862a27f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,11 +13,28 @@ else ifeq ($(APP),tezos_wallet)
 APPNAME = "Tezos Wallet"
 endif
 
+ifeq ($(APP),tezos_baking)
+
 ifeq ($(TARGET_NAME), TARGET_NANOS)
-APP_LOAD_FLAGS=--appFlags 0x800  # APPLICATION_FLAG_LIBRARY
+# APPLICATION_FLAG_LIBRARY
+APP_LOAD_FLAGS=--appFlags 0x800
+else
+# APPLICATION_FLAG_LIBRARY + APPLICATION_FLAG_BOLOS_SETTINGS + APPLICATION_FLAG_GLOBAL_PIN
+APP_LOAD_FLAGS=--appFlags 0xa40
+endif
+
 else
-APP_LOAD_FLAGS=--appFlags 0xa40  # APPLICATION_FLAG_LIBRARY + APPLICATION_FLAG_BOLOS_SETTINGS + BLE SUPPORT
+
+ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOS TARGET_NANOS2))
+# APPLICATION_FLAG_LIBRARY
+APP_LOAD_FLAGS=--appFlags 0x800
+else
+# APPLICATION_FLAG_LIBRARY + APPLICATION_FLAG_BOLOS_SETTINGS
+APP_LOAD_FLAGS=--appFlags 0xa00
 endif
+
+endif
+
 APP_LOAD_PARAMS=$(APP_LOAD_FLAGS) --curve ed25519 --curve secp256k1 --curve secp256r1 --path "44'/1729'" $(COMMON_LOAD_PARAMS)
 
 GIT_DESCRIBE ?= $(shell git describe --tags --abbrev=8 --always --long --dirty 2>/dev/null)