diff --git a/scripts/_common.sh b/scripts/_common.sh
index c7497a5..74aedcc 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -43,7 +43,7 @@ apply_layout() {
     
 	garage_command=$1
 	$garage_command layout show 2>/dev/null
-	if [ "$($garage_command -c garage.toml layout show | grep 'This new layout cannot yet be applied')" ]
+	if [ "$($garage_command layout show | grep 'This new layout cannot yet be applied')" ]
 	then
         ynh_print_warn --message="Unable to apply layout. No enough nodes"
 		return 0
diff --git a/scripts/install b/scripts/install
index b81e282..99e25e6 100755
--- a/scripts/install
+++ b/scripts/install
@@ -140,7 +140,7 @@ fi
 
 self_bootstrap_peers="$($garage_command node id --quiet)"
 garage_layout="$($garage_command layout show)"
-ynh_app_setting_set --app=$app --key=garage_layout --value=$garage_layout
+ynh_app_setting_set --app=$app --key=garage_layout --value="$garage_layout"
 
 #=================================================
 # END OF SCRIPT