diff --git a/.ahoy/.docker/etc/php5/php-cli.ini b/.ahoy/.docker/etc/php5/php-cli.ini
deleted file mode 100644
index f97dd06d68..0000000000
--- a/.ahoy/.docker/etc/php5/php-cli.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-; PHP CLI settings
-[php]
-; Maximum amount of memory a script may consume
-memory_limit = 512M
-
-[xdebug]
-xdebug_remote_handler=dbgp
-xdebug.remote_port=9000
-xdebug.remote_log="/var/log/xdebug.log"
-xdebug.idekey="PHPSTORM"
-xdebug.show_local_vars=On
-xdebug.var_display_max_data=10000
-xdebug.var_display_max_depth=20
-xdebug.max_nesting_level=200
-xdebug.extended_info=On
diff --git a/.ahoy/docker-compose.common.yml b/.ahoy/docker-compose.common.yml
index 609b563795..8e39d5e548 100644
--- a/.ahoy/docker-compose.common.yml
+++ b/.ahoy/docker-compose.common.yml
@@ -51,7 +51,7 @@ services:
   # Used for all console commands and tools.
   cli:
     hostname: cli
-    image: nuams/drupal-cli:2016-10-16
+    image: getdkan/dkan-docker:php5-cli
     environment:
       - XDEBUG_CONFIG=idekey=PHPSTORM
     env_file:
@@ -66,10 +66,6 @@ services:
     ports:
       - "8888"
     volumes:
-      # PHP configuration overrides
-      - "./.docker/etc/php5/php-cli.ini:/etc/php5/cli/conf.d/z_php.ini"
-      - "./.docker/etc/php5/xdebug-linux.ini:/etc/php5/xdebug-linux.ini"
-      - "./.docker/etc/php5/xdebug-macos.ini:/etc/php5/xdebug-macos.ini"
       # Host SSH keys mapping. Uncomment one of the lines below based on your setup.
       - ~/.ssh:/.ssh
     labels:
diff --git a/.ahoy/docker.ahoy.yml b/.ahoy/docker.ahoy.yml
index 000ace462a..5d303603bf 100644
--- a/.ahoy/docker.ahoy.yml
+++ b/.ahoy/docker.ahoy.yml
@@ -336,13 +336,15 @@ commands:
       case $args in
         start)
         ahoy docker exec web cp -f ${XDEBUG_FILE} /etc/php5/mods-available/xdebug.ini
-        ahoy docker exec cli cp -f ${XDEBUG_FILE} /etc/php5/mods-available/xdebug.ini
+        ahoy docker exec cli phpenmod xdebug
+        ahoy docker exec cli cp -f ${XDEBUG_FILE} /etc/php/5.6/cli/conf.d/${XDEBUG_FILE}
         ahoy docker compose restart web
         ahoy docker compose restart cli
           ;;
         stop)
         ahoy docker exec web rm -f /etc/php5/mods-available/xdebug.ini
-        ahoy docker exec cli rm -f /etc/php5/mods-available/xdebug.ini
+        ahoy docker exec cli phpdismod xdebug
+        ahoy docker exec cli rm -f /etc/php5/mods-available/${XDEBUG_FILE}
         ahoy docker compose restart web
         ahoy docker compose restart cli
           ;;
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7101d6eebc..28dd7c31f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,6 +61,9 @@ jobs:
           name: Setup DKAN
           command: |
             bash dkan-init.sh dkan --deps
+      - restore_cache:
+          keys:
+            - v1-dkan-test-vendor
       - run:
           name: Start containers
           command: |
@@ -71,7 +74,6 @@ jobs:
             docker cp .ahoy.yml $(docker-compose ps -q cli):/var/www
             mkdir -p dkan/test/assets/junit
             docker cp dkan $(docker-compose ps -q cli):/var/www
-            ahoy docker xdebug stop
       - run:
           name: Install Drupal
           command: |
@@ -95,12 +97,8 @@ jobs:
       - run:
           name: Install Test Libs
           command: |
-            ahoy cd-proxy bash dkan/.ahoy/.scripts/composer-install.sh docroot/profiles/dkan/test
-      - save_cache:
-          key: v1-dkan-{{ .Branch }}
-          paths:
-            - ~/.drush
-            - ~/.composer
+            ahoy cmd-proxy bash dkan/.ahoy/.scripts/composer-install.sh docroot/profiles/dkan/test
+            docker cp $(docker-compose ps -q cli):/var/www/dkan/test/vendor dkan/test/vendor
       - save_cache:
           key: v1-dkan-test-vendor
           paths:
@@ -110,6 +108,7 @@ jobs:
           command: ruby dkan/.ahoy/.scripts/circle-behat.rb docroot/profiles/dkan/test/features
       - run:
           name: Copy Assets to Base Image
+          when: on_fail
           command: |
             docker cp $(docker-compose ps -q cli):/var/www/dkan/test/assets assets
       - run: