diff --git a/.travis.yml b/.travis.yml
index 4f6147ee..380a5483 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,12 @@
-sudo: false # force container-based builds (no start-up time!)
-
-dist: trusty # force 14.04 trusty build
-
 language: python
 
 cache: pip # enable cache for "$HOME/.cache/pip" directory
 
+env:
+  global:
+  - ENCRYPTION_LABEL: ec68c19ba263
+
+
 before_install:
   - export CFLAGS=-O0 # considerably speed-up build time for pip packages (especially lxml), optimizations doesn't matter for ci
   - pip install PyYAML
@@ -19,15 +20,6 @@ script: bash ./.ci/deploy.sh
 after_script:
   - sleep 10 # helps travis finish logging
 
-notifications:
-  email: false
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/691b9acffe1def5f9d6b
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: change  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
-
 
 # Builds for pull requests skip the deployment step altogether
 deploy:
@@ -65,7 +57,11 @@ deploy:
       condition: $TRAVIS_TAG =~ ^[0-9]     # regex to skip automatically added "untagged" tags from continious deployment "Current output"
 
 
-env:
-  global:
-  - ENCRYPTION_LABEL: ec68c19ba263
-  - COMMIT_AUTHOR_EMAIL: you@example.com
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/691b9acffe1def5f9d6b
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: change  # options: [always|never|change] default: always
+    on_start: never     # options: [always|never|change] default: always