diff --git a/website/Makefile b/website/Makefile
index b703f68fb..d946f1fc3 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -3,6 +3,11 @@ all: build
 init:
 	bundle
 
+docker-dev:
+	docker run -it --expose 4567 -P -v "$PWD":/usr/src/app -w /usr/src/app ruby:2.3.1 \
+	  bash -c "apt-get update && apt-get -qy install curl git libgmp3-dev nodejs && \
+	  gem install bundler && make dev"
+
 dev: init
 	PACKER_DISABLE_DOWNLOAD_FETCH=true PACKER_VERSION=1.0 bundle exec middleman server
 
diff --git a/website/Vagrantfile b/website/Vagrantfile
index 60d6b5ea2..bd044c27f 100644
--- a/website/Vagrantfile
+++ b/website/Vagrantfile
@@ -5,13 +5,13 @@ $script = <<SCRIPT
 sudo apt-get -y update
 
 # RVM/Ruby
-sudo apt-get -qy install curl git libgmp3-dev
+sudo apt-get -qy install curl git libgmp3-dev nodejs
 gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
 # Install rvm and the latest version of ruby
 curl -sSL https://get.rvm.io | bash -s stable
 . ~/.bashrc
 . ~/.bash_profile
-rvm install ruby-2.2.2
+rvm install ruby-2.3.1
 gem install bundler
 
 # Middleman deps