diff --git a/.travis.yml b/.travis.yml
index 78c43a9..899cb63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 matrix:
   include:
-    - language: go
+    - stage: test
+      language: go
       sudo: false
       go:
        - 1.11.x
@@ -12,8 +13,10 @@ matrix:
        - env GO111MODULE=on go build
        - env GO111MODULE=on go test ./...
 
-    - language: ruby
+    - stage: dockerhub push
+      language: ruby
       services:
         - docker
-      before_install:
-        - docker build -t buckaroobanzay/mapserver .
+      script:
+        - docker build -t buckaroobanzay/mapserver:latest .
+        - docker tag buckaroobanzay/mapserver:latest buckaroobanzay/mapserver:$TRAVIS_TAG