diff --git a/tools/setup_Debian.sh b/tools/setup_Debian.sh
index 2ea2039693..deb645bd47 100755
--- a/tools/setup_Debian.sh
+++ b/tools/setup_Debian.sh
@@ -57,11 +57,12 @@ source /etc/lsb-release
 echo "deb http://apt.dockerproject.org/repo ubuntu-${DISTRIB_CODENAME} main" | sudo tee /etc/apt/sources.list.d/docker.list
 add_key
 sudo apt-get update
-sudo apt-get -y install --no-install-recommends docker-engine btrfs-tools
+sudo apt-get -y install --no-install-recommends docker-engine
 
 sudo service docker stop
-setup_disk
 if [[ ${DISTRIB_CODENAME} == "trusty" ]]; then
+    sudo apt-get -y install --no-install-recommends btrfs-tools
+    setup_disk
     echo 'DOCKER_OPTS="-s btrfs"' | sudo tee /etc/default/docker
     sudo mount --make-shared /run
     sudo service docker start
@@ -70,7 +71,7 @@ else
     sudo tee /etc/systemd/system/docker.service.d/kolla.conf << EOF
 [Service]
 ExecStart=
-ExecStart=/usr/bin/dockerd --storage-driver btrfs --insecure-registry=127.0.0.1:4000
+ExecStart=/usr/bin/dockerd --storage-driver overlay2 --insecure-registry=127.0.0.1:4000
 MountFlags=shared
 EOF
     sudo systemctl daemon-reload