diff --git a/README.md b/README.md
index 3333ff9..8ce9700 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Metric & analytic dashboards for monitoring
 
-**Shipped version:** 8.0.6~ynh1
+**Shipped version:** 8.3.3~ynh1
 
 **Demo:** https://play.grafana.org
 
diff --git a/README_fr.md b/README_fr.md
index 3b17a8f..0be50e3 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Tableaux de bords de supervision
 
-**Version incluse :** 8.0.6~ynh1
+**Version incluse :** 8.3.3~ynh1
 
 **Démo :** https://play.grafana.org
 
diff --git a/manifest.json b/manifest.json
index a04e6a2..0360566 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Metric & analytic dashboards for monitoring",
         "fr": "Tableaux de bords de supervision"
     },
-    "version": "8.0.6~ynh1",
+    "version": "8.3.3~ynh1",
     "license": "AGPL-3.0-only",
     "url": "https://grafana.com/oss/grafana/",
     "upstream": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index f24fadf..f59a33f 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # Debian package version for Grafana
-GRAFANA_VERSION="7.5.5"
+GRAFANA_VERSION="8.3.3"
 
 # dependencies used by the app
 pkg_dependencies="influxdb"
diff --git a/scripts/restore b/scripts/restore
index aeff4d4..eccbe29 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -106,8 +106,12 @@ yunohost service add grafana-server --description="open source analytics and mon
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
+# Enable the systemd service so that InfluxDB and Grafana start at boot
+systemctl enable influxdb.service --quiet
+systemctl enable grafana-server.service --quiet
+
 ynh_systemd_action --service_name=influxdb --action="start"
-ynh_systemd_action --service_name=grafana-server --action="start" --log_path="/var/log/grafana/grafana.log"
+ynh_systemd_action --service_name=grafana-server --action="start" --log_path="/var/log/grafana/grafana.log" --line_match="HTTP Server Listen" --timeout=600
 
 #=================================================
 # GENERIC FINALIZATION