diff --git a/ubuntu-16.04/scripts/base.sh b/ubuntu-16.04/scripts/base.sh
index 1d69dd3..1bee4b7 100644
--- a/ubuntu-16.04/scripts/base.sh
+++ b/ubuntu-16.04/scripts/base.sh
@@ -9,7 +9,8 @@
 apt-get -y install curl wget tmux vim-nox byobu iputils-ping traceroute htop tree
 
 # 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