diff --git a/linux/system/repo/mcp/apt_mirantis/ceph.yml b/linux/system/repo/mcp/apt_mirantis/ceph.yml
index 40c8d87..fe55b68 100644
--- a/linux/system/repo/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ceph.yml
@@ -1,3 +1,5 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
 parameters:
   _param:
     apt_mk_version: stable
@@ -9,7 +11,7 @@
         mcp_ceph:
           source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_ceph_version} ceph-${_param:linux_system_repo_mcp_ceph_codename}"
           architectures: amd64
-          key_url: "http://apt.mirantis.com/public.gpg"
+          key: ${_param:linux_system_repo_apt_mirantis_key}
           clean_file: true
           pin:
           - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
diff --git a/linux/system/repo/mcp/apt_mirantis/extra.yml b/linux/system/repo/mcp/apt_mirantis/extra.yml
index 12e8adc..5523f55 100644
--- a/linux/system/repo/mcp/apt_mirantis/extra.yml
+++ b/linux/system/repo/mcp/apt_mirantis/extra.yml
@@ -10,6 +10,7 @@
       repo:
         mcp_extra:
           source: "deb ${_param:linux_system_repo_mcp_extra_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mirror_mirantis_key}
           architectures: ${_param:linux_system_architecture}
           clean_file: true
           pin:
diff --git a/linux/system/repo/mcp/apt_mirantis/openstack.yml b/linux/system/repo/mcp/apt_mirantis/openstack.yml
index 5d11e59..3f591e1 100644
--- a/linux/system/repo/mcp/apt_mirantis/openstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/openstack.yml
@@ -1,3 +1,5 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
 parameters:
   _param:
     apt_mk_version: stable
@@ -8,7 +10,7 @@
         mirantis_openstack:
           source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/openstack/${_param:openstack_version} ${_param:linux_system_repo_mk_openstack_version} main"
           architectures: amd64
-          key_url: "http://apt.mirantis.com/public.gpg"
+          key: ${_param:linux_system_repo_apt_mirantis_key}
           pin:
           - pin: 'release l=${_param:openstack_version}'
             priority: 1100
@@ -16,7 +18,7 @@
         mk_openstack:
           source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
           architectures: amd64
-          key_url: "http://apt.mirantis.com/public.gpg"
+          key: ${_param:linux_system_repo_apt_mirantis_key}
           pin:
           - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}'
             priority: 1100
diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml
index 7711fa0..d2a9a49 100644
--- a/linux/system/repo/mcp/extra.yml
+++ b/linux/system/repo/mcp/extra.yml
@@ -1,3 +1,5 @@
+classes:
+- system.linux.system.repo.keystorage.mirantis_com
 parameters:
   _param:
     apt_mk_version: stable
diff --git a/linux/system/repo/mcp/mirror/v1/openstack.yml b/linux/system/repo/mcp/mirror/v1/openstack.yml
index 37482da..66a5530 100644
--- a/linux/system/repo/mcp/mirror/v1/openstack.yml
+++ b/linux/system/repo/mcp/mirror/v1/openstack.yml
@@ -10,6 +10,7 @@
       repo:
         mirantis_openstack:
           source: "deb ${_param:linux_system_repo_mirantis_openstack_url}/${_param:linux_system_codename} ${_param:linux_system_codename} main"
+          key: ${_param:linux_system_repo_mirror_mirantis_key}
           architectures: ${_param:linux_system_architecture}
           clean_file: true
           pin: