diff --git a/host/docker/aic-manager/bin/aic-manager-entry b/host/docker/aic-manager/bin/aic-manager-entry
index 9ffa455..ec80c34 100755
Binary files a/host/docker/aic-manager/bin/aic-manager-entry and b/host/docker/aic-manager/bin/aic-manager-entry differ
diff --git a/host/docker/android/android-entry b/host/docker/android/android-entry
index 9868e42..fa14531 100755
Binary files a/host/docker/android/android-entry and b/host/docker/android/android-entry differ
diff --git a/host/docker/scripts/aic b/host/docker/scripts/aic
index 7a5feb2..905d19d 100755
--- a/host/docker/scripts/aic
+++ b/host/docker/scripts/aic
@@ -234,12 +234,16 @@ function mount_binderfs() {
     fi
     umount_binderfs
 
-    while [ -z "$(grep -e "binderfs_module" /proc/modules)" ]
-    do
-        echo "[AIC] Waiting for binderfs module installed..."
-        sleep 1
-    done
-
+    binder_kernel_config=`cat /lib/modules/$(uname -r)/build/.config 2>/dev/null | grep CONFIG_ANDROID_BINDERFS | cut -d "=" -f 2`
+    if [ "$binder_kernel_config" == "y" ];then
+        echo "Host kernel is compiled with CONFIG_ANDROID_BINDERFS=y, skip waiting for binder_linux module to be loaded..."
+    else
+        while [ -z "$(grep -e "binder_linux" /proc/modules)" ]
+        do
+            echo "[AIC] Waiting for binderfs module installed..."
+            sleep 1
+        done
+    fi
     sudo mount -t binder binder /dev/binderfs
 }