diff --git a/data-ipa-cfg-mgr/ipacm/src/ipacm.rc b/data-ipa-cfg-mgr/ipacm/src/ipacm.rc
index c1c876be..8381bf22 100644
--- a/data-ipa-cfg-mgr/ipacm/src/ipacm.rc
+++ b/data-ipa-cfg-mgr/ipacm/src/ipacm.rc
@@ -25,10 +25,13 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# msm specific files that need to be created on /data
+on post-fs-data
+    mkdir /data/vendor/ipa 0770 radio radio
+    chmod 0770 /data/vendor/ipa
+
 service vendor.ipacm /system/vendor/bin/ipacm
-    class main
+    class late_start
     user radio
     group radio inet
-
-on post-fs
-    start vendor.ipacm
+    writepid /dev/cpuset/system-background/tasks
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 3b9c9890..3aab631f 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -359,10 +359,6 @@ on post-fs-data
     mkdir /data/vendor/netmgr 0770 radio radio
     chmod 0770 /data/vendor/netmgr
 
-    #create ipacm log dir
-    mkdir /data/vendor/ipa 0770 radio radio
-    chmod 0770 /data/vendor/ipa
-
     #Create QTI dir for logs
     mkdir /data/vendor/dataqti 0770 radio radio
     chmod 0770 /data/vendor/dataqti
@@ -630,14 +626,6 @@ service vendor.port-bridge /system/vendor/bin/port-bridge
     oneshot
     writepid /dev/cpuset/system-background/tasks
 
-service vendor.ipacm /system/vendor/bin/ipacm
-    class main
-    user radio
-    group radio inet
-    disabled
-    writepid /dev/cpuset/system-background/tasks
-
-
 service vendor.sensors /vendor/bin/sscrpcd sensorspd
     class early_hal
     user system
diff --git a/sepolicy/vendor/ipacm.te b/sepolicy/vendor/ipacm.te
new file mode 100644
index 00000000..3c1d3a4f
--- /dev/null
+++ b/sepolicy/vendor/ipacm.te
@@ -0,0 +1,4 @@
+# Fix for WLAN tethering offload
+# SELinux : avc:  denied  { set } for property=wifi.active.interface pid=2918 uid=1010 gid=1010 scontext=u:r::s0 tcontext=u:object_r:default_prop:s0 tclass=property_service
+allow hal_wifi_default exported_wifi_prop:property_service set;
+
diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 628a84a2..49a7a6b3 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -40,3 +40,7 @@ sys.post_boot.parsed                u:object_r:vendor_mpctl_prop:s0
 
 # Hall wakeup
 persist.service.folio_daemon        u:object_r:system_prop:s0
+
+# Fix for WLAN tethering offload
+# SELinux : avc:  denied  { set } for property=wifi.active.interface pid=2918 uid=1010 gid=1010 scontext=u:r::s0 tcontext=u:object_r:default_prop:s0 tclass=property_service
+wifi.active.interface               u:object_r:exported_wifi_prop:s0