diff --git a/.travis.yml b/.travis.yml
index e54208d..5ac38bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,14 @@ os:
 
 language: shell
 
-script:
-  - bash build.sh
+stages:
+  - name: build
+  - name: deploy
+    if: os = linux
+
+jobs:
+  include:
+    - stage: build
+      script: bash build.sh
+    - stage: deploy
+      script: bash manifest.sh
diff --git a/manifest.sh b/manifest.sh
index 7c26ef4..21c2ee0 100755
--- a/manifest.sh
+++ b/manifest.sh
@@ -1,6 +1,12 @@
-docker -D manifest create "exivity/base:latest" `
-  "exivity/base:linux" `
+#!/usr/bin/env bash
+
+# @todo: verify experimental is enabled
+# echo '{ "experimental": "enabled" }' > ~/.docker/config.json
+
+docker -D manifest create "exivity/base:latest" \
+  "exivity/base:linux" \
   "exivity/base:windows"
-docker manifest annotate "exivity/base:latest" "exivity/base:linux" --os linux --arch amd64
-docker manifest annotate "exivity/base:latest" "exivity/base:windows" --os windows --arch amd64
+# @todo: is this needed?
+# docker manifest annotate "exivity/base:latest" "exivity/base:linux" --os linux --arch amd64
+# docker manifest annotate "exivity/base:latest" "exivity/base:windows" --os windows --arch amd64
 docker manifest push "exivity/base:latest"