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 df8a8fe..1570321 100644
--- a/ubuntu-14.04/scripts/base.sh
+++ b/ubuntu-14.04/scripts/base.sh
@@ -6,10 +6,11 @@
 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 extra salt" > /etc/apt/sources.list.d/apt-mk.list
+echo "deb [arch=amd64] http://apt-mk.mirantis.com/trusty/ nightly salt" > /etc/apt/sources.list.d/mcp_salt.list
+echo "deb [arch=amd64] http://apt-mk.mirantis.com/trusty/ nightly extra" > /etc/apt/sources.list.d/mcp_extra.list
 curl -sf http://apt-mk.mirantis.com/public.gpg | apt-key add -
 
 # Cleanup old kernels, ensure latest is installed via virtual package
diff --git a/ubuntu-14.04/scripts/docker.sh b/ubuntu-14.04/scripts/docker.sh
index b49a6ee..00bd3f8 100644
--- a/ubuntu-14.04/scripts/docker.sh
+++ b/ubuntu-14.04/scripts/docker.sh
@@ -3,7 +3,8 @@
 apt-get -y install curl
 
 # Add apt-mk repository
-echo "deb [arch=amd64] http://apt-mk.mirantis.com/trusty/ nightly extra salt" > /etc/apt/sources.list.d/apt-mk.list
+echo "deb [arch=amd64] http://apt-mk.mirantis.com/trusty/ nightly salt" > /etc/apt/sources.list.d/mcp_salt.list
+echo "deb [arch=amd64] http://apt-mk.mirantis.com/trusty/ nightly extra" > /etc/apt/sources.list.d/mcp_extra.list
 curl -sf http://apt-mk.mirantis.com/public.gpg | apt-key add -
 
 apt-get update
diff --git a/ubuntu-16.04/configs/cloud/cloud.cfg.d/99_tcp.cfg b/ubuntu-16.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
index 2f1b85c..7fbc1c8 100644
--- a/ubuntu-16.04/configs/cloud/cloud.cfg.d/99_tcp.cfg
+++ b/ubuntu-16.04/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
+
 system_info:
    # This will affect which distro class gets used
    distro: ubuntu
diff --git a/ubuntu-16.04/scripts/base.sh b/ubuntu-16.04/scripts/base.sh
index 1d69dd3..9b361b7 100644
--- a/ubuntu-16.04/scripts/base.sh
+++ b/ubuntu-16.04/scripts/base.sh
@@ -6,10 +6,11 @@
 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 extra salt" > /etc/apt/sources.list.d/apt-mk.list
+echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial/ nightly salt" > /etc/apt/sources.list.d/mcp_salt.list
+echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial/ nightly extra" > /etc/apt/sources.list.d/mcp_extra.list
 curl -sf http://apt-mk.mirantis.com/public.gpg | apt-key add -
 
 # Cleanup old kernels, ensure latest is installed via virtual package
diff --git a/ubuntu-16.04/scripts/docker.sh b/ubuntu-16.04/scripts/docker.sh
index 05c9b31..4855416 100644
--- a/ubuntu-16.04/scripts/docker.sh
+++ b/ubuntu-16.04/scripts/docker.sh
@@ -4,7 +4,8 @@
 apt-get -y install curl
 
 # Add apt-mk repository
-echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial/ nightly extra salt" > /etc/apt/sources.list.d/apt-mk.list
+echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial/ nightly salt" > /etc/apt/sources.list.d/mcp_salt.list
+echo "deb [arch=amd64] http://apt-mk.mirantis.com/xenial/ nightly extra" > /etc/apt/sources.list.d/mcp_extra.list
 curl -sf http://apt-mk.mirantis.com/public.gpg | apt-key add -
 
 apt-get clean