diff --git a/.gitignore b/.gitignore
index cb300fb..1859c6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,5 @@ node_modules
 bower_components
 composer.lock
 package-lock.json
-typo3
+web
 vendor
diff --git a/.travis.yml b/.travis.yml
index 932656a..906876e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,44 @@
+dist: trusty
+sudo: false
 language: php
 
-php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.2
+cache:
+  directories:
+    - $HOME/.composer/cache
 
 install:
-  - composer install
+  - composer require typo3/cms="$TYPO3_VERSION"
 
-script:
-  - composer lint
-  - composer cgl
-  - composer test
+jobs:
+  include:
+    - php: 7.1
+      env: TYPO3_VERSION=^8.7
+    - php: 7.2
+      env: TYPO3_VERSION=^8.7
+
+    - stage: test
+      script:
+        - composer lint
+        - composer cgl
+        - composer test
+
+    - stage: deploy
+      if: tag IS present
+      php: 7.1
+      before_install: skip
+      install: skip
+      before_script: skip
+      script: |
+        echo -e "Preparing upload of release ${TRAVIS_TAG} to TER\n"
+
+        TAG_ANNOTATION="$(git tag -n -l $TRAVIS_TAG)"
+        TAG_MESSAGE="${TAG_ANNOTATION#* }"
+
+        git reset --hard
+        git clean -xfd
+
+        export PATH=$PATH:$(composer global config bin-dir --absolute 2>/dev/null)
+        composer global require helhum/ter-client dev-master
+
+        echo "Uploading release ${TRAVIS_TAG} to TER"
+        ter-client upload $(composer config extra.typo3/cms.extension-key) . -u "$TYPO3_ORG_USERNAME" -p "$TYPO3_ORG_PASSWORD" -m "$TAG_MESSAGE"
diff --git a/composer.json b/composer.json
index 1300dd2..a7649a4 100644
--- a/composer.json
+++ b/composer.json
@@ -25,12 +25,6 @@
         "typo3/cms": "^8.7.0",
         "typo3/testing-framework": "^1.2.2"
     },
-    "extra": {
-        "typo3/cms": {
-            "cms-package-dir": "{$vendor-dir}/typo3/cms",
-            "web-dir": "typo3"
-        }
-    },
     "scripts": {
         "lint": [
             "! find Classes -type f -name \"*.php\" -exec php -d error_reporting=32767 -l {} \\; 2>&1 >&- | grep \"^\"",
@@ -40,10 +34,21 @@
             "./vendor/bin/phpcs"
         ],
         "test": [
-            "TYPO3_PATH_ROOT=typo3 ./vendor/bin/phpunit"
+            "TYPO3_PATH_ROOT=web ./vendor/bin/phpunit"
         ],
         "post-install-cmd": [
             "npm install"
         ]
+    },
+    "replace": {
+        "mjml": "self.version",
+        "typo3-ter/mjml": "self.version"
+    },
+    "extra": {
+        "typo3/cms": {
+            "extension-key": "mjml",
+            "cms-package-dir": "{$vendor-dir}/typo3/cms",
+            "web-dir": "web"
+        }
     }
 }