diff --git a/Makefile b/Makefile
index ebbb7a3..32638f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,12 @@
 Appname:=$(shell cat appname.txt)
 prefix:=/usr
 temp:=/tmp/fpm-jolla
-sdkpath:=$(HOME)/SailfishOS
 sourcePath:=$(shell pwd)
 dependencies=$(shell for file in `cat dependencies.txt`;do echo "-d "$${file};done;)
-arch:=armv7hl
 version:=0.5.0
-iteration:=1
-rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
-ssh_user:=defaultuser
-jolla_usb_ip:=192.168.2.15
-jolla_wifi_ip:=192.168.100.34
+iteration:=9
 
-
-all: clean build-tmp rpm-virt rpm-jolla
-
-make-jolla-usb: build-tmp rpm-jolla send-jolla-usb
-make-jolla-wifi: build-tmp rpm-jolla send-jolla-wifi
-make-jolla-ap: build-tmp rpm-jolla send-jolla-ap
-make-virt: arch:=i686
-make-virt: build-tmp rpm-virt send-virt
+all: clean build-tmp rpm-i686 rpm-jolla rpm-aarch64
 
 build-tmp:
 	mkdir -p $(temp)/usr/share/applications
@@ -32,9 +19,9 @@ build-tmp:
 	cp -ar ./dat/appicon.png $(temp)/usr/share/icons/hicolor/86x86/apps/$(Appname).png
 	install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname)
 
-rpm-virt: arch:=i686
-rpm-virt: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
-rpm-virt: build-tmp
+rpm-i686: arch:=i686
+rpm-i686: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
+rpm-i686: build-tmp
 	cd $(temp);fpm -f -s dir -t rpm \
 		--after-install $(sourcePath)/dat/upgradeScript.sh \
 		--after-remove $(sourcePath)/dat/removeScript.sh \
@@ -48,6 +35,8 @@ rpm-virt: build-tmp
 		-a $(arch) \
 		--prefix / *
 
+rpm-jolla: arch:=armv7hl
+rpm-jolla: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
 rpm-jolla: build-tmp
 	cd $(temp);fpm -f -s dir -t rpm \
 		--after-install $(sourcePath)/dat/upgradeScript.sh \
@@ -62,36 +51,23 @@ rpm-jolla: build-tmp
 		-a $(arch) \
 		--prefix / *
 
-send-virt:
-	cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/nemo' -p2223 $(ssh_user)@localhost \
-		cat ">" /tmp/$(rpmname) "&&" \
-		pkcon install-local -y /tmp/$(rpmname) "&&" \
-		rm /tmp/$(rpmname)
-
-send-jolla-wifi:
-	cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_wifi_ip) \
-		cat ">" /tmp/$(rpmname) "&&" \
-		pkcon install-local -y /tmp/$(rpmname) "&&" \
-		rm /tmp/$(rpmname)
-
-send-jolla-ap: jolla_wifi_ip:=192.168.1.1
-send-jolla-ap:
-	cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_wifi_ip) \
-		cat ">" /tmp/$(rpmname) "&&" \
-		pkcon install-local -y /tmp/$(rpmname) "&&" \
-		rm /tmp/$(rpmname)
-
-send-jolla-usb:
-	cat $(temp)/$(rpmname) | ssh $(ssh_user)@$(jolla_usb_ip) \
-		cat ">" /tmp/$(rpmname) "&&" \
-		pkcon install-local -y /tmp/$(rpmname) "&&" \
-		rm /tmp/$(rpmname)
-
-send-only-virt:
-	cat $(temp)/$(rpmname) | ssh -i '$(sdkpath)/vmshare/ssh/private_keys/SailfishOS_Emulator/nemo' -p2223 $(ssh_user)@localhost \
-		cat ">" /tmp/$(rpmname)
+rpm-aarch64: arch:=aarch64
+rpm-aarch64: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm
+rpm-aarch64: build-tmp
+	cd $(temp);fpm -f -s dir -t rpm \
+		--after-install $(sourcePath)/dat/upgradeScript.sh \
+		--after-remove $(sourcePath)/dat/removeScript.sh \
+		--rpm-changelog $(sourcePath)/changelog.txt \
+		--directories "/usr/share/$(Appname)" \
+		-v $(version) \
+		--iteration $(iteration) \
+		$(dependencies) \
+		-p $(temp)/$(rpmname) \
+		-n $(Appname) \
+		-a $(arch) \
+		--prefix / *
 
 clean:
 	rm -rf $(temp)
 	rm -rf $(builddir)
-	rm -rf ./$(rpmname)
+	rm -rf ./$(Appname)-$(version)-$(iteration)*
diff --git a/README.md b/README.md
index b275f70..cd45383 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Make your webapps icons in the app box look better with the rest of your native
 
 ## Build dependencies
 - [fpm](https://github.com/jordansissel/fpm)
+- [rpm-tools](http://rpm.org/)
 
 ## Build your own RPM package
 1. Clone the repository: `git clone https://gitlab.com/kirbylife/harbour-muchkin`
@@ -16,13 +17,14 @@ Make your webapps icons in the app box look better with the rest of your native
 1. Build the package.
   1. armv7hl: `make rpm-jolla`
   1. i686: `make rpm-virt`
-  1. aarch64: `soon`
+  1. aarch64: `make rpm-aarch64`
 1. the .rpm file will be on `/tmp/fpm-jolla/`
 
 ## TO-DO
-- [ ] Make betters Make commands
 - [x] Support to aarch64 arquitecture
 - [x] Choice non-transparent color to fill the empty spaces
+- [x] Fix the issue with sailjail
+- [ ] Make betters Make commands
 - [ ] Add option to request favicon
 - [ ] Add option to restore the original icon
 - [ ] Make all icons in the main grid the same size
diff --git a/dat/upgradeScript.sh b/dat/upgradeScript.sh
index 998baff..6012e3e 100644
--- a/dat/upgradeScript.sh
+++ b/dat/upgradeScript.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
 
 #rm -rf /usr/share/harbour-muchkin
-echo "Upgrading...."
-
+echo "Upgrading..."