diff --git a/ruby/2.0.0/Dockerfile b/ruby/2.0.0/Dockerfile
index 60c804d..edcf509 100644
--- a/ruby/2.0.0/Dockerfile
+++ b/ruby/2.0.0/Dockerfile
@@ -1,14 +1,23 @@
 FROM debian:jessie
 
-MAINTAINER Ric Lister, rlister@gmail.com
+MAINTAINER Ric Lister <rlister@gmail.com>
 
-RUN apt-get update && apt-get install -y \
-    build-essential zlib1g-dev libssl-dev libreadline6-dev libyaml-dev
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -yq \
+    build-essential \
+    zlib1g-dev \
+    libssl-dev \
+    libreadline6-dev \
+    libyaml-dev
 
-ADD http://cache.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p598.tar.gz /tmp/
+ENV RUBY_MAJOR_VERSION 2.0
+ENV RUBY_VERSION 2.0.0-p645
 
-RUN tar -zxf /tmp/ruby-2.0.0-p598.tar.gz && \
-    (cd ruby-2.0.0-p598 && ./configure --disable-install-doc && make install) && \
-    rm -rf /tmp/ruby-2.0.0-p598.tar.gz && rm -rf ruby-2.0.0-p598
+ADD http://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR_VERSION}/ruby-${RUBY_VERSION}.tar.gz /tmp/
+
+RUN tar -zxf /tmp/ruby-${RUBY_VERSION}.tar.gz && \
+    (cd ruby-${RUBY_VERSION} && ./configure --disable-install-doc && make install) && \
+    rm -rf /tmp/ruby-${RUBY_VERSION}.tar.gz && rm -rf ruby-${RUBY_VERSION}
 
 RUN gem install bundler --no-rdoc --no-ri
diff --git a/ruby/2.1.6/Dockerfile b/ruby/2.1.6/Dockerfile
new file mode 100644
index 0000000..e640ea5
--- /dev/null
+++ b/ruby/2.1.6/Dockerfile
@@ -0,0 +1,23 @@
+FROM debian:jessie
+
+MAINTAINER Ric Lister <rlister@gmail.com>
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -yq \
+    build-essential \
+    zlib1g-dev \
+    libssl-dev \
+    libreadline6-dev \
+    libyaml-dev
+
+ENV RUBY_MAJOR_VERSION 2.1
+ENV RUBY_MINOR_VERSION 2.1.6
+
+ADD http://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR_VERSION}/ruby-${RUBY_MINOR_VERSION}.tar.gz /tmp/
+
+RUN tar -zxf /tmp/ruby-${RUBY_MINOR_VERSION}.tar.gz && \
+    (cd ruby-${RUBY_MINOR_VERSION} && ./configure --disable-install-doc && make install) && \
+    rm -rf /tmp/ruby-${RUBY_MINOR_VERSION}.tar.gz && rm -rf ruby-${RUBY_MINOR_VERSION}
+
+RUN gem install bundler --no-rdoc --no-ri
diff --git a/ruby/2.2.2/Dockerfile b/ruby/2.2.2/Dockerfile
new file mode 100644
index 0000000..6c9fd3b
--- /dev/null
+++ b/ruby/2.2.2/Dockerfile
@@ -0,0 +1,24 @@
+FROM debian:jessie
+
+MAINTAINER Ric Lister <rlister@gmail.com>
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -yq \
+    build-essential \
+    zlib1g-dev \
+    libssl-dev \
+    libreadline6-dev \
+    libyaml-dev \
+    libffi-dev
+
+ENV RUBY_MAJOR_VERSION 2.2
+ENV RUBY_VERSION 2.2.2
+
+ADD http://cache.ruby-lang.org/pub/ruby/${RUBY_MAJOR_VERSION}/ruby-${RUBY_VERSION}.tar.gz /tmp/
+
+RUN tar -zxf /tmp/ruby-${RUBY_VERSION}.tar.gz && \
+    (cd ruby-${RUBY_VERSION} && ./configure --disable-install-doc && make install) && \
+    rm -rf /tmp/ruby-${RUBY_VERSION}.tar.gz && rm -rf ruby-${RUBY_VERSION}
+
+RUN gem install bundler --no-rdoc --no-ri