diff --git a/.travis.yml b/.travis.yml
index 78dc3427..9764ffc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,30 @@ language: bash
 dist: trusty
 
 env:
-  - VERSION=9.2-jre8
-  - VERSION=9.3-jre8
+  - VERSION=11.0-jre11-slim
+  - VERSION=11.0-jre11
+  - VERSION=11.0-jdk14-slim
+  - VERSION=11.0-jdk14
+  - VERSION=11.0-jdk11-slim
+  - VERSION=11.0-jdk11
+  - VERSION=10.0-jre11-slim
+  - VERSION=10.0-jre11
+  - VERSION=10.0-jdk14-slim
+  - VERSION=10.0-jdk14
+  - VERSION=10.0-jdk11-slim
+  - VERSION=10.0-jdk11
+  - VERSION=9.4-jre8-slim
   - VERSION=9.4-jre8
+  - VERSION=9.4-jre11-slim
   - VERSION=9.4-jre11
+  - VERSION=9.4-jdk8-slim
+  - VERSION=9.4-jdk8
+  - VERSION=9.4-jdk14-slim
+  - VERSION=9.4-jdk14
+  - VERSION=9.4-jdk11-slim
+  - VERSION=9.4-jdk11
+  - VERSION=9.3-jre8
+  - VERSION=9.2-jre8
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
@@ -15,8 +35,8 @@ install:
 before_script:
   - env | sort
   - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
-  - cd "${VERSION}${VARIANT:+/$VARIANT}"
-  - image="jetty:${VERSION}${VARIANT:+-$VARIANT}"
+  - cd "${VERSION}"
+  - image="jetty:${VERSION}"
 
 script:
   - docker build --pull -t "$image" .
diff --git a/generateTravis.sh b/generateTravis.sh
new file mode 100755
index 00000000..d23fb68a
--- /dev/null
+++ b/generateTravis.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Generate Travis CI Build Directories
+buildDirs=( $(ls | egrep '^[0-9]' | sort -nr) )
+
+cat <<-EOH
+---
+language: bash
+
+dist: trusty
+
+env:
+`printf '  - VERSION=%s\n' "${buildDirs[@]}"`
+
+install:
+  - git clone https://github.com/docker-library/official-images.git ~/official-images
+
+before_script:
+  - env | sort
+  - wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
+  - cd "\${VERSION}"
+  - image="jetty:\${VERSION}"
+
+script:
+  - docker build --pull -t "\$image" .
+  - ~/official-images/test/run.sh "\$image"
+EOH
diff --git a/update.sh b/update.sh
index 411b586f..a7994785 100755
--- a/update.sh
+++ b/update.sh
@@ -16,12 +16,19 @@ greaterThanOrEqualTo9.4 ()
 	fi
 }
 
+# Update the Travis CI Build Directories
+if ! command -v ./generateTravis.sh >/dev/null 2>&1 ; then
+    echo "WARNING: Run update script from the jetty.docker project directory to update the Travis CI file."
+else
+    ./generateTravis.sh > .travis.yml
+fi
+
+# Update the docker files and scripts for every directory in paths.
 paths=( "$@" )
 if [ ${#paths[@]} -eq 0 ]; then
-	paths=( */ )
+	paths=( $(ls | egrep '^[0-9]' | sort -nr) )
 fi
 paths=( "${paths[@]%/}" )
-paths=($(echo "${paths[@]}" | sed 's/ /\n/g' | grep -v '^[^0-9]'))
 
 MAVEN_METADATA_URL='https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/maven-metadata.xml'
 available=( $( curl -sSL "$MAVEN_METADATA_URL" | grep -Eo '<(version)>[^<]*</\1>' | awk -F'[<>]' '{ print $3 }' | sort -Vr ) )