diff --git a/scripts/install b/scripts/install
index a1abb75..d2f927b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -30,6 +30,7 @@ sudo yunohost app checkurl "${domain}${path}" -a "$app" \
 # Save app settings
 ynh_app_setting_set "$app" admin "$admin"
 ynh_app_setting_set "$app" is_public "$is_public"
+ynh_app_setting_set "$app" port "$port"
 
 # Install dependencies
 install_dependencies
diff --git a/scripts/upgrade b/scripts/upgrade
index e59be3f..68a5849 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,6 +18,13 @@ source /usr/share/yunohost/helpers
 domain=$(ynh_app_setting_get "$app" domain)
 path=$(ynh_app_setting_get "$app" path)
 is_public=$(ynh_app_setting_get "$app" is_public)
+port=$(ynh_app_setting_get "$app" port)
+
+# test port settings
+if [[ -z "$port" ]]; then
+    port=3000
+    ynh_app_setting_set $app port $port
+fi
 
 # Fix path if needed
 path=$(fix_path $path)
@@ -25,6 +32,9 @@ path=$(fix_path $path)
 # There's currently nothing else to upgrade than packaging files
 # as InfluxDB/Grafana updates are managed through APT
 
+# Restart service
+sudo systemctl restart grafana-server
+
 # Modify Nginx configuration file and copy it to Nginx conf directory
 if [[ "$path" == "/" ]] ; then
   nginx_conf=$SRCPATH/../conf/nginx_root.conf
@@ -33,6 +43,7 @@ else
 fi
 
 sed -i "s@YNH_WWW_PATH@${path}@g" $nginx_conf
+sed -i "s@YNH_WWW_PORT@$port@g" $nginx_conf
 sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf
 
 # If app is public, add url to SSOWat conf as skipped_uris
@@ -42,4 +53,4 @@ if [[ $is_public -eq 1 ]]; then
 fi
 
 # Reload nginx service
-sudo systemctl reload nginx
\ No newline at end of file
+sudo systemctl reload nginx