diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c
index 9fb1a64614b..41b129cd7d9 100644
--- a/src/amd/vulkan/radv_instance.c
+++ b/src/amd/vulkan/radv_instance.c
@@ -165,6 +165,7 @@ static const driOptionDescription radv_dri_options[] = {
 
    DRI_CONF_SECTION_DEBUG
       DRI_CONF_OVERRIDE_VRAM_SIZE()
+      DRI_CONF_VK_LOWER_TERMINATE_TO_DISCARD(false)
       DRI_CONF_VK_WSI_FORCE_BGRA8_UNORM_FIRST(false)
       DRI_CONF_VK_WSI_FORCE_SWAPCHAIN_TO_CURRENT_EXTENT(false)
       DRI_CONF_VK_X11_IGNORE_SUBOPTIMAL(false)
@@ -191,7 +192,6 @@ static const driOptionDescription radv_dri_options[] = {
       DRI_CONF_RADV_OVERRIDE_COMPUTE_SHADER_VERSION(0)
       DRI_CONF_RADV_OVERRIDE_RAY_TRACING_SHADER_VERSION(0)
       DRI_CONF_RADV_SSBO_NON_UNIFORM(false)
-      DRI_CONF_RADV_LOWER_TERMINATE_TO_DISCARD(false)
       DRI_CONF_RADV_APP_LAYER()
       DRI_CONF_RADV_EMULATE_RT(false)
       DRI_CONF_RADV_ENABLE_FLOAT16_GFX8(false)
@@ -295,7 +295,7 @@ radv_init_dri_options(struct radv_instance *instance)
    instance->drirc.disable_dcc_stores = driQueryOptionb(&instance->drirc.options, "radv_disable_dcc_stores");
 
    instance->drirc.lower_terminate_to_discard =
-      driQueryOptionb(&instance->drirc.options, "radv_lower_terminate_to_discard");
+      driQueryOptionb(&instance->drirc.options, "vk_lower_terminate_to_discard");
 
    instance->drirc.emulate_rt = driQueryOptionb(&instance->drirc.options, "radv_emulate_rt");
 
diff --git a/src/amd/vulkan/tests/misc.cpp b/src/amd/vulkan/tests/misc.cpp
index d33e0cb03c7..7d0d85744ec 100644
--- a/src/amd/vulkan/tests/misc.cpp
+++ b/src/amd/vulkan/tests/misc.cpp
@@ -27,8 +27,8 @@ TEST_F(misc, invariant_pipeline_cache_uuid)
 
    destroy_device();
 
+   add_envvar("vk_lower_terminate_to_discard", "true");
    add_envvar("radv_disable_shrink_image_store", "true");
-   add_envvar("radv_lower_terminate_to_discard", "true");
    add_envvar("RADV_DEBUG", "cswave32");
 
    create_device();
diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
index f4933bef04e..4fcf1f9d29b 100644
--- a/src/util/00-radv-defaults.conf
+++ b/src/util/00-radv-defaults.conf
@@ -109,11 +109,11 @@ Application bugs worked around in this file:
         </application>
 
         <application name="Indiana Jones: The Great Circle" application_name_match="TheGreatCircle">
+            <option name="vk_lower_terminate_to_discard" value="true" />
             <option name="radv_zero_vram" value="true" />
             <option name="radv_disable_dedicated_sparse_queue" value="true" />
             <option name="radv_disable_dcc_stores" value="true" />
             <option name="radv_invariant_geom" value="true" />
-            <option name="radv_lower_terminate_to_discard" value="true" />
             <option name="radv_emulate_rt" value="true" />
             <option name="radv_enable_float16_gfx8" value="true" />
         </application>
diff --git a/src/util/driconf.h b/src/util/driconf.h
index e0e0a909f3c..ee5dbf54ebf 100644
--- a/src/util/driconf.h
+++ b/src/util/driconf.h
@@ -324,6 +324,10 @@
    DRI_CONF_OPT_B(vk_dont_care_as_load, def, \
                   "Treat VK_ATTACHMENT_LOAD_OP_DONT_CARE as LOAD_OP_LOAD, workaround on tiler GPUs for games that confuse these two load ops")
 
+#define DRI_CONF_VK_LOWER_TERMINATE_TO_DISCARD(def) \
+   DRI_CONF_OPT_B(vk_lower_terminate_to_discard, def, \
+                  "Lower terminate to discard (which is implicitly demote)")
+
 #define DRI_CONF_LIMIT_TRIG_INPUT_RANGE(def) \
    DRI_CONF_OPT_B(limit_trig_input_range, def, \
                   "Limit trig input range to [-2p : 2p] to improve sin/cos calculation precision on Intel")
@@ -706,10 +710,6 @@
    DRI_CONF_OPT_B(radv_disable_dcc_stores, def, \
                   "Disable DCC for color storage images on GFX10-GFX11.5")
 
-#define DRI_CONF_RADV_LOWER_TERMINATE_TO_DISCARD(def) \
-   DRI_CONF_OPT_B(radv_lower_terminate_to_discard, def, \
-                  "Lower terminate to discard (which is implicitly demote)")
-
 #define DRI_CONF_RADV_DISABLE_ANISO_SINGLE_LEVEL(def) \
   DRI_CONF_OPT_B(radv_disable_aniso_single_level, def, \
                  "Disable anisotropic filtering for single level images")