diff --git a/manifest.json b/manifest.json
index da95ee8..a8030d2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,20 +1,30 @@
 {
     "name": "Z-Push",
     "id": "z-push",
+    "packaging_format": 1,
     "description": {
         "en": "Z-Push is an open-source application to synchronize ActiveSync",
-        "fr": "Z-Push est un serveur open source de synchronisation ActiveSync" 
+        "fr": "Z-Push est un serveur open source de synchronisation ActiveSync"
     },
-    "developer": {
+    "url": "https://z-push.org",
+    "license": "free",
+    "maintainer": {
         "name": "beudbeud",
-        "email": "beudbeud@beudibox.fr",
-        "url": "https://z-push.org"
+        "email": "beudbeud@beudibox.fr"
     },
-    "multi_instance": "true",
+    "requirements": {
+        "yunohost": ">=2.4.0"
+    },
+    "services": [
+        "nginx",
+        "php5-fpm"
+    ],
+    "multi_instance": true,
     "arguments": {
         "install" : [
             {
                 "name": "domain",
+                "type": "domain",
                 "ask": {
                     "en": "Choose a domain for Z-push",
                     "fr": "Choisissez un domaine pour Z-push"
diff --git a/scripts/install b/scripts/install
index 2b1e248..63f11da 100644
--- a/scripts/install
+++ b/scripts/install
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 # Retrieve arguments
-domain=$1
-path="/Microsoft-Server-ActiveSync"
-app=z-push
+domain=$YNH_APP_ARG_DOMAIN
+path=$YNH_APP_ARG_PATH
+app=$YNH_APP_INSTANCE_NAME
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a $app
diff --git a/scripts/remove b/scripts/remove
index 1870c46..40758fa 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-app=z-push
+app=$YNH_APP_INSTANCE_NAME
 domain=$(sudo yunohost app setting $app domain)
 
 # Cleaning
diff --git a/scripts/upgrade b/scripts/upgrade
index 000757c..2398209 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Retrieve arguments
-app=z-push
+app=$YNH_APP_INSTANCE_NAME
 domain=$(sudo yunohost app setting $app domain)
 path="/Microsoft-Server-ActiveSync"