diff --git a/src/util/00-asahi-defaults.conf b/src/util/00-asahi-defaults.conf
new file mode 100644
index 00000000000..73a3fab0723
--- /dev/null
+++ b/src/util/00-asahi-defaults.conf
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<driconf>
+    <device driver="asahi">
+        <!-- Override GL renderer for known web browsers since one or more
+             web security frameworks apparently block clients with "Apple"
+             in the the renderer string if the OS is not one of Apple's.
+             Affected web sites include paypal.com, etsy.com and wsj.com.
+             Reported as web-compat bug in
+             https://github.com/webcompat/web-bugs/issues/189524
+        -->
+        <application name="Firefox" executable="firefox">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Firefox ESR" executable="firefox-esr">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Chromium" executable="chromium">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Chromium" executable="chromium-browser">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Google Chrome" executable="chrome">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="vivaldi-bin" executable="vivaldi-bin">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Iceweasel" executable="iceweasel">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Epiphany" executable="epiphany">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Konqueror" executable="konqueror">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Falkon" executable="falkon">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Seamonkey" executable="seamonkey">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+        <application name="Waterfox" executable="waterfox">
+            <option name="force_gl_renderer" value="AGX G13/G14"/>
+        </application>
+    </device>
+</driconf>
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 07782bbab99..ec6e3e6313b 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -1083,51 +1083,6 @@ TODO: document the other workarounds.
             <option name="disable_explicit_sync_heuristic" value="true"/>
         </application>
     </device>
-    <device driver="asahi">
-        <!-- Override GL renderer for known web browsers since one or more
-             web security frameworks apparently block clients with "Apple"
-             in the the renderer string if the OS is not one of Apple's.
-             Affected web sites include paypal.com, etsy.com and wsj.com.
-             Reported as web-compat bug in
-             https://github.com/webcompat/web-bugs/issues/189524
-        -->
-        <application name="Firefox" executable="firefox">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Firefox ESR" executable="firefox-esr">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Chromium" executable="chromium">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Chromium" executable="chromium-browser">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Google Chrome" executable="chrome">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="vivaldi-bin" executable="vivaldi-bin">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Iceweasel" executable="iceweasel">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Epiphany" executable="epiphany">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Konqueror" executable="konqueror">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Falkon" executable="falkon">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Seamonkey" executable="seamonkey">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-        <application name="Waterfox" executable="waterfox">
-            <option name="force_gl_renderer" value="AGX G13/G14"/>
-        </application>
-    </device>
     <device driver="hk">
         <engine engine_name_match="DXVK|vkd3d">
            <!--
diff --git a/src/util/meson.build b/src/util/meson.build
index 747894cf3a5..4ec391fc1e9 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -237,6 +237,10 @@ if with_gallium_iris
   files_drirc += files('00-iris-defaults.conf')
 endif
 
+if with_gallium_asahi
+  files_drirc += files('00-asahi-defaults.conf')
+endif
+
 if with_gallium_radeonsi
   files_drirc += files('00-radeonsi-defaults.conf')
 endif