diff --git a/linux/system/repo/mcp/apt_mirantis/aptly.yml b/linux/system/repo/mcp/apt_mirantis/aptly.yml
index d0f04c4..78f0cbe 100644
--- a/linux/system/repo/mcp/apt_mirantis/aptly.yml
+++ b/linux/system/repo/mcp/apt_mirantis/aptly.yml
@@ -12,3 +12,4 @@
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_aptly_url}/${_param:linux_system_codename}/ squeeze main"
           architectures: amd64
           clean_file: true
+          key: ${_param:linux_system_repo_mcp_aptly_key}
diff --git a/linux/system/repo/mcp/apt_mirantis/cassandra.yml b/linux/system/repo/mcp/apt_mirantis/cassandra.yml
index e29a220..1136a85 100644
--- a/linux/system/repo/mcp/apt_mirantis/cassandra.yml
+++ b/linux/system/repo/mcp/apt_mirantis/cassandra.yml
@@ -13,6 +13,7 @@
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_cassandra_url}/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_cassandra_version} main"
           architectures: amd64
           clean_file: true
+          key: ${_param:linux_system_repo_mcp_cassandra_key}
           pin:
           - pin: 'release o=Apache Cassandra Packages'
             priority: 1100
diff --git a/linux/system/repo/mcp/apt_mirantis/docker.yml b/linux/system/repo/mcp/apt_mirantis/docker.yml
index 96080c8..ca403c4 100644
--- a/linux/system/repo/mcp/apt_mirantis/docker.yml
+++ b/linux/system/repo/mcp/apt_mirantis/docker.yml
@@ -10,5 +10,6 @@
       repo:
         mcp_docker:
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_docker_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} stable"
+          key: ${_param:linux_system_repo_mcp_docker_key}
           architectures: amd64
           clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml b/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
index bab50fa..43cbc9f 100644
--- a/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
+++ b/linux/system/repo/mcp/apt_mirantis/docker_legacy.yml
@@ -10,5 +10,6 @@
       repo:
         mcp_docker_legacy:
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_docker_legacy_url}/${_param:linux_system_codename}/ ubuntu-${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mcp_docker_legacy_key}
           architectures: amd64
           clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
index 13c30e7..55a13cb 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
@@ -13,9 +13,8 @@
           source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_elastic_2x_version}/elasticsearch-2.x/${_param:linux_system_codename}/ stable main"
           architectures: amd64
           clean_file: true
-          key: ${linux:system:repo:mcp_elasticsearch:key}
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
         mcp_elastic_curator_2x:
           source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_elastic_2x_version}/elasticsearch-curator/${_param:linux_system_codename}/ stable main"
           architectures: amd64
           clean_file: true
-          key: ${linux:system:repo:mcp_elasticsearch:key}
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
index 49e9eba..8441882 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
@@ -13,9 +13,8 @@
           source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_elastic_5x_version}/elasticsearch-5.x/${_param:linux_system_codename}/ stable main"
           architectures: amd64
           clean_file: true
-          key: ${linux:system:repo:mcp_elasticsearch:key}
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
         mcp_elastic_curator_5x:
           source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_elastic_5x_version}/elasticsearch-curator-5/${_param:linux_system_codename}/ stable main"
           architectures: amd64
           clean_file: true
-          key: ${linux:system:repo:mcp_elasticsearch:key}
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/es.yml b/linux/system/repo/mcp/apt_mirantis/elastic/es.yml
index 1e455c8..22b54c1 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/es.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/es.yml
@@ -10,6 +10,7 @@
       repo:
         mcp_elasticsearch:
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_elasticsearch_url}/${_param:linux_system_codename} stable main"
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
           architectures: amd64
           clean_file: true
           pin:
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/es_curator.yml b/linux/system/repo/mcp/apt_mirantis/elastic/es_curator.yml
index c099a03..6e192a1 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/es_curator.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/es_curator.yml
@@ -12,6 +12,7 @@
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_elasticsearch_curator_url}/${_param:linux_system_codename} stable main"
           architectures: amd64
           clean_file: true
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
           pin:
           - pin: 'release o=Elastic'
             priority: 1100
diff --git a/linux/system/repo/mcp/apt_mirantis/glusterfs.yml b/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
index 3b2bd6d..12cc935 100644
--- a/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
+++ b/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
@@ -11,6 +11,7 @@
       repo:
         mcp_glusterfs:
           source: "deb ${_param:linux_system_repo_mcp_glusterfs_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mcp_glusterfs_key}
           architectures: amd64
           clean_file: true
           pin:
diff --git a/linux/system/repo/mcp/apt_mirantis/influxdb.yml b/linux/system/repo/mcp/apt_mirantis/influxdb.yml
index f5f4c90..f080121 100644
--- a/linux/system/repo/mcp/apt_mirantis/influxdb.yml
+++ b/linux/system/repo/mcp/apt_mirantis/influxdb.yml
@@ -10,6 +10,7 @@
       repo:
         mcp_influxdb:
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_influxdb_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} stable"
+          key: ${_param:linux_system_repo_mcp_influxdb_key}
           architectures: amd64
           clean_file: true
           pin:
diff --git a/linux/system/repo/mcp/apt_mirantis/jenkins.yml b/linux/system/repo/mcp/apt_mirantis/jenkins.yml
index 0c256b6..59f03e8 100644
--- a/linux/system/repo/mcp/apt_mirantis/jenkins.yml
+++ b/linux/system/repo/mcp/apt_mirantis/jenkins.yml
@@ -11,6 +11,7 @@
         mcp_jenkins:
           # FIXME PROD-20733
           source: "deb [arch=amd64 trusted=yes] ${_param:linux_system_repo_mcp_jenkins_url}/${_param:linux_system_codename}/ binary main"
+          key: ${_param:linux_system_repo_mcp_jenkins_key}
           architectures: amd64
           clean_file: true
           pin:
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
index cf3b2ba..219c0dc 100644
--- a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
@@ -8,5 +8,6 @@
       repo:
         mcp_kibana_46:
           source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_kibana_46_version}/kibana-4.6/${_param:linux_system_codename}/ stable main"
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
           architectures: amd64
           clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml b/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
index 99fa8ac..18f6095 100644
--- a/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
@@ -8,5 +8,6 @@
       repo:
         mcp_kibana_5x:
           source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_kibana_5x_version}/elasticsearch-5.x/${_param:linux_system_codename}/ stable main"
+          key: ${_param:linux_system_repo_mcp_elasticsearch_key}
           architectures: amd64
           clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/maas.yml b/linux/system/repo/mcp/apt_mirantis/maas.yml
index c89e3fe..653d75a 100644
--- a/linux/system/repo/mcp/apt_mirantis/maas.yml
+++ b/linux/system/repo/mcp/apt_mirantis/maas.yml
@@ -10,6 +10,7 @@
       repo:
         mcp_maas:
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_maas_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mcp_maas_key}
           architectures: amd64
           clean_file: true
           pin:
diff --git a/linux/system/repo/mcp/apt_mirantis/percona.yml b/linux/system/repo/mcp/apt_mirantis/percona.yml
index 0cdd192..c7f9691 100644
--- a/linux/system/repo/mcp/apt_mirantis/percona.yml
+++ b/linux/system/repo/mcp/apt_mirantis/percona.yml
@@ -10,6 +10,7 @@
       repo:
         mcp_percona:
           source: "deb ${_param:linux_system_repo_mcp_percona_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mcp_percona_key}
           architectures: amd64
           clean_file: true
           pin:
diff --git a/linux/system/repo/mcp/apt_mirantis/saltstack.yml b/linux/system/repo/mcp/apt_mirantis/saltstack.yml
index 5ba85c0..1c155d3 100644
--- a/linux/system/repo/mcp/apt_mirantis/saltstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/saltstack.yml
@@ -11,6 +11,7 @@
       repo:
         mcp_saltstack:
           source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_saltstack_url}/${_param:linux_system_codename}/ ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mcp_saltstack_key}
           architectures: amd64
           clean_file: true
           pinning:
diff --git a/linux/system/repo/mcp/apt_mirantis/ubuntu.yml b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
index 55f6387..0369f7b 100644
--- a/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ubuntu.yml
@@ -12,6 +12,7 @@
         ubuntu:
           refresh_db: ${_param:linux_repo_refresh_db}
           source: "deb [arch=amd64] ${_param:linux_system_repo_ubuntu_url} ${_param:linux_system_codename} main restricted universe"
+          key: ${_param:linux_system_repo_ubuntu_key}
           architectures: amd64
           default: true
         ubuntu_updates: