diff --git a/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh b/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh
index 676360c..9749491 100644
--- a/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh
+++ b/install/generator-cyphernode/generators/app/templates/installer/testfeatures.sh
@@ -124,8 +124,8 @@ checksparkwallet() {
   echo -en "\r\n\e[1;36mTesting Spark Wallet... " > /dev/console
   local rc
 
-  rc=$(curl -s -o /dev/null -w "%{http_code}" https://gatekeeper/sparkwallet)
-  [ "${rc}" -ne "200" ] && return 400
+  rc=$(curl -s -o /dev/null -k -w "%{http_code}" https://gatekeeper/sparkwallet/)
+  [ "${rc}" -ne "401" ] && return 400
 
   echo -e "\e[1;36mSpark Wallet rocks!" > /dev/console
 
diff --git a/proxy_docker/app/script/call_lightningd.sh b/proxy_docker/app/script/call_lightningd.sh
index 722b371..33408db 100644
--- a/proxy_docker/app/script/call_lightningd.sh
+++ b/proxy_docker/app/script/call_lightningd.sh
@@ -296,8 +296,8 @@ ln_pay() {
       # Amount and description is as expected, let's pay!
       trace "[ln_pay] Amount and description are as expected, let's try to pay!"
 
-      trace "[ln_pay] ./lightning-cli pay ${bolt11}"
-      result=$(./lightning-cli pay ${bolt11})
+      trace "[ln_pay] ./lightning-cli pay -k bolt11=${bolt11} retry_for=15"
+      result=$(./lightning-cli pay -k bolt11=${bolt11} retry_for=15)
       returncode=$?
       trace_rc ${returncode}
       trace "[ln_pay] result=${result}"
@@ -335,8 +335,8 @@ ln_pay() {
           trace "[ln_pay] Ok let's deal with pending status with waitsendpay."
 
           payment_hash=$(echo "${result}" | jq ".data.payment_hash" | tr -d '"')
-          trace "[ln_pay] ./lightning-cli waitsendpay ${payment_hash}"
-          result=$(./lightning-cli waitsendpay ${payment_hash})
+          trace "[ln_pay] ./lightning-cli waitsendpay ${payment_hash} 15"
+          result=$(./lightning-cli waitsendpay ${payment_hash} 15)
           returncode=$?
           trace_rc ${returncode}
           trace "[ln_pay] result=${result}"