diff --git a/.pick_status.json b/.pick_status.json
index 1bf3551ea20..da16d32d8c4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -784,7 +784,7 @@
         "description": "radv: fix applying radv_ssbo_non_uniform=true for Crysis 2/3 remastered",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "56813236f47a8d2f8d7fe3dfb3909797176f6e82",
         "notes": null
diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
index 594d62e017b..8a5c272280f 100644
--- a/src/util/00-radv-defaults.conf
+++ b/src/util/00-radv-defaults.conf
@@ -186,11 +186,15 @@ Application bugs worked around in this file:
             <option name="radv_invariant_geom" value="true"/>
         </application>
 
-        <application name="Crysis 2 Remastered" application_name_match="Crysis2Remastered.exe">
+        <!-- Crysis 2/3 remastered are DX11 games that use Vulkan interop for RT
+             and the app/engine (nvpro-sample) seems too generic to apply the
+             drirc entry for. The executable name works just fine but that means
+             no pre-compilation for the RT shaders. -->
+        <application name="Crysis 2 Remastered" executable="Crysis2Remastered.exe">
             <option name="radv_ssbo_non_uniform" value="true" />
         </application>
 
-        <application name="Crysis 3 Remastered" application_name_match="Crysis3Remastered.exe">
+        <application name="Crysis 3 Remastered" executable="Crysis3Remastered.exe">
             <option name="radv_ssbo_non_uniform" value="true" />
         </application>