diff --git a/day01-image/template.json b/day01-image/template.json
index cfaa73f..0628031 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -137,7 +137,7 @@
       "ssh_password": "{{user `password`}}",
       "ssh_host_port_min": 7000,
       "ssh_host_port_max": 7050,
-      "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
+      "shutdown_command": "shutdown -P now",
       "boot_wait": "2s",
       "ssh_wait_timeout": "360s"
     }
diff --git a/mirror-image/template.json b/mirror-image/template.json
index 71706f9..8665bb5 100644
--- a/mirror-image/template.json
+++ b/mirror-image/template.json
@@ -162,7 +162,7 @@
       "headless": true,
       "ssh_username": "{{user `user`}}",
       "ssh_password": "{{user `password`}}",
-      "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
+      "shutdown_command": "shutdown -P now",
       "vnc_bind_address": "0.0.0.0",
       "vnc_port_max": "5956",
       "vnc_port_min": "5956",
diff --git a/ubuntu-14.04/scripts/salt.sh b/ubuntu-14.04/scripts/salt.sh
index 4228bb8..8286c9b 100644
--- a/ubuntu-14.04/scripts/salt.sh
+++ b/ubuntu-14.04/scripts/salt.sh
@@ -1,14 +1,11 @@
 #!/bin/bash -xe
 
 SALTSTACK_REPO=${SALTSTACK_REPO:-"deb [arch=amd64] https://mirror.mirantis.com/stable/saltstack-2017.7/trusty/ trusty main"}
-SALTSTACK_GPG=${SALTSTACK_GPG:-"https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub"}
+SALTSTACK_GPG=${SALTSTACK_GPG:-"https://mirror.mirantis.com/proposed/saltstack-2017.7/trusty/SALTSTACK-GPG-KEY.pub"}
 
 wget -O - ${SALTSTACK_GPG} | sudo apt-key add -
 echo "${SALTSTACK_REPO}" > /etc/apt/sources.list.d/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
-
 apt-get update
 apt-get -y install salt-minion
 mkdir -m700 -p /etc/salt/pki/minion
@@ -24,5 +21,4 @@
 auth_timeout: 60
 EOF
 
-rm -vf /etc/apt/apt.conf.d/99allow_unauthenticated
 rm -vf /etc/apt/sources.list.d/saltstack.list
diff --git a/ubuntu-14.04/template.json b/ubuntu-14.04/template.json
index 76d1309..00081fe 100644
--- a/ubuntu-14.04/template.json
+++ b/ubuntu-14.04/template.json
@@ -176,7 +176,7 @@
       "ssh_password": "{{user `password`}}",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
-      "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
+      "shutdown_command": "shutdown -P now",
       "headless": true,
       "vboxmanage": [
         [
@@ -253,7 +253,7 @@
       "ssh_password": "{{user `password`}}",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
-      "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
+      "shutdown_command": "shutdown -P now",
       "vmx_data": {
         "memsize": "1024",
         "numvcpus": "1",
@@ -295,7 +295,7 @@
       "ssh_password": "{{ user `password` }}",
       "ssh_host_port_min": 7000,
       "ssh_host_port_max": 7050,
-      "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
+      "shutdown_command": "shutdown -P now",
       "boot_wait": "2s",
       "ssh_wait_timeout": "360s"
     },
diff --git a/ubuntu-16.04/run.example.sh b/ubuntu-16.04/run.example.sh
index df58f50..fefb086 100644
--- a/ubuntu-16.04/run.example.sh
+++ b/ubuntu-16.04/run.example.sh
@@ -14,7 +14,7 @@
 export IMAGE_NAME="ubuntu-16-04-x64"
 export UBUNTU_BASEURL="http://mirror.mirantis.com/proposed/ubuntu/"
 export SALTSTACK_REPO="deb [arch=amd64] http://mirror.mirantis.com/proposed/saltstack-2017.7/xenial xenial main"
-export SALTSTACK_GPG="https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub"
+export SALTSTACK_GPG="https://mirror.mirantis.com/proposed/saltstack-2017.7/trusty/SALTSTACK-GPG-KEY.pub"
 ###
 # Hard-coded folder in template
 export PACKER_IMAGES_CACHE="${HOME}/packer_images_cache/"
diff --git a/ubuntu-16.04/scripts/salt.sh b/ubuntu-16.04/scripts/salt.sh
index 2ddedc4..eba5bca 100644
--- a/ubuntu-16.04/scripts/salt.sh
+++ b/ubuntu-16.04/scripts/salt.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -xe
 
-SALTSTACK_REPO=${SALTSTACK_REPO:-"deb [arch=amd64] https://mirror.mirantis.com/stable/saltstack-2016.3/xenial/ xenial main"}
-SALTSTACK_GPG=${SALTSTACK_GPG:-"https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.3/SALTSTACK-GPG-KEY.pub"}
+SALTSTACK_REPO=${SALTSTACK_REPO:-"deb [arch=amd64] https://mirror.mirantis.com/stable/saltstack-2017.7/xenial/ xenial main"}
+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
diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index 40d49e0..77af90c 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -176,7 +176,7 @@
       "ssh_password": "{{ user `password` }}",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
-      "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
+      "shutdown_command": "shutdown -P now",
       "headless": true,
       "vboxmanage": [
         [
@@ -253,7 +253,7 @@
       "ssh_password": "{{user `password`}}",
       "ssh_port": 22,
       "ssh_wait_timeout": "10000s",
-      "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
+      "shutdown_command": "shutdown -P now",
       "vmx_data": {
         "memsize": "1024",
         "numvcpus": "1",
@@ -295,7 +295,7 @@
       "ssh_password": "{{ user `password` }}",
       "ssh_host_port_min": 7000,
       "ssh_host_port_max": 7050,
-      "shutdown_command": "pgrep -f 'sshd: root@' | xargs kill -9 ; shutdown -P now",
+      "shutdown_command": "shutdown -P now",
       "boot_wait": "2s",
       "ssh_wait_timeout": "360s"
     },