diff --git a/linux/system/repo/mcp/apt_mirantis/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
index 79a460e..09503a2 100644
--- a/linux/system/repo/mcp/apt_mirantis/fluentd.yml
+++ b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
@@ -1,12 +1,11 @@
+classes:
+- system.linux.system.repo.keystorage.fluentd
 parameters:
-  _param:
-    linux_system_repo_mcp_fluentd_version: ${_param:apt_mk_version}
   linux:
     system:
       repo:
         mcp_fluentd:
-          source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_fluentd_version}/td-agent/${_param:linux_system_codename} ${_param:linux_system_codename} contrib"
+          source: "deb [arch=amd64] ${_param:linux_system_repo_mcp_fluentd_url}/${_param:linux_system_codename} ${_param:linux_system_codename} contrib"
+          key: ${_param:linux_system_repo_mcp_fluentd_key}
           architectures: amd64
-          key_id: 901F9177AB97ACBE
-          key_server: keyserver.ubuntu.com
           clean_file: true
diff --git a/linux/system/repo/mcp/apt_mirantis/grafana.yml b/linux/system/repo/mcp/apt_mirantis/grafana.yml
index 47015a6..755347b 100644
--- a/linux/system/repo/mcp/apt_mirantis/grafana.yml
+++ b/linux/system/repo/mcp/apt_mirantis/grafana.yml
@@ -1,12 +1,14 @@
-parameters:
-  _param:
-    linux_system_repo_mcp_grafana_version: ${_param:apt_mk_version}
-  linux:
-    system:
-      repo:
-        mcp_grafana:
-          source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_grafana_version}/grafana/${_param:linux_system_codename}/ jessie main"
-          architectures: amd64
-          key_id: C2E73424D59097AB
-          key_server: keyserver.ubuntu.com
-          clean_file: true
+# DEPRECATED since 2018.8+ release
+# Will be removed in 2018q4
+#parameters:
+#  _param:
+#    linux_system_repo_mcp_grafana_version: ${_param:apt_mk_version}
+#  linux:
+#    system:
+#      repo:
+#        mcp_grafana:
+#          source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_grafana_version}/grafana/${_param:linux_system_codename}/ jessie main"
+#          architectures: amd64
+#          key_id: C2E73424D59097AB
+#          key_server: keyserver.ubuntu.com
+#          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 18f6095..60f6a39 100644
--- a/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
@@ -1,13 +1,11 @@
 classes:
 - system.linux.system.repo.keystorage.elasticsearch
 parameters:
-  _param:
-    linux_system_repo_mcp_kibana_5x_version: ${_param:apt_mk_version}
   linux:
     system:
       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"
+          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