diff --git a/manifest.json b/manifest.json
index 08bb929..8c2550c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,7 +14,7 @@
 		"email": "maniackc_dev@crudelis.fr"
 	},
 	"requirements": {
-		"yunohost": ">= 3.5.0"
+		"yunohost": ">= 3.6.0"
 	},
 	"multi_instance": true,
 	"services": [],
diff --git a/scripts/install b/scripts/install
index 31d8e77..654423b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -6,11 +6,12 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source _common.sh
-source /usr/share/yunohost/helpers
 # Load common variables for all scripts.
 source _variables
 
+source _common.sh
+source /usr/share/yunohost/helpers
+
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 56a0a3a..0c2011a 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,11 +6,12 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source ../settings/scripts/_common.sh
-source /usr/share/yunohost/helpers
 # Load common variables for all scripts.
 source ../settings/scripts/_variables
 
+source ../settings/scripts/_common.sh
+source /usr/share/yunohost/helpers
+
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 45931e3..f0fb2b0 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -6,11 +6,12 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-source _common.sh
-source /usr/share/yunohost/helpers
 # Load common variables for all scripts.
 source _variables
 
+source _common.sh
+source /usr/share/yunohost/helpers
+
 #=================================================
 # LOAD SETTINGS
 #=================================================