diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index e1e8b7eac..3b79bc516 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -8,7 +8,7 @@ TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
 
 FEATURE_FLAGS = {
     "RDI": True,
-    "SECP256K1_ZKP": True,
+    "SECP256K1_ZKP": False,
 }
 
 CCFLAGS_MOD = ''
@@ -376,10 +376,12 @@ if TREZOR_MODEL == 'T':
     CPU_ASFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16'
     CPU_CCFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mtune=cortex-m4 '
     CPU_MODEL   = 'STM32F427xx'
+    LD_VARIANT  = '_zkp' if EVERYTHING and FEATURE_FLAGS["SECP256K1_ZKP"] else ''
 elif TREZOR_MODEL == '1':
     CPU_ASFLAGS = '-mthumb -mcpu=cortex-m3 -mfloat-abi=soft'
     CPU_CCFLAGS = '-mthumb -mtune=cortex-m3 -mcpu=cortex-m3 -mfloat-abi=soft '
     CPU_MODEL   = 'STM32F405xx'
+    LD_VARIANT  = '' if EVERYTHING else '_min'
 else:
     raise ValueError('Unknown Trezor model')
 
@@ -394,7 +396,7 @@ env.Replace(
     '-fstack-protector-all '
     + CPU_CCFLAGS + CCFLAGS_MOD,
     CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
-    LINKFLAGS='-T embed/firmware/memory_${TREZOR_MODEL}%s.ld -Wl,--gc-sections -Wl,-Map=build/firmware/firmware.map -Wl,--warn-common' % ('' if EVERYTHING else '_min'),
+    LINKFLAGS='-T embed/firmware/memory_${TREZOR_MODEL}%s.ld -Wl,--gc-sections -Wl,-Map=build/firmware/firmware.map -Wl,--warn-common' % LD_VARIANT,
     CPPPATH=[
         '.',
         'embed/firmware',
diff --git a/core/SConscript.unix b/core/SConscript.unix
index f2abcc0f5..71b609f6a 100644
--- a/core/SConscript.unix
+++ b/core/SConscript.unix
@@ -7,7 +7,7 @@ EVERYTHING = BITCOIN_ONLY != '1'
 TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
 
 FEATURE_FLAGS = {
-    "SECP256K1_ZKP": True,
+    "SECP256K1_ZKP": False,
 }
 
 CCFLAGS_MOD = ''
diff --git a/core/embed/firmware/memory_T.ld b/core/embed/firmware/memory_T.ld
index 7ca3c0ddc..e253c8ea3 100644
--- a/core/embed/firmware/memory_T.ld
+++ b/core/embed/firmware/memory_T.ld
@@ -44,7 +44,6 @@ SECTIONS {
 
   .flash2 : ALIGN(512) {
     build/firmware/frozen_mpy.o(.rodata*);
-    build/firmware/vendor/secp256k1-zkp/src/secp256k1.o(.rodata*);
     . = ALIGN(512);
   } >FLASH2 AT>FLASH2
 
diff --git a/core/embed/firmware/memory_T_min.ld b/core/embed/firmware/memory_T_zkp.ld
similarity index 96%
rename from core/embed/firmware/memory_T_min.ld
rename to core/embed/firmware/memory_T_zkp.ld
index e253c8ea3..7ca3c0ddc 100644
--- a/core/embed/firmware/memory_T_min.ld
+++ b/core/embed/firmware/memory_T_zkp.ld
@@ -44,6 +44,7 @@ SECTIONS {
 
   .flash2 : ALIGN(512) {
     build/firmware/frozen_mpy.o(.rodata*);
+    build/firmware/vendor/secp256k1-zkp/src/secp256k1.o(.rodata*);
     . = ALIGN(512);
   } >FLASH2 AT>FLASH2