diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 30d1a71..7bc1e2f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,9 +1,7 @@
 repos:
--   repo: git://github.com/detailyang/pre-commit-shell
-    rev: 1.0.4
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
     hooks:
-    - id: shell-lint
--   repo: git://github.com/alphagov/verify-travis-pre-commit-hook
-    sha: master
-    hooks:
-    -   id: travis-yml-lint
+    # -   id: check-yaml
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
diff --git a/.travis.yml b/.travis.yml
index 9075037..99f0697 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,20 +13,21 @@ jobs:
     sudo: false
     script: make check
   - stage: Build Docker Containers
-    script:
-      - docker build --pull --tag heroku-python-build-heroku-18 --file $(pwd)/builds/heroku-18.Dockerfile .
-  - stage: test
-      script: docker run --rm -ti heroku-python-build-heroku-18 bash test/run-deps
-      script: docker run --rm -ti heroku-python-build-heroku-18 bash test/run-versions
-      script: docker run --rm -ti heroku-python-build-heroku-18 bash test/run-features
-  - stages: Hatchet Integration
-      if: branch = master
-      script: "bundle exec rspec"
+    name: Build Heroku 18
+    script: docker build --pull --tag heroku-python-build-heroku-18 --file $(pwd)/builds/heroku-18.Dockerfile .
+  - stage: Test Runs
+    script: docker run --rm heroku-python-build-heroku-18 bash test/run-deps
+    script: docker run --rm heroku-python-build-heroku-18 bash test/run-versions
+    script: docker run --rm heroku-python-build-heroku-18 bash test/run-features
+  - stage: Hatchet Integration
+    if: branch = master
+    name: Run Hatchet
+    script: "bundle exec rspec"
 env:
   global:
-  - HATCHET_RETRIES=3
-  - IS_RUNNING_ON_CI=true
-  - HATCHET_APP_LIMIT=5
-  - HATCHET_DEPLOY_STRATEGY=git
-  - secure: yjtlPE5FbVxTKnjUy/tZUBgSEf4qADD3QOxtgziuid73S0U/1IEXlMGFULsQzIjtlHKmHeywZqpVVEpthIH4RuT7uoX1Pb7SSM/g0T8fT3VoEFbFK1uYl0oZQbUS4Klxv9tPiumj8if3m6ULEGIz1X0wZcMOC0tMLwVCnwmap0E=
-  - secure: ZeFTHWwnpIKE9nAqs88ocmiQh7bKce84lilGm5J23nf3N6V4wNyLwqlkvsM008WGBCaOg9AUx7ZunasT0ANsR5gLP3eV2UUg7ILdRgV2Gy13eNRFheC4PHdN92RqQ3aKoqlIv2K999xlhVjod0NzhkQQXB6PddfQINbuU7ks6As=
+    - HATCHET_RETRIES=3
+    - IS_RUNNING_ON_CI=true
+    - HATCHET_APP_LIMIT=5
+    - HATCHET_DEPLOY_STRATEGY=git
+    - secure: yjtlPE5FbVxTKnjUy/tZUBgSEf4qADD3QOxtgziuid73S0U/1IEXlMGFULsQzIjtlHKmHeywZqpVVEpthIH4RuT7uoX1Pb7SSM/g0T8fT3VoEFbFK1uYl0oZQbUS4Klxv9tPiumj8if3m6ULEGIz1X0wZcMOC0tMLwVCnwmap0E=
+    - secure: ZeFTHWwnpIKE9nAqs88ocmiQh7bKce84lilGm5J23nf3N6V4wNyLwqlkvsM008WGBCaOg9AUx7ZunasT0ANsR5gLP3eV2UUg7ILdRgV2Gy13eNRFheC4PHdN92RqQ3aKoqlIv2K999xlhVjod0NzhkQQXB6PddfQINbuU7ks6As=