diff --git a/README.md b/README.md
index f6635f9..dd06020 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Monitorix For yunohost
 ======================
 
-[![Integration level](https://dash.yunohost.org/integration/monitorix.svg)](https://ci-apps.yunohost.org/ci/apps/monitorix%20%28Community%29/lastBuild/consoleFull)  
+[![Integration level](https://dash.yunohost.org/integration/monitorix.svg)](https://dash.yunohost.org/appci/app/monitorix) ![](https://ci-apps.yunohost.org/ci/badges/monitorix.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/monitorix.maintain.svg)  
 [![Install monitorix with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=monitorix)
 
 > *This package allow you to install monitorix quickly and simply on a YunoHost server.  
@@ -39,7 +39,7 @@ This app have no specific authentification and no specific user management.
 
 ### Supported architectures
 
-* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/monitorix%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/monitorix/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/monitorix%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/monitorix/)
 * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/monitorix%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/monitorix/)
 
 <!--Limitations
diff --git a/check_process b/check_process
index 2faba26..f83c2c0 100644
--- a/check_process
+++ b/check_process
@@ -22,14 +22,3 @@
         port_already_use=1 (8080)
         final_path_already_use=1
         change_url=1
-;;; Levels
-    Level 1=auto
-    Level 2=auto
-    Level 3=auto
-    Level 4=na
-    Level 5=auto
-    Level 6=auto
-    Level 7=auto
-    Level 8=0
-    Level 9=0
-    Level 10=0
diff --git a/conf/monitorix.conf b/conf/monitorix.conf
index 077b85a..e069317 100644
--- a/conf/monitorix.conf
+++ b/conf/monitorix.conf
@@ -473,9 +473,9 @@ secure_log_date_format = %b %e
 # -----------------------------------------------------------------------------
 <mysql>
 	conn_type = socket
-	list = /var/run/mysqld/mysqld.sock
+	list = /run/mysqld/mysqld.sock
 	<desc>
-		/var/run/mysqld/mysqld.sock = 3306, __MYSQL_USER__, __MYSQL_PASSWORD__
+		/run/mysqld/mysqld.sock = 3306, __MYSQL_USER__, __MYSQL_PASSWORD__
 	</desc>
         rigid = 0, 2, 0, 0, 0, 0
         limit = 100, 100, 100, 100, 100, 100
diff --git a/scripts/backup b/scripts/backup
index eb22025..f1cf658 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ../settings/scripts/experimental_helper.sh
+source ../settings/scripts/_common.sh
+
 # Source YunoHost helpers
 source /usr/share/yunohost/helpers
 
 # Stop script if errors
 ynh_abort_if_errors
 
-# Import common cmd
-source ../settings/scripts/experimental_helper.sh
-source ../settings/scripts/_common.sh
-
 # Retrieve arguments
 ynh_script_progression --message="Loading installation settings..."
 domain=$(ynh_app_setting_get --app $app --key domain)
diff --git a/scripts/change_url b/scripts/change_url
index 25db430..2e1e383 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ./experimental_helper.sh
+source ./_common.sh
+
 # Source YunoHost helpers
 source /usr/share/yunohost/helpers
 
 # Stop script if errors
 ynh_abort_if_errors
 
-# Import common cmd
-source ./experimental_helper.sh
-source ./_common.sh
-
 ynh_script_progression --message="Loading installation settings..."
 
 # Retrive arguments
diff --git a/scripts/install b/scripts/install
index d4299d7..1ff1e37 100755
--- a/scripts/install
+++ b/scripts/install
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ./experimental_helper.sh
+source ./_common.sh
+
 # Source YunoHost helpers
 source /usr/share/yunohost/helpers
 
 # Stop script if errors
 ynh_abort_if_errors
 
-# Import common cmd
-source ./experimental_helper.sh
-source ./_common.sh
-
 ynh_script_progression --message="Validating installation parameters..."
 
 # Retrieve arguments
diff --git a/scripts/remove b/scripts/remove
index 5f4fd5c..3655351 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -4,9 +4,6 @@
 # GENERIC START
 #=================================================
 
-# Source YunoHost helpers
-source /usr/share/yunohost/helpers
-
 # Stop script if errors
 set -u
 
@@ -14,6 +11,9 @@ set -u
 source ./experimental_helper.sh
 source ./_common.sh
 
+# Source YunoHost helpers
+source /usr/share/yunohost/helpers
+
 ynh_script_progression --message="Loading installation settings..."
 
 
diff --git a/scripts/restore b/scripts/restore
index 4d7fd2e..c4ebcf4 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ../settings/scripts/experimental_helper.sh
+source ../settings/scripts/_common.sh
+
 # Source YunoHost helpers
 source /usr/share/yunohost/helpers
 
 # Stop script if errors
 ynh_abort_if_errors
 
-# Import common cmd
-source ../settings/scripts/experimental_helper.sh
-source ../settings/scripts/_common.sh
-
 ynh_script_progression --message="Loading settings..."
 
 # Retrieve old app settings
@@ -55,6 +55,9 @@ ynh_restore
 ynh_script_progression --message="Protecting directory..."
 set_permission
 
+# register yunohost service
+yunohost service add monitorix
+
 # Reload nginx
 systemctl reload nginx.service
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 9cd754d..a63538d 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -4,16 +4,16 @@
 # GENERIC START
 #=================================================
 
+# Import common cmd
+source ./experimental_helper.sh
+source ./_common.sh
+
 # Source YunoHost helpers
 source /usr/share/yunohost/helpers
 
 # Stop script if errors
 ynh_abort_if_errors
 
-# Import common cmd
-source ./experimental_helper.sh
-source ./_common.sh
-
 ynh_script_progression --message="Loading installation settings..."
 
 # Retrieve app settings
@@ -68,6 +68,9 @@ ynh_secure_remove --file=/usr/share/yunohost/hooks/post_iptable_rules/50-$app
 ynh_script_progression --message="Protecting directory..."
 set_permission
 
+# register yunohost service
+yunohost service add monitorix
+
 # Reload monitorix
 # While we stop monitorix sometime the built-in web server is not stopped cleanly. So are sure that everything is cleanly stoped by that
 # So this fix that