diff --git a/.travis.yml b/.travis.yml
index 9ab8016..a95c09f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,8 @@ before_script:
   - bundle exec hatchet ci:setup
 
 script:
-  - docker build --pull --file $(pwd)/Dockerfile .; docker run --rm -e "STACK=heroku-18" bash $TESTFOLDER
-  - docker build --pull --file $(pwd)/Dockerfile.heroku-18 .; docker run --rm -e "STACK=heroku-18" bash $TESTFOLDER
+  - docker build --pull travis-heroku-16 --file $(pwd)/Dockerfile .; docker run --rm -e "STACK=heroku-16" travis-heroku-16 bash $TESTFOLDER
+  - docker build --pull travis-heroku-18 --file $(pwd)/Dockerfile.heroku-18 .; docker run --rm -e "STACK=heroku-18" travis-heroku-18 bash $TESTFOLDER
 
 jobs:
   include:
@@ -26,15 +26,10 @@ env:
     - TESTFOLDER=test/run-deps
     - TESTFOLDER=test/run-versions
     - TESTFOLDER=test/run-features
-    - DOCKERFILE=Dockerfile.heroku-18
-    - DOCKERFILE=Dockerfile
-    - CI_NODE_INDEX=0
-    - CI_NODE_INDEX=2
   global:
     - HATCHET_RETRIES=3
     - IS_RUNNING_ON_CI=true
     - HATCHET_APP_LIMIT=5
     - HATCHET_DEPLOY_STRATEGY=git
-    - CI_NODE_TOTAL=2
     - secure: yjtlPE5FbVxTKnjUy/tZUBgSEf4qADD3QOxtgziuid73S0U/1IEXlMGFULsQzIjtlHKmHeywZqpVVEpthIH4RuT7uoX1Pb7SSM/g0T8fT3VoEFbFK1uYl0oZQbUS4Klxv9tPiumj8if3m6ULEGIz1X0wZcMOC0tMLwVCnwmap0E=
     - secure: ZeFTHWwnpIKE9nAqs88ocmiQh7bKce84lilGm5J23nf3N6V4wNyLwqlkvsM008WGBCaOg9AUx7ZunasT0ANsR5gLP3eV2UUg7ILdRgV2Gy13eNRFheC4PHdN92RqQ3aKoqlIv2K999xlhVjod0NzhkQQXB6PddfQINbuU7ks6As=