diff --git a/.travis.yml b/.travis.yml
index 861fb6cbb9..07d66b9fa1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,14 @@
+sudo: required
 language: go
 go_import_path: github.com/ethereum/go-ethereum
-sudo: false
-matrix:
+services: skip
+before_install: skip
+
+jobs:
   include:
-  - os: linux
+  - stage: Build and test
+    os: linux
     dist: trusty
-    sudo: required
     go: 1.9.x
     script:
     - sudo modprobe fuse
@@ -15,7 +18,6 @@ matrix:
     - go run build/ci.go test -coverage
   - os: linux
     dist: trusty
-    sudo: required
     go: '1.10'
     script:
     - sudo modprobe fuse
@@ -23,23 +25,37 @@ matrix:
     - sudo chown root:$USER /etc/fuse.conf
     - go run build/ci.go install
     - go run build/ci.go test -coverage
-  - os: osx
-    go: '1.10'
-    script:
-    - unset -f cd
-    - brew update
-    - brew cask install osxfuse
-    - go run build/ci.go install
-    - go run build/ci.go test -coverage
-  - os: linux
+  - stage: Lint
+    os: linux
+    sudo: false
     dist: trusty
     go: '1.10'
-    env:
-    - lint
     git:
       submodules: false
     script:
     - go run build/ci.go lint
+  - stage: Build and push Docker image
+    services:
+      - docker
+    before_install:
+      - docker build -t tomochain/tomochain .
+      - docker run tomochain/tomochain
+    deploy:
+      provider: script
+      script: bash docker_push.sh
+      on:
+        branch: master
+  - stage: Trigger rebuild of infrastructure image
+    sudo: false
+    script: bash docker_rebuild.sh
+
+stages:
+  - name: Build and test
+  - name: Lint
+  - name: Build and push Docker image
+    if: type != pull_request AND branch = master
+  - name: Trigger rebuild of infrastructure image
+    if: type != pull_request AND branch = master
 
 notifications:
   slack:
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
deleted file mode 100644
index 987c266fd0..0000000000
--- a/docker-compose.test.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: "3.4"
-
-services:
-
-  sut:
-    build: .
-    volumes:
-      - "./docker/docker_tests.sh:/test/docker_tests.sh"
-    entrypoint:
-      - /bin/sh
-      - /test/docker_tests.sh
diff --git a/docker/docker_tests.sh b/docker/docker_tests.sh
deleted file mode 100644
index 8f88919e2d..0000000000
--- a/docker/docker_tests.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-$(tomo --help | grep -q tomo)
diff --git a/docker_push.sh b/docker_push.sh
new file mode 100644
index 0000000000..6008259b92
--- /dev/null
+++ b/docker_push.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+docker tag tomochain/tomochain tomochain/tomochain:latest
+docker tag tomochain/tomochain tomochain/tomochain:$TRAVIS_BUILD_ID
+docker push tomochain/tomochain:latest
+docker push tomochain/tomochain:$TRAVIS_BUILD_ID
diff --git a/docker_rebuild.sh b/docker_rebuild.sh
new file mode 100644
index 0000000000..7b88f346a2
--- /dev/null
+++ b/docker_rebuild.sh
@@ -0,0 +1 @@
+curl -X POST $INFRA_IMAGE_REBUILD_HOOK