diff --git a/day01-image/run.example.sh b/day01-image/run.example.sh
index 6277a71..16c1d03 100755
--- a/day01-image/run.example.sh
+++ b/day01-image/run.example.sh
@@ -24,8 +24,6 @@
 export SALTSTACK_GPG="https://repo.saltstack.com/apt/ubuntu/16.04/amd64/2017.7/SALTSTACK-GPG-KEY.pub"
 export APT_MIRANTIS_SALT_REPO="http://apt.mirantis.com/xenial/ proposed salt"
 export GIT_SALT_FORMULAS_SCRIPTS="https://gerrit.mcp.mirantis.com/salt-formulas/salt-formulas-scripts"
-export APT_REPOSITORY="deb [arch=amd64] http://apt.mirantis.com/xenial/ proposed salt"
-export APT_REPOSITORY_GPG=http://apt.mirantis.com/public.gpg
 ###
 # Hard-coded folder in template
 export PACKER_IMAGES_CACHE="${HOME}/packer_images_cache/"
diff --git a/day01-image/template.json b/day01-image/template.json
index 881516e..9c07cc3 100644
--- a/day01-image/template.json
+++ b/day01-image/template.json
@@ -16,10 +16,7 @@
     "saltstack_repo": "{{ env `SALTSTACK_REPO` }}",
     "apt_mirantis_gpg": "{{ env `APT_MIRANTIS_GPG` }}",
     "apt_mirantis_salt_repo": "{{ env `APT_MIRANTIS_SALT_REPO` }}",
-    "git_salt_formulas_scripts": "{{ env `GIT_SALT_FORMULAS_SCRIPTS` }}",
-    "apt_repository": "{{ env `APT_REPOSITORY` }}",
-    "apt_repository_gpg": "{{ env `APT_REPOSITORY_GPG` }}"
-
+    "git_salt_formulas_scripts": "{{ env `GIT_SALT_FORMULAS_SCRIPTS` }}"
   },
   "provisioners": [
     {
@@ -59,8 +56,6 @@
         "APT_MIRANTIS_GPG={{ user `apt_mirantis_gpg` }}",
         "APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
         "GIT_SALT_FORMULAS_SCRIPTS={{ user `git_salt_formulas_scripts` }}",
-        "APT_REPOSITORY={{ user `apt_repository` }}",
-        "APT_REPOSITORY_GPG={{ user `apt_repository_gpg` }}",
         "APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
         "BOOTSTRAP_SALTSTACK_COM=file:///opt/bootstrap.saltstack.com.sh",
         "MCP_VERSION={{ user `mcp_version` }}",
diff --git a/mirror-image/run.example.sh b/mirror-image/run.example.sh
index acaea28..2a1a42c 100755
--- a/mirror-image/run.example.sh
+++ b/mirror-image/run.example.sh
@@ -31,9 +31,6 @@
 export GIT_SALT_FORMULAS_SCRIPTS="https://gerrit.mcp.mirantis.com/salt-formulas/salt-formulas-scripts"
 export SCRIPTS_REF="master"
 #
-export APT_REPOSITORY=" deb [arch=amd64] ${APT_MIRANTIS_SALT_REPO} "
-export APT_REPOSITORY_GPG=${APT_MIRANTIS_GPG}
-
 # Openstack-related variables
 #export VM_FLAVOR="3c4fe514-3eb6-464d-a419-7be09d72cf1e"
 #export VM_FLOATING_IP_POOL="095f43ed-65ba-48ce-8185-d4080e430a88"
diff --git a/mirror-image/template.json b/mirror-image/template.json
index abd8e5a..0055b9c 100644
--- a/mirror-image/template.json
+++ b/mirror-image/template.json
@@ -17,8 +17,6 @@
     "apt_mirantis_gpg": "{{ env `APT_MIRANTIS_GPG` }}",
     "apt_mirantis_salt_repo": "{{ env `APT_MIRANTIS_SALT_REPO` }}",
     "git_salt_formulas_scripts": "{{ env `GIT_SALT_FORMULAS_SCRIPTS` }}",
-    "apt_repository": "{{ env `APT_REPOSITORY` }}",
-    "apt_repository_gpg": "{{ env `APT_REPOSITORY_GPG` }}",
     "os_flavor": "27574e15-f031-4b78-a82d-4cef3aea9442",
     "os_username": "{{ env `OS_USERNAME` }}",
     "os_password": "{{ env `OS_PASSWORD` }}",
@@ -58,8 +56,6 @@
         "APT_MIRANTIS_GPG={{ user `apt_mirantis_gpg` }}",
         "APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
         "GIT_SALT_FORMULAS_SCRIPTS={{ user `git_salt_formulas_scripts` }}",
-        "APT_REPOSITORY={{ user `apt_repository` }}",
-        "APT_REPOSITORY_GPG={{ user `apt_repository_gpg` }}",
         "PACKER_OFFLINE_BUILD=true"
       ],
       "type": "shell",
diff --git a/trymcp-day01-image/run.example.sh b/trymcp-day01-image/run.example.sh
index 92ad386..3b78bdf 100755
--- a/trymcp-day01-image/run.example.sh
+++ b/trymcp-day01-image/run.example.sh
@@ -15,8 +15,6 @@
 #
 export APT_MIRANTIS_GPG="http://apt.mirantis.com/public.gpg"
 export APT_MIRANTIS_SALT_REPO="http://apt.mirantis.com/xenial/ nightly salt"
-export APT_REPOSITORY="deb [arch=amd64] http://apt.mirantis.com/xenial/ proposed salt"
-export APT_REPOSITORY_GPG="http://apt.mirantis.com/public.gpg"
 export CLUSTER_MODEL="https://gerrit.mcp.mirantis.com/trymcp/drivetrain-model"
 export CLUSTER_MODEL_REF="master"
 export CLUSTER_NAME="try-mcp"
diff --git a/trymcp-day01-image/template.json b/trymcp-day01-image/template.json
index 9e28010..1d99915 100644
--- a/trymcp-day01-image/template.json
+++ b/trymcp-day01-image/template.json
@@ -16,9 +16,7 @@
     "saltstack_repo": "{{ env `SALTSTACK_REPO` }}",
     "apt_mirantis_gpg": "{{ env `APT_MIRANTIS_GPG` }}",
     "apt_mirantis_salt_repo": "{{ env `APT_MIRANTIS_SALT_REPO` }}",
-    "git_salt_formulas_scripts": "{{ env `GIT_SALT_FORMULAS_SCRIPTS` }}",
-    "apt_repository": "{{ env `APT_REPOSITORY` }}",
-    "apt_repository_gpg": "{{ env `APT_REPOSITORY_GPG` }}"
+    "git_salt_formulas_scripts": "{{ env `GIT_SALT_FORMULAS_SCRIPTS` }}"
   },
   "provisioners": [
     {
@@ -58,8 +56,6 @@
         "APT_MIRANTIS_GPG={{ user `apt_mirantis_gpg` }}",
         "APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
         "GIT_SALT_FORMULAS_SCRIPTS={{ user `git_salt_formulas_scripts` }}",
-        "APT_REPOSITORY={{ user `apt_repository` }}",
-        "APT_REPOSITORY_GPG={{ user `apt_repository_gpg` }}",
         "APT_MIRANTIS_SALT_REPO={{ user `apt_mirantis_salt_repo` }}",
         "BOOTSTRAP_SALTSTACK_COM=file:///opt/bootstrap.saltstack.com.sh",
         "MCP_VERSION={{ user `mcp_version` }}",