diff --git a/init.yml b/init.yml
index f532ff5..5447dc3 100644
--- a/init.yml
+++ b/init.yml
@@ -2,6 +2,7 @@
 - system.aptly.server.docker
 - system.aptly.client.publisher
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.cassandra
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.fluentd
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.salt
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.extra
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.mitaka
@@ -9,9 +10,10 @@
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.openstack.mitaka
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.saltstack.salt-2016-3
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.aptly
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.fluentd
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.cassandra
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.elastic
-- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.kibana.46
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.kibana
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.openstack.mitaka
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.openstack.ocata
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.openstack.pike
@@ -38,7 +40,7 @@
 - service.docker.host
 parameters:
   _param:
-    apt_mk_version: 'testing'
+    apt_mk_version: 'proposed'
     aptly_gpg_keypair_id: A8272E04
     aptly_gpg_passphrase: ""
     aptly_server_secure: true
@@ -220,10 +222,6 @@
             distributions:
             - ubuntu-xenial/docker/stable
         mirantis_openstack_xenial_docker_legacy:
-          source: http://mirror.mirantis.com/${_param:apt_mk_version}/docker-1.x/
-          distribution: ubuntu-xenial
-          components: main
-          architectures: amd64
           publisher:
             distributions:
               - ubuntu-xenial/docker/stable
@@ -235,8 +233,6 @@
           publisher:
             distributions:
             - ubuntu-xenial/elastic/5.x/stable
-            - ubuntu-xenial/kibana/5.x/${_param:apt_mk_version}
-            - ubuntu-xenial/kibana/5.x/stable
         mirantis_openstack_xenial_extra:
           publisher:
             distributions:
@@ -257,6 +253,10 @@
           publisher:
             distributions:
             - ubuntu-xenial/kibana/4.6/stable
+        mirantis_openstack_xenial_kibana_5x:
+          publisher:
+            distributions:
+            - ubuntu-xenial/kibana/5.x/stable
         mirantis_openstack_xenial_maas:
           publisher:
             distributions: