diff --git a/configs/common/wolfssl b/configs/common/wolfssl
index 0c30a2f..4c13ff3 100644
--- a/configs/common/wolfssl
+++ b/configs/common/wolfssl
@@ -1,18 +1,10 @@
 #### replace mbedtls with openssl - remember to leave commented "is not set" or remove it!
-
-### NOTE: switch, when package is available
 CONFIG_PACKAGE_apk-mbedtls=y
-# CONFIG_PACKAGE_apk-wolfssl is not set
-
+CONFIG_PACKAGE_libustream-mbedtls=y
 CONFIG_PACKAGE_wpad-wolfssl=y
-CONFIG_PACKAGE_libustream-mbedtls=m
-CONFIG_PACKAGE_libustream-wolfssl=y
-CONFIG_PACKAGE_libwolfssl=y
 # CONFIG_PACKAGE_wpad-mbedtls is not set
 # CONFIG_PACKAGE_wpad-basic-mbedtls is not set
 # CONFIG_PACKAGE_wpad-basic-openssl is not set
-# CONFIG_LIBCURL_MBEDTLS is not set
-CONFIG_LIBCURL_WOLFSSL=y
 CONFIG_LUA_ECO_WOLFSSL=y
 # CONFIG_LUA_ECO_MBEDTLS is not set
 #### replace mbedtls with openssl - remember to leave commented "is not set" or remove it!
@@ -21,10 +13,13 @@ CONFIG_LUA_ECO_WOLFSSL=y
 ## https://www.wolfssl.com/cpu-accelerated-cryptography-on-openwrt-using-wolfssl/
 ## Seems devcrypto full does not work with all my routers.
 # CONFIG_PACKAGE_kmod-crypto-authenc=y
-# CONFIG_PACKAGE_kmod-cryptodev=y
+CONFIG_PACKAGE_kmod-cryptodev=y
 CONFIG_WOLFSSL_HAS_DEVCRYPTO=y
 # CONFIG_WOLFSSL_HAS_DEVCRYPTO_FULL=y
 # CONFIG_WOLFSSL_HAS_AFALG is not set
 
-# Probably it can be used by wolfssl
+# Checking SSL with CPU acceleration
+# MAKE SURE IT IS ARMv8 or Intel AESNI, otherwise use: CONFIG_PACKAGE_libwolfssl=y
+CONFIG_PACKAGE_libwolfsslcpu-crypto=y
+
 CONFIG_PACKAGE_kmod-crypto-user=y
diff --git a/openwrt-configure.sh b/openwrt-configure.sh
index b9b506f..c5335d7 100755
--- a/openwrt-configure.sh
+++ b/openwrt-configure.sh
@@ -43,7 +43,9 @@ if [ -n "$CRYPTO_LIB" ]; then
   COMMAND="$COMMAND; apk del wpad-basic-mbedtls; apk add wpad-$CRYPTO_LIB"
 
   if [[ "$CRYPTO_LIB" =~ ^(Wolfssl|wolfssl)$ ]]; then
-    FS_FULL_WPAD_PACKAGES="$FS_FULL_WPAD_PACKAGES -libustream-mbedtls libustream-wolfssl wpad-wolfssl libwolfssl"
+    # MAKE SURE IT IS ARMv8 or Intel AESNI, otherwise use: CONFIG_PACKAGE_libwolfssl=y
+    echo -e "\n\n If this is ARMv8, you can replace libwolfssl with libwolfsslcpu-crypto \n\n"
+    FS_FULL_WPAD_PACKAGES="$FS_FULL_WPAD_PACKAGES wpad-wolfssl libwolfssl"
   elif [[ "$CRYPTO_LIB" =~ ^(Openssl|openssl)$ ]]; then
     FS_FULL_WPAD_PACKAGES="$FS_FULL_WPAD_PACKAGES -libustream-mbedtls libustream-openssl wpad-openssl apk-openssl libopenssl-devcrypto"
   fi