diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index c4f77115..732104a3 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -44,6 +44,7 @@ LOCAL_MODULE       := init.qcom.sdio.sh
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.qcom.sdio.sh
+LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -51,6 +52,7 @@ LOCAL_MODULE       := init.qcom.wifi.sh
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.qcom.wifi.sh
+LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -58,6 +60,7 @@ LOCAL_MODULE       := init.crda.sh
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/init.crda.sh
+LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -160,6 +163,7 @@ LOCAL_MODULE       := qca6234-service.sh
 LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/qca6234-service.sh
+LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
diff --git a/rootdir/etc/init.crda.sh b/rootdir/etc/init.crda.sh
index d1a4b582..42647897 100755
--- a/rootdir/etc/init.crda.sh
+++ b/rootdir/etc/init.crda.sh
@@ -1,4 +1,5 @@
-#!/system/bin/sh
+#! /vendor/bin/sh
+
 # Copyright (c) 2012, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 950738f4..52712607 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -857,13 +857,13 @@ service qti-testscripts /system/bin/sh /system/etc/init.qcom.testscripts.sh
     oneshot
     seclabel u:r:qti-testscripts:s0
 
-service wifi-sdio-on /system/bin/sh /system/etc/init.qcom.sdio.sh
+service wifi-sdio-on /vendor/bin/init.qcom.sdio.sh
     class late_start
     group wifi inet
     disabled
     oneshot
 
-service wifi-crda /system/bin/sh /system/etc/init.crda.sh
+service wifi-crda /vendor/bin/init.crda.sh
    class late_start
    user root
    disabled
diff --git a/rootdir/etc/init.qcom.sdio.sh b/rootdir/etc/init.qcom.sdio.sh
index c0ae28a6..df777457 100755
--- a/rootdir/etc/init.qcom.sdio.sh
+++ b/rootdir/etc/init.qcom.sdio.sh
@@ -1,4 +1,5 @@
-#!/system/bin/sh
+#! /vendor/bin/sh
+
 # Copyright (c) 2010, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/rootdir/etc/init.qcom.syspart_fixup.sh b/rootdir/etc/init.qcom.syspart_fixup.sh
index 661b635a..0ff2eafb 100755
--- a/rootdir/etc/init.qcom.syspart_fixup.sh
+++ b/rootdir/etc/init.qcom.syspart_fixup.sh
@@ -61,8 +61,8 @@ if [ -f /system/etc/init.qcom.mdm_links.sh ]; then
 fi
 
 # Run wifi script
-if [ -f /system/etc/init.qcom.wifi.sh ]; then
-  /system/bin/sh /system/etc/init.qcom.wifi.sh "$target" "$serial"
+if [ -f /vendor/bin/init.qcom.wifi.sh ]; then
+  /vendor/bin/init.qcom.wifi.sh "$target" "$serial"
 fi
 
 # Run the sensor script
diff --git a/rootdir/etc/init.qcom.wifi.sh b/rootdir/etc/init.qcom.wifi.sh
index 0aaaf6cb..d8bb2d37 100644
--- a/rootdir/etc/init.qcom.wifi.sh
+++ b/rootdir/etc/init.qcom.wifi.sh
@@ -1,4 +1,5 @@
-#!/system/bin/sh
+#! /vendor/bin/sh
+
 # Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/rootdir/etc/qca6234-service.sh b/rootdir/etc/qca6234-service.sh
index 8510eaaa..ee0f4dcd 100644
--- a/rootdir/etc/qca6234-service.sh
+++ b/rootdir/etc/qca6234-service.sh
@@ -1,4 +1,5 @@
-#!/system/bin/sh
+#! /vendor/bin/sh
+
 # Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without