diff --git a/audio/Android.mk b/audio/Android.mk
deleted file mode 100644
index 5d8830f..0000000
--- a/audio/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.audio.service.mediatek.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-LOCAL_PATH := hardware/interfaces/audio/common/all-versions/default/service
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.audio.service.mediatek
-LOCAL_REQUIRED_MODULES := android.hardware.audio.service.mediatek.rc
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_VENDOR_MODULE := true
-LOCAL_MULTILIB := 32
-
-LOCAL_SRC_FILES := \
-    service.cpp
-
-LOCAL_CFLAGS := \
-    -Wall \
-    -Wextra \
-    -Werror
-
-LOCAL_SHARED_LIBRARIES := \
-    libcutils \
-    libbinder \
-    libbinder_ndk \
-    libhidlbase \
-    liblog \
-    libutils \
-    libhardware
-
-include $(BUILD_EXECUTABLE)
diff --git a/audio/android.hardware.audio.service.mediatek.rc b/audio/android.hardware.audio.service.mediatek.rc
deleted file mode 100644
index 9054b40..0000000
--- a/audio/android.hardware.audio.service.mediatek.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-on post-fs-data
-    mkdir /data/vendor/audiohal 0771 system audio
-    mkdir /data/vendor/audiohal/audio_param 0771 system audio
-
-service vendor.audio-hal /vendor/bin/hw/android.hardware.audio.service.mediatek
-    class hal
-    user audioserver
-    # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)
-    group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct wakelock context_hub system sdcard_rw
-    capabilities BLOCK_SUSPEND SYS_NICE
-    ioprio rt 4
-    task_profiles ProcessCapacityHigh HighPerformance
-    onrestart restart audioserver
diff --git a/device.mk b/device.mk
index d67842b..43ae426 100644
--- a/device.mk
+++ b/device.mk
@@ -49,7 +49,7 @@ PRODUCT_PACKAGES += \
 
 # Audio
 PRODUCT_PACKAGES += \
-    android.hardware.audio.service.mediatek \
+    android.hardware.audio.service \
     android.hardware.audio@7.0-impl \
     android.hardware.audio.effect@7.0-impl \
     android.hardware.bluetooth.audio-impl \
diff --git a/rootdir/etc/init.mt6785.rc b/rootdir/etc/init.mt6785.rc
index a20c665..ad7ef37 100644
--- a/rootdir/etc/init.mt6785.rc
+++ b/rootdir/etc/init.mt6785.rc
@@ -353,6 +353,10 @@ on post-fs-data
     chown root system /data/vendor/flicker
     chmod 0771 /data/vendor/flicker
 
+    # Create Audio HAL data directory
+    mkdir /data/vendor/audiohal 0771 system audio
+    mkdir /data/vendor/audiohal/audio_param 0771 system audio
+
     # Set SELinux security contexts on upgrade or policy update.
     restorecon_recursive /mnt/vendor/nvdata
 
diff --git a/sepolicy/vendor/hal_audio_default.te b/sepolicy/vendor/hal_audio_default.te
new file mode 100644
index 0000000..3a9621d
--- /dev/null
+++ b/sepolicy/vendor/hal_audio_default.te
@@ -0,0 +1 @@
+allow hal_audio_default persist_data_file:dir search;
diff --git a/sepolicy/vendor/hal_sensors_default.te b/sepolicy/vendor/hal_sensors_default.te
index 2139f2b..c267a3a 100644
--- a/sepolicy/vendor/hal_sensors_default.te
+++ b/sepolicy/vendor/hal_sensors_default.te
@@ -7,8 +7,6 @@ binder_call(hal_sensors_default, hal_audio_default)
 # Allow hal_sensors_default to find hal_audio_hwservice
 allow hal_sensors_default hal_audio_hwservice:hwservice_manager find;
 
-binder_call(hal_sensors_default, mtk_hal_audio)
-
 allow hal_sensors_default m_acc_misc_device:chr_file r_file_perms;
 allow hal_sensors_default m_als_misc_device:chr_file r_file_perms;
 allow hal_sensors_default m_baro_misc_device:chr_file r_file_perms;
diff --git a/sepolicy/vendor/mtk_hal_audio.te b/sepolicy/vendor/mtk_hal_audio.te
deleted file mode 100644
index 5983bc1..0000000
--- a/sepolicy/vendor/mtk_hal_audio.te
+++ /dev/null
@@ -1,4 +0,0 @@
-get_prop(mtk_hal_audio, system_audio_prop)
-set_prop(mtk_hal_audio, system_audio_prop)
-
-allow mtk_hal_audio persist_data_file:dir { search };