diff --git a/.drone.yml b/.drone.yml
index d7004d6..4a253a9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,13 +1,6 @@
-matrix:
-  include:
-    - DOCKER_RUBY_VERSION: 2.2
-      RUBY_IMAGE_TAG: 2.2-3
-
-    - DOCKER_RUBY_VERSION: 1.9.3
-      RUBY_IMAGE_TAG: 1.9.3-3
-
 build:
-  image: abakpress/dind:3
+  image: abakpress/dind-testing
+  pull: true
   privileged: true
   volumes:
     - /home/data/drone/images:/images
@@ -18,11 +11,9 @@ build:
   commands:
     - wrapdocker docker -v
 
-    - if [ ! -e /images/ssh-agent.tar ]; then docker pull whilp/ssh-agent; docker save whilp/ssh-agent > /images/ssh-agent.tar; fi
-    - if [ ! -e /images/ruby_$RUBY_IMAGE_TAG.tar ]; then docker pull abakpress/ruby:$RUBY_IMAGE_TAG; docker save abakpress/ruby:$RUBY_IMAGE_TAG > /images/ruby_$RUBY_IMAGE_TAG.tar; fi
-
-    - docker load -i /images/ssh-agent.tar
-    - docker load -i /images/ruby_$RUBY_IMAGE_TAG.tar
+    - fetch-images
+      --image whilp/ssh-agent
+      --image abakpress/ruby-app:$RUBY_IMAGE_TAG
 
     - dip ssh add -T -v /ssh_keys -k /ssh_keys/id_rsa
     - dip provision
diff --git a/Appraisals b/Appraisals
index 3d9df3b..e17b0cb 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,9 +1,3 @@
-appraise 'rails3.1' do
-  gem 'activerecord', '~> 3.1.12'
-  gem 'actionpack', '~> 3.1.12'
-  gem 'activesupport', '~> 3.1.12'
-end
-
 appraise 'rails3.2' do
   gem 'activerecord', '~> 3.2.0'
   gem 'actionpack', '~> 3.2.0'
diff --git a/Gemfile b/Gemfile
index b8461fb..1c661d1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,9 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in string_tools.gemspec
 gemspec
-
-if RUBY_VERSION < '2'
-  gem 'pry-debugger'
-else
-  gem 'pry-byebug'
-end
diff --git a/Makefile b/Makefile
deleted file mode 100644
index bdc3540..0000000
--- a/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-RAILS_ENV = test
-BUNDLE = RAILS_ENV=${RAILS_ENV} bundle
-BUNDLE_OPTIONS = -j 2
-RSPEC = rspec
-APPRAISAL = appraisal
-
-all: test
-
-test: bundler/install appraisal/install
-	${BUNDLE} exec ${APPRAISAL} ${RSPEC} spec 2>&1
-
-bundler/install:
-	if ! gem list bundler -i > /dev/null; then \
-	  gem install bundler; \
-	fi
-	${BUNDLE} install ${BUNDLE_OPTIONS}
-
-appraisal/install:
-	${BUNDLE} exec ${APPRAISAL} install
-
-clear:
-	rm -rf gemfiles
-	rm -f Gemfile.lock
diff --git a/dip.yml b/dip.yml
index 732ab91..f42542f 100644
--- a/dip.yml
+++ b/dip.yml
@@ -1,8 +1,8 @@
 version: '1'
 
 environment:
-  DOCKER_RUBY_VERSION: 1.9.3
-  RUBY_IMAGE_TAG: 1.9.3-3
+  DOCKER_RUBY_VERSION: 2.2
+  RUBY_IMAGE_TAG: 2.2-latest
   COMPOSE_FILE_EXT: development
   RAILS_ENV: test
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 398dee3..ba35a5d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 
 services:
   app:
-    image: abakpress/ruby:$RUBY_IMAGE_TAG
+    image: abakpress/ruby-app:$RUBY_IMAGE_TAG
     environment:
       - SSH_AUTH_SOCK=/ssh/auth/sock
       - BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION