diff --git a/cluster/aws/templates/format-disks.sh b/cluster/aws/templates/format-disks.sh
index 5efb17c4f32..adebf1568b8 100644
--- a/cluster/aws/templates/format-disks.sh
+++ b/cluster/aws/templates/format-disks.sh
@@ -55,12 +55,6 @@ docker_storage=${DOCKER_STORAGE:-aufs}
 if [[ ${#block_devices[@]} == 0 ]]; then
   echo "No ephemeral block devices found; will use aufs on root"
   docker_storage="aufs"
-
-  # Install aufs kernel module (for ubuntu)
-  apt-get install --yes linux-image-extra-$(uname -r)
-
-  # Install aufs tools (for debian)
-  apt-get install --yes aufs-tools
 else
   echo "Block devices: ${block_devices[@]}"
 
@@ -174,6 +168,9 @@ elif [[ ${docker_storage} == "aufs-nolvm" || ${docker_storage} == "aufs" ]]; the
   # Install aufs kernel module
   apt-get install --yes linux-image-extra-$(uname -r)
 
+  # Install aufs tools
+  apt-get install --yes aufs-tools
+
   DOCKER_OPTS="${DOCKER_OPTS} -s aufs"
 elif [[ ${docker_storage} == "devicemapper" ]]; then
   DOCKER_OPTS="${DOCKER_OPTS} -s devicemapper"