diff --git a/.travis.yml b/.travis.yml
index e8bf9938..b34f218e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,27 @@
 # This provides us with GCC binary support so we can run bash
+dist: trusty
 language: generic
 
 sudo: required
 
 script:
   - ./build.sh
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./scripts/aptRepoUpdater.sh; fi'
-
+  
 before_deploy:
   - export image_name="`echo *.iso`"
   - cat *.iso > "/home/travis/${image_name}"
-
-notifications:
-  slack: fossasia:3pMkQrSogvEMfnu9aJDW2ZYC
+  
+on_success: always
 
 deploy:
   - provider: releases
     skip_cleanup: true
+    overwrite: true
+    tag_name: $TRAVIS_TAG
     api_key:
       secure: "tVVKOMh0dZCrHkAfoqIYJYleJwTwXptumugYVcGi/WDaeFi9o1ROTKVdLXUO2CcAUgWUphWjnckF4uVdKBcCB87Af0hgQBXdpDJ4VSb2FFjjY3Lf5dpR1FTYR6Tqsn821mYM17wtwmO1tlg8zFqd1yysr36wZ0EqzFwBtV2FA0jNfxGtFyyJRZnDcCQqwREc2iIENSt8tE787HbwPaWGBEkpC8zYwNYkQXPgFvTi+Z/6Tnobz7gnk9wQFuzFDymr6sDTQF+2ycfGnJnXDOZjqC5haDZbXop6dR/ru6hwO6U4khQIFHEPMZEEHnocB1gOOSiM9Z/yztmY18X4jzx8gZAMIrdKwYlZzEeVAbnlX0WXfjOFmcKIvaMtdNZg9QJil3ePPq/80uNo4TGUy+04ll6jBqqMf4BTs/dxohLyksxN79iuAplRtEl96ZQG+0VI1B0OE3WjwtcuvcuTW7oZ1sOULY4UsNmIdPpJZqIrQpN4AevRJ6DV844uvJ63Sbdzyu0EjMTp+h+2dWiQnnW4aP0mbYsBGWTj0vM2CD/fHtM9W6oVNqLsF7pEe9fg7d2hYJS7Zkuwco33WHqy4JGvLl9uyzSsy0cueJgwg5DYJ8zWDzhlCbKtEk1kG+eKVj+C5rG4shOMK4zf+0iVn5BCNB5d3OgLpAGJwFx1uqqTMrc="
     file_glob: true # http://stackoverflow.com/a/28579635/1320237
     file: "/home/travis/${image_name}"
     on:
+      tags: true
       branch: master
diff --git a/build.sh b/build.sh
index 59c21a23..1baddf59 100755
--- a/build.sh
+++ b/build.sh
@@ -24,6 +24,9 @@ datafiles="image-${arch}.tar.lzma sources.list"
 # Necessary development tool packages to be installed on build host
 devtools="debootstrap genisoimage p7zip-full squashfs-tools ubuntu-dev-tools"
 
+url_wallpaper="https://meilix-generator.herokuapp.com/uploads/wallpaper" # url heroku wallpaper
+wget $url_wallpaper -P meilix-default-settings/usr/share/meilix/images
+
 # Make sure we have the data files we need
 for i in $datafiles
 do
diff --git a/meilix-default-settings/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf b/meilix-default-settings/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
index 3e352d4a..68eb8a1b 100644
--- a/meilix-default-settings/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
+++ b/meilix-default-settings/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
@@ -4,7 +4,7 @@ su_cmd=gksu %s
 
 [desktop]
 wallpaper_mode=1
-wallpaper=/usr/share/meilix/images/xp_default_wallpaper.jpg
+wallpaper=/usr/share/meilix/images/wallpaper
 desktop_bg=#000000
 desktop_fg=#ffffff
 desktop_shadow=#000000
diff --git a/meilix-default-settings/usr/share/meilix/images/xp_default_wallpaper.jpg b/meilix-default-settings/usr/share/meilix/images/xp_default_wallpaper.jpg
deleted file mode 100644
index 68d062e2..00000000
Binary files a/meilix-default-settings/usr/share/meilix/images/xp_default_wallpaper.jpg and /dev/null differ