diff --git a/ubuntu-16.04/scripts/salt.sh b/ubuntu-16.04/scripts/salt.sh
index eba5bca..b1a1389 100644
--- a/ubuntu-16.04/scripts/salt.sh
+++ b/ubuntu-16.04/scripts/salt.sh
@@ -4,10 +4,19 @@
 SALTSTACK_GPG=${SALTSTACK_GPG:-"https://mirror.mirantis.com/proposed/saltstack-2017.7/xenial/SALTSTACK-GPG-KEY.pub"}
 
 wget -O - ${SALTSTACK_GPG} | sudo apt-key add -
-echo "${SALTSTACK_REPO}" > /etc/apt/sources.list.d/saltstack.list
+echo "${SALTSTACK_REPO}" > /etc/apt/sources.list.d/mcp_saltstack.list
 
-# We expect issues with GPG,related to our mirrors - so temporary disable check.
-echo "APT::Get::AllowUnauthenticated true;" > /etc/apt/apt.conf.d/99allow_unauthenticated
+# This Pin-Priority fil should be always aligned with
+# https://github.com/Mirantis/reclass-system-salt-model/blob/master/linux/system/repo/mcp/apt_mirantis/saltstack.yml
+cat <<EOF >> /etc/apt/preferences.d/mcp_saltstack
+Package: libsodium18
+Pin: release o=SaltStack
+Pin-Priority: 50
+
+Package: *
+Pin: release o=SaltStack
+Pin-Priority: 1100
+EOF
 
 apt-get update
 apt-get -y install salt-minion
@@ -25,4 +34,5 @@
 EOF
 
 rm -vf /etc/apt/apt.conf.d/99allow_unauthenticated
-rm -vf /etc/apt/sources.list.d/saltstack.list
+rm -vf /etc/apt/sources.list.d/mcp_saltstack.list
+rm -vf /etc/apt/preferences.d/mcp_saltstack