diff --git a/.travis.yml b/.travis.yml
index 877c173f..df981074 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,41 +18,15 @@ script:
   - make test-coverage
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - make codecov
 
 jobs:
   include:
     - stage: deploy
-      os: osx
-      go: 1.9
-      after_success:
-        - gzip -S .darwin_amd64.gz $GOPATH/bin/multitool
-        - tar -czf $GOPATH/bin/borges-indexer.darwin_amd64.tar.gz -C $GOPATH/bin borges-indexer set-forks
-        - gzip -S .darwin_amd64.gz $GOPATH/bin/pga
-      install:
-        - go get -v github.com/src-d/datasets/PublicGitArchive/multitool/...
-        - go get -v github.com/src-d/datasets/PublicGitArchive/borges-indexer/...
-        - go get -v github.com/src-d/datasets/PublicGitArchive/pga/...
-      script: skip
-      deploy:
-        provider: releases
-        api_key:
-          secure: $GITHUB_TOKEN
-        file:
-          - "$GOPATH/bin/multitool.darwin_amd64.gz"
-          - "$GOPATH/bin/borges-indexer.darwin_amd64.tar.gz"
-          - "$GOPATH/bin/pga.darwin_amd64.gz"
-        skip_cleanup: true
-        on:
-          tags: true
-    - stage: deploy
+      if: tag IS present
       os: linux
-      go: 1.9
-      install:
-        - go get -v github.com/src-d/datasets/PublicGitArchive/multitool/...
-        - go get -v github.com/src-d/datasets/PublicGitArchive/borges-indexer/...
-        - go get -v github.com/src-d/datasets/PublicGitArchive/pga/...
-      script: skip
+      go: 1.10.x
+      script: make packages
       after_success:
         - gzip -S .linux_amd64.gz $GOPATH/bin/multitool
         - tar -czf $GOPATH/bin/borges-indexer.linux_amd64.tar.gz -C $GOPATH/bin borges-indexer set-forks
@@ -61,13 +35,9 @@ jobs:
         provider: releases
         api_key:
           secure: $GITHUB_TOKEN
-        file:
-          - "$GOPATH/bin/multitool.linux_amd64.gz"
-          - "$GOPATH/bin/borges-indexer.linux_amd64.tar.gz"
-          - "$GOPATH/bin/pga.linux_amd64.gz"
+        file_glob: true
+        file: build/*.tar.gz
         skip_cleanup: true
-        on:
-          tags: true
 
 notifications:
   email: false
diff --git a/Makefile b/Makefile
index 2e4103b2..e342d15b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
 # Package configuration
 PROJECT = datasets
-COMMANDS = datasets/PublicGitArchive/borges-indexer/cmd/borges-indexer datasets/PublicGitArchive/multitool datasets/PublicGitArchive/pga
+COMMANDS = PublicGitArchive/borges-indexer/cmd/borges-indexer PublicGitArchive/multitool PublicGitArchive/pga
 
 # Including ci Makefile
 CI_REPOSITORY ?= https://github.com/src-d/ci.git
 CI_PATH ?= $(shell pwd)/.ci
 CI_VERSION ?= v1
-PKG_OS=linux darwin windows
+PKG_OS = linux darwin windows
 
 MAKEFILE := $(CI_PATH)/Makefile.main
 $(MAKEFILE):
 	git clone --quiet --branch $(CI_VERSION) --depth 1 $(CI_REPOSITORY) $(CI_PATH);
 
--include $(MAKEFILE)
\ No newline at end of file
+-include $(MAKEFILE)