diff --git a/deploy.sh b/deploy.sh
index 974888dfb9ec6f0c50ccf8ef0f5089324c975e7d..e86fcd303936d6fd08adef515bcce82a0ac0a9b7 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -148,15 +148,19 @@ build_app_padding () {
   ) | xxd -p -r > "${tab_folder}/padding.bin"
 }
 
-build_app () {
+comma_separated () {
   # Flatten the array
   # This is equivalent to the following python snippet: ' '.join(arr).replace(' ', ',')
-  local feature_list=$(IFS=$'\n'; echo "$@")
-  if [ "X${feature_list}" != "X" ]
+  local list=$(IFS=$'\n'; echo "$@")
+  if [ "X${list}" != "X" ]
   then
-    feature_list="${feature_list// /,}"
+    feature_list="${list// /,}"
   fi
+  echo ${list}
+}
 
+build_app () {
+  local feature_list="$(comma_separated "$@")"
   cargo build \
     --release \
     --target=thumbv7em-none-eabi \
@@ -176,9 +180,11 @@ build_app () {
 }
 
 build_crypto_bench () {
+  local feature_list="$(comma_separated "$@")"
   cargo build \
     --release \
     --target=thumbv7em-none-eabi \
+    --features="${feature_list}" \
     --example crypto_bench
 
   mkdir -p "target/tab"
@@ -310,7 +316,7 @@ fi
 
 if [ "$install_app" = "crypto_bench" ]
 then
-  build_crypto_bench
+  build_crypto_bench "${!enabled_features[@]}"
 fi
 
 if [ "$install_app" != "none" ]