diff --git a/scripts/install b/scripts/install
index 610ab19..6d75ed6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -4,14 +4,22 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 # Default values for config panel
+
+config_file=""
+cube_file=""
+ovpn_file=""
+nameservers=""
+ip6_addr=""
+ip6_net=""
+
 ynh_app_setting_set --key="service_enabled" --value="0"
-ynh_app_setting_set --key="config_file" --value=""
-ynh_app_setting_set --key="cube_file" --value=""
-ynh_app_setting_set --key="ovpn_file" --value=""
+ynh_app_setting_set --key="config_file" --value="$config_file"
+ynh_app_setting_set --key="cube_file" --value="$cube_file"
+ynh_app_setting_set --key="ovpn_file" --value="$ovpn_file"
 ynh_app_setting_set --key="dns_method" --value="yunohost"
-ynh_app_setting_set --key="nameservers" --value=""
-ynh_app_setting_set --key="ip6_addr" --value=""
-ynh_app_setting_set --key="ip6_net" --value=""
+ynh_app_setting_set --key="nameservers" --value="$nameservers"
+ynh_app_setting_set --key="ip6_addr" --value="$ip6_addr"
+ynh_app_setting_set --key="ip6_net" --value="$ip6_net"
 ynh_app_setting_set --key="ip6_send_over_tun_enabled" --value="0"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 32ed892..50846dd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -53,12 +53,21 @@ fi
 
 # New stuff
 
-ynh_app_setting_set_default --key="dns_method" --value="custom"
-default_nameservers="$(grep -o -P '\s*nameserver\s+\K[abcdefabcdef\d.:]+' /etc/resolv.dnsmasq.conf | sort | uniq | paste -s -d, -)"
-ynh_app_setting_set_default --key="nameservers" --value="$default_nameservers"
+config_file=""
+cube_file=""
+ovpn_file=""
+nameservers=""
+ip6_addr=""
+ip6_net=""
+
 ynh_app_setting_set_default --key="service_enabled" --value="0"
-ynh_app_setting_set_default --key="ip6_addr" --value=""
-ynh_app_setting_set_default --key="ip6_net" --value=""
+ynh_app_setting_set_default --key="config_file" --value="$config_file"
+ynh_app_setting_set_default --key="cube_file" --value="$cube_file"
+ynh_app_setting_set_default --key="ovpn_file" --value="$ovpn_file"
+ynh_app_setting_set_default --key="dns_method" --value="yunohost"
+ynh_app_setting_set_default --key="nameservers" --value="$nameservers"
+ynh_app_setting_set_default --key="ip6_addr" --value="$ip6_addr"
+ynh_app_setting_set_default --key="ip6_net" --value="$ip6_net"
 ynh_app_setting_set_default --key="ip6_send_over_tun_enabled" --value="0"
 
 #=================================================