diff --git a/debian-8/configs/cloud/cloud.cfg.d/99_tcp.cfg b/debian-8/configs/cloud/cloud.cfg.d/99_tcp.cfg
index dcce367..46420c9 100644
--- a/debian-8/configs/cloud/cloud.cfg.d/99_tcp.cfg
+++ b/debian-8/configs/cloud/cloud.cfg.d/99_tcp.cfg
@@ -3,6 +3,7 @@
     Ec2:
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
+      strict_id: false
     OpenStack:
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
@@ -10,6 +11,9 @@
       timeout: 5 # (defaults to 50 seconds)
       max_wait: 10 # (defaults to 120 seconds)
 
+warnings:
+   dsid_missing_source: off
+
 growpart:
    mode: auto
    devices: ['/']
diff --git a/debian-8/scripts/base.sh b/debian-8/scripts/base.sh
index ebb2c95..504e2e1 100644
--- a/debian-8/scripts/base.sh
+++ b/debian-8/scripts/base.sh
@@ -19,7 +19,7 @@
 apt-get autoremove --purge
 
 # Useful tools
-apt-get -y install curl wget tmux vim-nox byobu iputils-ping traceroute htop tree
+apt-get -y install curl wget tmux vim-nox byobu iputils-ping traceroute htop tree lsof
 
 # Tmux fixes
 cat << 'EOF' >> /etc/tmux.conf
diff --git a/ubuntu-14.04/scripts/base.sh b/ubuntu-14.04/scripts/base.sh
index 0aaa530..1570321 100644
--- a/ubuntu-14.04/scripts/base.sh
+++ b/ubuntu-14.04/scripts/base.sh
@@ -6,7 +6,7 @@
 apt-get update
 
 # Useful tools
-apt-get -y install curl wget tmux vim-nox byobu iputils-ping traceroute htop tree
+apt-get -y install curl wget tmux vim-nox byobu iputils-ping traceroute htop tree lsof
 
 # Add apt-mk repository
 echo "deb [arch=amd64] http://apt-mk.mirantis.com/trusty/ nightly salt" > /etc/apt/sources.list.d/mcp_salt.list
diff --git a/ubuntu-16.04/scripts/base.sh b/ubuntu-16.04/scripts/base.sh
index 1bee4b7..9b361b7 100644
--- a/ubuntu-16.04/scripts/base.sh
+++ b/ubuntu-16.04/scripts/base.sh
@@ -6,7 +6,7 @@
 apt-get update
 
 # Useful tools
-apt-get -y install curl wget tmux vim-nox byobu iputils-ping traceroute htop tree
+apt-get -y install curl wget tmux vim-nox byobu iputils-ping traceroute htop tree lsof
 
 # Add apt-mk repository
 echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial/ nightly salt" > /etc/apt/sources.list.d/mcp_salt.list