diff --git a/aosp/vendor/isula/copyfiles.mk b/aosp/vendor/isula/copyfiles.mk
index 226bb834f04af42c37e1d92ab2f942f680299c38..0daaa33a20bc2de17c75c5e8153940ba0273a7c9 100644
--- a/aosp/vendor/isula/copyfiles.mk
+++ b/aosp/vendor/isula/copyfiles.mk
@@ -10,8 +10,8 @@ PRODUCT_COPY_FILES += \
 
 # hals
 PRODUCT_COPY_FILES += \
-    device/generic/goldfish/audio/policy/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    device/generic/goldfish/audio/policy/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \
+    vendor/isula/media/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+    vendor/isula/media/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
diff --git a/aosp/vendor/isula/manifest.xml b/aosp/vendor/isula/manifest.xml
index c347176dea06cba4548a2816b114327684822028..540dd42a2e8620a6c3d6ddbfe8d107efa77bbe56 100644
--- a/aosp/vendor/isula/manifest.xml
+++ b/aosp/vendor/isula/manifest.xml
@@ -55,16 +55,25 @@
     </hal>
     <hal format="hidl">
         <name>android.hardware.audio.effect</name>
-        <transport>hwbinder</transport>
-        <version>7.0</version>
+        <transport arch="64">passthrough</transport>
+        <version>6.0</version>
         <interface>
             <name>IEffectsFactory</name>
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.audio</name>
+        <transport arch="64">passthrough</transport>
+        <version>6.0</version>
+        <interface>
+            <name>IDevicesFactory</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.soundtrigger</name>
-        <transport>hwbinder</transport>
+        <transport arch="64">passthrough</transport>
         <version>2.3</version>
         <interface>
             <name>ISoundTriggerHw</name>
diff --git a/aosp/vendor/isula/media/audio_policy_configuration.xml b/aosp/vendor/isula/media/audio_policy_configuration.xml
new file mode 100644
index 0000000000000000000000000000000000000000..590b994b715eefb50307b6f417513354e26acb46
--- /dev/null
+++ b/aosp/vendor/isula/media/audio_policy_configuration.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <modules>
+        <xi:include href="primary_audio_policy_configuration.xml"/>
+        <xi:include href="r_submix_audio_policy_configuration.xml"/>
+    </modules>
+</audioPolicyConfiguration>
diff --git a/aosp/vendor/isula/media/primary_audio_policy_configuration.xml b/aosp/vendor/isula/media/primary_audio_policy_configuration.xml
new file mode 100644
index 0000000000000000000000000000000000000000..939edb3c36f93a796afe60df411a5b71693f74b1
--- /dev/null
+++ b/aosp/vendor/isula/media/primary_audio_policy_configuration.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module name="primary" halVersion="2.0">
+    <attachedDevices>
+        <item>Speaker</item>
+        <item>Built-In Mic</item>
+    </attachedDevices>
+    <defaultOutputDevice>Speaker</defaultOutputDevice>
+    <mixPorts>
+        <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+        <mixPort name="primary input" role="sink">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+        </mixPort>
+   </mixPorts>
+   <devicePorts>
+        <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
+        </devicePort>
+
+        <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
+        </devicePort>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="Speaker"
+               sources="primary output"/>
+        <route type="mix" sink="primary input"
+               sources="Built-In Mic"/>
+    </routes>
+</module>
diff --git a/aosp/vendor/isula/packages.mk b/aosp/vendor/isula/packages.mk
index 9d6e5e2783dab87a7840274f3523bacf2cba31a7..eb446cea23335c6c35a2311d1a02b3c977dfd8b9 100644
--- a/aosp/vendor/isula/packages.mk
+++ b/aosp/vendor/isula/packages.mk
@@ -5,9 +5,8 @@
 
 # hals
 PRODUCT_PACKAGES += \
-    android.hardware.audio.effect@7.0-impl \
-    android.hardware.audio.service \
-    android.hardware.audio@7.1-impl.ranchu \
+    android.hardware.audio.effect@6.0-impl \
+    android.hardware.audio@6.0-impl \
     android.hardware.bluetooth-service.default \
     android.hardware.drm@1.4-service-lazy.clearkey \
     android.hardware.drm-service-lazy.clearkey \