diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 56a49e84208..787bd71b676 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1083,17 +1083,6 @@ TODO: document the other workarounds.
             <option name="disable_explicit_sync_heuristic" value="true"/>
         </application>
     </device>
-    <device driver="panvk">
-        <engine engine_name_match="ANGLE">
-            <!--
-               ANGLE requires VK_EXT_transform_feedback or vertexPipelineStoresAndAtomics
-               to enable OpenGL 3.1 support. As we currently don't support this extension,
-               we enable support for vertexPipelineStoresAndAtomics to allow XFB emulation
-               on hardware without speculative behaviors around vertices.
-               -->
-            <option name="pan_enable_vertex_pipeline_stores_atomics" value="true" />
-        </engine>
-    </device>
     <device driver="panfrost">
         <application name="all-default">
             <option name="allow_rgb16_configs" value="false"/>
diff --git a/src/util/00-panvk-defaults.conf b/src/util/00-panvk-defaults.conf
new file mode 100644
index 00000000000..af097dd6c8b
--- /dev/null
+++ b/src/util/00-panvk-defaults.conf
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<driconf>
+    <device driver="panvk">
+        <engine engine_name_match="ANGLE">
+            <!--
+               ANGLE requires VK_EXT_transform_feedback or vertexPipelineStoresAndAtomics
+               to enable OpenGL 3.1 support. As we currently don't support this extension,
+               we enable support for vertexPipelineStoresAndAtomics to allow XFB emulation
+               on hardware without speculative behaviors around vertices.
+               -->
+            <option name="pan_enable_vertex_pipeline_stores_atomics" value="true" />
+        </engine>
+    </device>
+</driconf>
diff --git a/src/util/meson.build b/src/util/meson.build
index 38a1f999c29..e648b1ffb1a 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -245,6 +245,10 @@ if with_asahi_vk
   files_drirc += files('00-hk-defaults.conf')
 endif
 
+if with_panfrost_vk
+  files_drirc += files('00-panvk-defaults.conf')
+endif
+
 if with_gallium_radeonsi
   files_drirc += files('00-radeonsi-defaults.conf')
 endif