diff --git a/github.sh b/github.sh
index 17ecbb8f1019e8a078fe7dc6e923cb277031b897..7310af7bea49df98218a3a45cc79362adebc19b3 100755
--- a/github.sh
+++ b/github.sh
@@ -10,30 +10,36 @@ fi
 
 ### Get version to release
 current=`grep -P "version\": \"\d+.\d+.\d+(\w*)" package.json | grep -oP "\d+.\d+.\d+(\w*)"`
+if [[ "_$version" != "_" ]]; then
+  echo "ERROR: Unable to read 'version' in the file 'package.json'."
+  echo " - Make sure the file 'package.json' exists and is readable."
+  exit 1
+fi
 echo "Current version: $current"
 
 ### Get repo URL
+PROJECT_NAME=cesium2
 REMOTE_URL=`git remote -v | grep -P "push" | grep -oP "(https:\/\/github.com\/|git@github.com:)[^ ]+"`
 REPO=`echo $REMOTE_URL | sed "s/https:\/\/github.com\///g" | sed "s/git@github.com://g" | sed "s/.git$//"`
-REPO='duniter/cesium2'
-REPO_URL=https://api.github.com/repos/$REPO
-
+REPO="duniter/${PROJECT_NAME}"
+REPO_API_URL=https://api.github.com/repos/$REPO
+REPO_PUBLIC_URL=https://github.com/$REPO
 
 ###  get auth token
-GITHUB_TOKEN=`cat ~/.config/cesium/.github`
+GITHUB_TOKEN=`cat ~/.config/${PROJECT_NAME}/.github`
 if [[ "_$GITHUB_TOKEN" != "_" ]]; then
     GITHUT_AUTH="Authorization: token $GITHUB_TOKEN"
 else
-    echo "Unable to find github authentication token file: "
+    echo "ERROR: Unable to find github authentication token file: "
     echo " - You can create such a token at https://github.com/settings/tokens > 'Generate a new token'."
-    echo " - Then copy the token and paste it in the file '~/.config/cesium/.github' using a valid token."
+    echo " - Then copy the token and paste it in the file '~/.config/${PROJECT_NAME}/.github' using a valid token."
     exit 1
 fi
 
 case "$1" in
   del)
-    result=`curl -i "$REPO_URL/releases/tags/v$current"`
-    release_url=`echo "$result" | grep -P "\"url\": \"[^\"]+"  | grep -oP "$REPO_URL/releases/\d+"`
+    result=`curl -i "$REPO_API_URL/releases/tags/v$current"`
+    release_url=`echo "$result" | grep -P "\"url\": \"[^\"]+"  | grep -oP "$REPO_API_URL/releases/\d+"`
     if [[ $release_url != "" ]]; then
         echo "Deleting existing release..."
         curl -H 'Authorization: token $GITHUB_TOKEN'  -XDELETE $release_url
@@ -51,7 +57,7 @@ case "$1" in
 
       description=`echo $2`
 
-      result=`curl -s -H ''"$GITHUT_AUTH"'' "$REPO_URL/releases/tags/v$current"`
+      result=`curl -s -H ''"$GITHUT_AUTH"'' "$REPO_API_URL/releases/tags/v$current"`
       release_url=`echo "$result" | grep -P "\"url\": \"[^\"]+" | grep -oP "https://[A-Za-z0-9/.-]+/releases/\d+"`
       if [[ "_$release_url" != "_" ]]; then
         echo "Deleting existing release... $release_url"
@@ -68,7 +74,7 @@ case "$1" in
       echo "Creating new release..."
       echo " - tag: v$current"
       echo " - description: $description"
-      result=`curl -H ''"$GITHUT_AUTH"'' -s $REPO_URL/releases -d '{"tag_name": "v'"$current"'","target_commitish": "master","name": "'"$current"'","body": "'"$description"'","draft": false,"prerelease": '"$prerelease"'}'`
+      result=`curl -H ''"$GITHUT_AUTH"'' -s $REPO_API_URL/releases -d '{"tag_name": "v'"$current"'","target_commitish": "master","name": "'"$current"'","body": "'"$description"'","draft": false,"prerelease": '"$prerelease"'}'`
       
       upload_url=`echo "$result" | grep -P "\"upload_url\": \"[^\"]+"  | grep -oP "https://[A-Za-z0-9/.-]+"`
 
@@ -84,11 +90,24 @@ case "$1" in
       dirname=`pwd`
 
       echo "Sending web build..."
-      curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: application/zip' -T $dirname/dist/cesium2.zip $upload_url?name=cesium2-v$current-web.zip
+      if [[ -f "$dirname/www/${PROJECT_NAME}.zip" ]]; then
+        curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: application/zip' -T $dirname/www/${PROJECT_NAME}.zip $upload_url?name=${PROJECT_NAME}-v$current-web.zip
+        echo " -> OK!"
+      else
+        echo "Could not found web release. Skipping."
+      fi
+
+      echo "Sending Android build..."
+      if [[ -f "$dirname/platforms/android/app/build/outputs/apk/release/app-release.apk" ]]; then
+        curl -s -H ''"$GITHUT_AUTH"'' -H 'Content-Type: application/vnd.android.package-archive' -T $dirname/platforms/android/app/build/outputs/apk/release/app-release.apk $upload_url?name=${PROJECT_NAME}-v$current-android.apk
+        echo " -> OK!"
+      else
+        echo "Could not found Android release. Skipping."
+      fi
 
       echo "-----"
       echo "Successfully uploading files !"
-      echo " -> Release url: https://github.com/$REPO/releases/tag/v$current"
+      echo " -> Release url: $REPO_PUBLIC_URL/releases/tag/v$current"
     else
       echo "Wrong arguments"
       echo "Usage:"
diff --git a/package.json b/package.json
index a3d24af4499cd368775a8429da0a3a75513e7a2e..856f2fb936ddff78bbba3cf11e36df8726b9556e 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "cesium-app",
+  "name": "cesium2",
   "description": "Cesium Wallet for G1 libre currency",
   "version": "2.0.0",
   "author": "contact@e-is.pro",
@@ -160,4 +160,4 @@
   "bugs": {
     "url": "https:///git.duniter.org/clients/cesium-grp/cesium2/issues"
   }
-}
\ No newline at end of file
+}
diff --git a/release.sh b/release.sh
index 78e9dd748bbf77c48b636708c1f2ad6770566b02..2f4f89c7271349da82d8df49371237ec447b52d9 100755
--- a/release.sh
+++ b/release.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 NODEJS_VERSION=10
+PROJECT_NAME=cesium2
 
 ### Control that the script is run on `dev` branch
 branch=`git rev-parse --abbrev-ref HEAD`
@@ -103,7 +104,8 @@ echo "----------------------------------"
 echo "- Creating web artifact..."
 echo "----------------------------------"
 cd $DIRNAME/www
-zip -q -r cesium2.zip .
+test -e "${PROJECT_NAME}.zip" || rm ${PROJECT_NAME}.zip
+zip -q -r ${PROJECT_NAME}.zip .
 if [[ $? -ne 0 ]]; then
     exit 1
 fi