diff --git a/.travis.yml b/.travis.yml
index c186926c6e..789b384d83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,9 +40,9 @@ before_install:
   #- docker pull portainer/portainer
   #- sudo docker run -d -p 9000:9000 --name treehouse -v /var/run/docker.sock:/var/run/docker.sock portainer:portainer
   # Add CouchDB Docker
-  - docker pull klaemo/couchdb:2.0.0
+  - docker pull couchdb:2.1.1
   - sudo docker run -d -p 5984:5984 -p 5986:5986 --name planet -v /srv/data/bell:/usr/local/var/lib/couchdb
-    -v /srv/log/bell:/usr/local/var/log/couchdb klaemo/couchdb:2.0.0
+    -v /srv/log/bell:/usr/local/var/log/couchdb couchdb:2.1.1
   - git clone https://github.com/pouchdb/add-cors-to-couchdb.git
   - cd add-cors-to-couchdb
   - npm install
diff --git a/Vagrantfile b/Vagrantfile
index efc79edb42..634d541bf1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,7 +13,7 @@ Vagrant.configure(2) do |config|
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
   config.vm.box = "ole/stretch64"
-  config.vm.box_version = "0.3.1"
+  config.vm.box_version = "0.3.3"
 
   config.vm.hostname = "planet"
 
@@ -84,18 +84,21 @@ Vagrant.configure(2) do |config|
   # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
   # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
-#    docker pull portainer/portainer
-#    sudo docker run -d -p 9000:9000 --name treehouse -v /var/run/docker.sock:/var/run/docker.sock portainer:portainer
+    # Portainer
+    #docker pull portainer/portainer
+    #sudo docker run -d -p 9000:9000 --name treehouse -v /var/run/docker.sock:/var/run/docker.sock portainer:portainer
 
     # Add CouchDB Docker
-    sudo docker run -d -p 5984:5984 -p 5986:5986 --name planet -v /srv/data/bell:/usr/local/var/lib/couchdb -v /srv/log/bell:/usr/local/var/log/couchdb klaemo/couchdb:2.0.0
+    sudo docker run -d -p 5984:5984 -p 5986:5986 --name planet -v /srv/data/bell:/usr/local/var/lib/couchdb -v /srv/log/bell:/usr/local/var/log/couchdb couchdb:2.1.1
     # Install Angular CLI
-    sudo npm install -g @angular/cli
+    #sudo npm install -g @angular/cli
 
     # Add CORS to CouchDB so app has access to databases
-    git clone https://github.com/pouchdb/add-cors-to-couchdb.git
+    #git clone https://github.com/pouchdb/add-cors-to-couchdb.git
+    #cd add-cors-to-couchdb
+    #npm install
     cd add-cors-to-couchdb
-    npm install
+    while ! curl -X GET http://127.0.0.1:5984/_all_dbs ; do sleep 1; done
     node bin.js http://localhost:5984
     cd /vagrant
     # End add CORS to CouchDB
diff --git a/docker/planet-dev.yml b/docker/planet-dev.yml
index ec3e7db850..2337dd331d 100644
--- a/docker/planet-dev.yml
+++ b/docker/planet-dev.yml
@@ -2,7 +2,7 @@ services:
   couchdb:
     expose:
       - 5984
-    image: klaemo/couchdb
+    image: couchdb:2.1.1
     ports:
       - "2200:5984"
       - "2201:5986"
diff --git a/docker/planet.yml b/docker/planet.yml
index 351cb23ea3..70ffd16362 100644
--- a/docker/planet.yml
+++ b/docker/planet.yml
@@ -2,7 +2,7 @@ services:
   couchdb:
     expose:
       - 5984
-    image: klaemo/couchdb
+    image: couchdb:2.1.1
     ports:
       - "2200:5984"
       - "2201:5986"
diff --git a/docker/rpi-planet-dev.yml b/docker/rpi-planet-dev.yml
index 338e13b32b..6232907c13 100644
--- a/docker/rpi-planet-dev.yml
+++ b/docker/rpi-planet-dev.yml
@@ -2,7 +2,7 @@ services:
   couchdb:
     expose:
       - 5984
-    image: treehouses/rpi-couchdb:2.0.0
+    image: treehouses/rpi-couchdb:2.1.1
     ports:
       - "2200:5984"
       - "2201:5986"
diff --git a/docker/rpi-planet.yml b/docker/rpi-planet.yml
index 023cb0b6a7..7c18de4913 100644
--- a/docker/rpi-planet.yml
+++ b/docker/rpi-planet.yml
@@ -2,7 +2,7 @@ services:
   couchdb:
     expose:
       - 5984
-    image: treehouses/rpi-couchdb:2.0.0
+    image: treehouses/rpi-couchdb:2.1.1
     ports:
       - "2200:5984"
       - "2201:5986"