diff --git a/.travis.yml b/.travis.yml
index b20056e..a89f9a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,17 +20,105 @@ jobs:
     - script: true
       stage: precache
     - stage: build
-      env: DOCKER_REPO="jekyll:3.4.3 jekyll:3.4 jekyll:3 jekyll:stable jekyll:latest"
-    - env: DOCKER_REPO="builder:3.4.3 builder:3.4 builder:3 builder:stable builder:latest jekyll:builder"
-    - env: DOCKER_REPO=jekyll:pages
-    - env: DOCKER_REPO=builder:pages
-    - env: DOCKER_REPO=jekyll:3.3.0
-    - env: DOCKER_REPO=builder:3.3.0
-    - env: DOCKER_REPO=jekyll:3.3.1
-    - env: DOCKER_REPO=builder:3.3.1
-    - env: DOCKER_REPO=jekyll:3.4.0
-    - env: DOCKER_REPO=builder:3.4.0
-    - env: DOCKER_REPO=jekyll:3.4.1
-    - env: DOCKER_REPO=builder:3.4.1
+      env: "\
+        DOCKER_REPO='jekyll:3.5.0 \
+          jekyll:3.5 \
+          jekyll:stable \
+          jekyll:latest \
+          jekyll:3\
+        '\
+      "
+    - env: "\
+        DOCKER_REPO='jekyll:3.4.4 \
+          jekyll:3.4\
+        '\
+      "
+    - env: DOCKER_REPO=jekyll:3.4.3
     - env: DOCKER_REPO=jekyll:3.4.2
+    - env: DOCKER_REPO=jekyll:3.4.1
+    - env: DOCKER_REPO=jekyll:3.4.0
+    - env: "\
+        DOCKER_REPO='jekyll:3.3.1 \
+          jekyll:3.3\
+        '\
+      "
+    - env: DOCKER_REPO=jekyll:3.3.0
+    - env: "\
+        DOCKER_REPO='jekyll:3.2.1 \
+          jekyll:3.2\
+        '\
+      "
+    - env: DOCKER_REPO=jekyll:3.2.0
+    - env: "\
+        DOCKER_REPO='jekyll:3.1.6 \
+          jekyll:3.1\
+        '\
+      "
+    - env: DOCKER_REPO=jekyll:3.1.5
+    - env: DOCKER_REPO=jekyll:3.1.4
+    - env: DOCKER_REPO=jekyll:3.1.3
+    - env: DOCKER_REPO=jekyll:3.1.2
+    - env: DOCKER_REPO=jekyll:3.1.1
+    - env: DOCKER_REPO=jekyll:3.1.0
+    - env: "\
+      DOCKER_REPO='jekyll:3.0.5 \
+        jekyll:3.0\
+      '\
+    "
+    - env: DOCKER_REPO=jekyll:3.0.4
+    - env: DOCKER_REPO=jekyll:3.0.3
+    - env: DOCKER_REPO=jekyll:3.0.2
+    - env: DOCKER_REPO=jekyll:3.0.1
+    - env: DOCKER_REPO=jekyll:3.0.0
+    - env: DOCKER_REPO=jekyll:pages
+    - env: "\
+        DOCKER_REPO='builder:3.5.0 \
+          builder:3.5 \
+          builder:stable \
+          builder:latest \
+          builder:3\
+        '\
+      "
+    - env: "\
+        DOCKER_REPO='builder:3.4.4 \
+          builder:3.4\
+        '\
+      "
+    - env: DOCKER_REPO=builder:3.4.3
     - env: DOCKER_REPO=builder:3.4.2
+    - env: DOCKER_REPO=builder:3.4.1
+    - env: DOCKER_REPO=builder:3.4.0
+    - env: "\
+        DOCKER_REPO='builder:3.3.1 \
+          builder:3.3\
+        '\
+      "
+    - env: DOCKER_REPO=builder:3.3.0
+    - env: "\
+        DOCKER_REPO='builder:3.2.1 \
+          builder:3.2\
+        '\
+      "
+    - env: DOCKER_REPO=builder:3.2.0
+    - env: "\
+        DOCKER_REPO='builder:3.1.6 \
+          builder:3.1\
+        '\
+      "
+    - env: DOCKER_REPO=builder:3.1.5
+    - env: DOCKER_REPO=builder:3.1.4
+    - env: DOCKER_REPO=builder:3.1.3
+    - env: DOCKER_REPO=builder:3.1.2
+    - env: DOCKER_REPO=builder:3.1.1
+    - env: DOCKER_REPO=builder:3.1.0
+    - env: "\
+      DOCKER_REPO='builder:3.0.5 \
+        builder:3.0\
+      '\
+    "
+    - env: DOCKER_REPO=builder:3.0.4
+    - env: DOCKER_REPO=builder:3.0.3
+    - env: DOCKER_REPO=builder:3.0.2
+    - env: DOCKER_REPO=builder:3.0.1
+    - env: DOCKER_REPO=builder:3.0.0
+    - env: DOCKER_REPO=builder:pages
diff --git a/opts.yml b/opts.yml
index c25b49d..e78ce32 100644
--- a/opts.yml
+++ b/opts.yml
@@ -1,27 +1,42 @@
 maintainer: Jordon Bedwell <jordon@envygeeks.io>
 user: jekyll
 tags:
-  3.3.0: stable
-  3.3.1: stable
-  3.4.0: stable
-  3.4.1: stable
-  3.4.2: stable
+  3.5.0: stable
+  3.4.4: stable
   3.4.3: stable
+  3.4.2: stable
+  3.4.1: stable
+  3.4.0: stable
+  3.3.1: stable
+  3.3.0: stable
+  3.2.1: stable
+  3.2.0: stable
+  3.1.6: stable
+  3.1.5: stable
+  3.1.4: stable
+  3.1.3: stable
+  3.1.2: stable
+  3.1.0: stable
+  3.0.5: stable
+  3.0.4: stable
+  3.0.3: stable
+  3.0.2: stable
+  3.0.1: stable
+  3.0.0: stable
   pages: pages
 aliases:
-  latest: 3.4.3
-  stable: 3.4.3
-  3.4: 3.4.3
-  3: 3.4.3
+  latest: 3.5.0
+  stable: 3.5.0
+  3.5: 3.5.0
+  3.4: 3.4.4
+  3.3: 3.3.1
+  3.2: 3.2.1
+  3.1: 3.1.6
+  3.0: 3.0.5
+  3: 3.5.0
 releases:
   tag:
-    pages: 3.3.1
-    3.3.0: 3.3.0
-    3.3.1: 3.3.1
-    3.4.0: 3.4.0
-    3.4.1: 3.4.1
-    3.4.2: 3.4.2
-    3.4.3: 3.4.3
+    pages: 3.4.3
 gems:
   all: &gems
     - html-proofer
diff --git a/repos/jekyll/Dockerfile b/repos/jekyll/Dockerfile
index 72bb635..d135747 100644
--- a/repos/jekyll/Dockerfile
+++ b/repos/jekyll/Dockerfile
@@ -1,8 +1,11 @@
 FROM envygeeks/alpine
-LABEL maintainer "Jekyll Core <hello@jekyllrb.com>"
+LABEL maintainer "Jordon Bedwell <jordon@envygeeks.io>"
+LABEL jekyll.version "<%= @meta.release?? @meta.release : @meta.tag %>"
+LABEL jekyll.tag "<%= @meta.tag %>"
 COPY copy/ /
 ENV LANGUAGE=en_US
 ENV LANG=en_US.UTF-8
+ENV JEKYLL_VERSION=<%= @meta.release?? @meta.release : @meta.tag %>
 ENV JEKYLL_ENV=development
 ENV LC_ALL=en_US
 <% if @meta.env? %>
@@ -20,7 +23,7 @@ RUN apk --update add zlib-dev build-base libxml2-dev libxslt-dev readline-dev \
   RUN apk --update add <%= @meta.packages %>
 <% end %>
 
-RUN gem install --no-ri --no-rdoc jekyll -v<%= @meta.release %>
+RUN gem install --no-ri --no-rdoc jekyll -v<%= @meta.release?? @meta.release : @meta.tag %>
 RUN addgroup -Sg 1000 jekyll && adduser -Su 1000 -g 1000 jekyll
 
 <% if @meta.gems? %>