diff --git a/.travis.yml b/.travis.yml
index 04944e3..2a0560d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,15 +12,20 @@ script: |
   echo No test scripts implemented yet. Travis is used only for deploy yet.
 
 before_deploy: |
-  package/build_all.sh $TRAVIS_TAG
+  if [ -n "$TRAVIS_TAG" ]; then
+    VERSION=$TRAVIS_TAG make override_version
+  fi
+  make package/pypi/*.whl
+  make package/appimage/*.AppImage
+  make package/debian/*.deb
 
 deploy:
   - provider: releases
     api_key:
       secure: zFbsCIKcsvWU/Yc+9k294Qj8QY48VlkV8DSScP5gz6dQegeUSaSHI/YafherkFQ0B03bIY8yc7roMtDo7HAkEnPptjFhdUiOFI11+xDVb3s7Y8Ek2nV3znQzdtR4CR/94l3in6R3DH+eNA6+6Je/NIWLdVcvRX07RBSfBVdPmnsAyAD9KNTsl8Q4c20HgtLNxfWv2s5eCyD+heCTLYrErEZKZ5vYeeANmWomHvT2ED/4QerpBP8wkh59QXD1S79CF7oyq6X173ZJUQVxdBP+OSXt/mDBAoqf+TV6okawRZn48JluvCWAJ7BceX7t9emd1rVI/s8t3wCP+eMcmNn5g/6UJaCPnTJ5YplTuUWRc63UFSkE0AY8WYcRlrz+/OiXYgQ8LMXfN23aWgarHCbS2vHR3Afu9gpLCoKucr36hKhs3zfjJzVLFFW16mnbaTFcBzfDDRpkvOANB1aZwGVRFpTIWIMjkn0+lxWTC/moIJvQlfRPsC4dN5cDAilRQlguHzayebtGE8X0PuIe9A8bkET3V/y+KPnQiSJ7J+5PNoDSdqRAE4IKvVOLEyHtlqBVkvIHKnugUnWPIZ21gm5RemMEj9/YGa8Efwz7PIKtJJ3kFMGDYKVlIKyB+rg/TFWNdo6jjevnWM6y4SfVI3kFyjA+mp31o6nshrQy0zVQpd8=
     file:
-      - package/debian/virtscreen_$TRAVIS_TAG-1_all.deb
-      - package/appimage/VirtScreen-x86_64.AppImage
+      - package/debian/*.deb
+      - package/appimage/*.AppImage
     skip_cleanup: true
     on:
       tags: true
diff --git a/Makefile b/Makefile
index 64cf5e9..29c78dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 # See https://packaging.python.org/tutorials/distributing-packages/#packaging-your-project
 # for python packaging reference.
+VERSION ?= 0.2.4
 
 DOCKER_NAME=kbumsik/virtscreen
 DOCKER_RUN=docker run --interactive --tty -v $(shell pwd):/app $(DOCKER_NAME)
@@ -78,5 +79,24 @@ arch-clean:
 	cd package/archlinux
 	-rm -rf pkg src *.tar* .SRCINFO
 
+# Override version
+.PHONY: override-version
+
+override-version:
+	# Update python setup.py
+	perl -pi -e "s/version=\'\d+\.\d+\.\d+\'/version=\'$(VERSION)\'/" \
+			setup.py
+	# Update .json files in the module
+	perl -pi -e "s/\"version\"\s*\:\s*\"\d+\.\d+\.\d+\"/\"version\"\: \"$(VERSION)\"/" \
+			virtscreen/assets/data.json
+	perl -pi -e "s/\"version\"\s*\:\s*\"\d+\.\d+\.\d+\"/\"version\"\: \"$(VERSION)\"/" \
+			virtscreen/assets/config.default.json
+	# Arch AUR
+	perl -pi -e "s/pkgver=\d+\.\d+\.\d+/pkgver=$(VERSION)/" \
+			package/archlinux/PKGBUILD
+	# Debian
+	perl -pi -e "s/PKGVER=\d+\.\d+\.\d+/PKGVER=$(VERSION)/" \
+			package/debian/_common.sh
+
 # Clean packages
 clean: appimage-clean arch-clean deb-clean wheel-clean
diff --git a/package/build_all.sh b/package/build_all.sh
deleted file mode 100755
index 69004a2..0000000
--- a/package/build_all.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Get parameters. Just return 0 if no parameter passed
-if [ -n "$1" ]; then
-    VERSION=$1
-else
-    exit 0
-fi
-
-# Directory
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ROOT=$DIR/..
-
-override_version () {
-    # Update python setup.py
-    perl -pi -e "s/version=\'\d+\.\d+\.\d+\'/version=\'$VERSION\'/" \
-    		$ROOT/setup.py
-    # Update .json files in the module
-    perl -pi -e "s/\"version\"\s*\:\s*\"\d+\.\d+\.\d+\"/\"version\"\: \"$VERSION\"/" \
-    		$ROOT/virtscreen/assets/data.json
-    perl -pi -e "s/\"version\"\s*\:\s*\"\d+\.\d+\.\d+\"/\"version\"\: \"$VERSION\"/" \
-    		$ROOT/virtscreen/assets/config.default.json
-    # Arch AUR
-    perl -pi -e "s/pkgver=\d+\.\d+\.\d+/pkgver=$VERSION/" \
-    		$ROOT/package/archlinux/PKGBUILD
-    # Debian
-    perl -pi -e "s/PKGVER=\d+\.\d+\.\d+/PKGVER=$VERSION/" \
-    		$ROOT/package/debian/_common.sh
-}
-
-build_pypi () {
-    make -C $ROOT package/pypi/virtscreen-$VERSION-py2.py3-none-any.whl
-}
-
-build_appimage () {
-    make -C $ROOT package/appimage/VirtScreen-x86_64.AppImage
-}
-
-build_debian () {
-    make -C $ROOT package/debian/virtscreen_$VERSION-1_all.deb
-}
-
-override_version
-build_pypi
-build_appimage
-build_debian