diff --git a/classes/cluster/mcp-offline/infra/aptly.yml b/classes/cluster/mcp-offline/infra/aptly.yml
index db9e4e9..594e87b 100644
--- a/classes/cluster/mcp-offline/infra/aptly.yml
+++ b/classes/cluster/mcp-offline/infra/aptly.yml
@@ -1,31 +1,30 @@
 classes:
 - system.aptly.server.single
-- system.aptly.server.mirror.debian.aptly
-- system.aptly.server.mirror.debian.cassandra
-- system.aptly.server.mirror.debian.elasticsearch
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.cassandra
 - 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
 - system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.oc323
-- system.aptly.server.mirror.ubuntu.trusty.mcp.openstack_mitaka
-- system.aptly.server.mirror.ubuntu.trusty.grafana
-- system.aptly.server.mirror.ubuntu.trusty.salt
-#- system.aptly.server.mirror.ubuntu.trusty.ubuntu.trusty.main
-- system.aptly.server.mirror.ubuntu.xenial.mcp.openstack_ocata
-- system.aptly.server.mirror.ubuntu.xenial.mcp.openstack_mitaka
+- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.openstack.mitaka
+#- system.aptly.server.mirror.ubuntu.trusty.mcp.apt_mk.grafana
+- 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.elastic
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.kibana
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.openstack.ocata
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.openstack.mitaka
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.salt
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.extra
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.ocata
 - system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.oc323
-- system.aptly.server.mirror.ubuntu.xenial.influxdb
-- system.aptly.server.mirror.ubuntu.xenial.glusterfs
-- system.aptly.server.mirror.ubuntu.xenial.maas
-- system.aptly.server.mirror.ubuntu.xenial.docker
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.influxdb
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.glusterfs
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.maas
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.docker
 - system.aptly.server.mirror.ubuntu.xenial.docker_legacy
-- system.aptly.server.mirror.ubuntu.xenial.ceph
-- system.aptly.server.mirror.ubuntu.xenial.grafana
-- system.aptly.server.mirror.ubuntu.xenial.ubuntu
-- system.aptly.server.mirror.ubuntu.xenial.salt
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.ceph
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.grafana
+- system.aptly.server.mirror.ubuntu.xenial.mcp.apt_mk.saltstack.salt-2016-3
 - system.linux.system.repo.aptly
 - system.linux.system.repo.docker_legacy
 - system.git.server.single
@@ -35,7 +34,7 @@
 - cluster.mcp-offline.infra
 parameters:
   _param:
-    ubuntu_mirror_url: archive.ubuntu.com
+    apt_mk_version: "2017.12"
     aptly_gpg_keypair_id: A8272E04
     aptly_gpg_passphrase: ""
     aptly_server_secure: true
@@ -142,104 +141,106 @@
       registry:
         target_registry: apt:5000
         image:
-          - registry: ""
-            name: registry:2
-          - registry: docker
-            name: compose:1.17.1
-          - registry: osixia
-            name: openldap:1.1.8
-          - registry: tcpcloud
-            name: aptly:latest
-          - registry: tcpcloud
-            name: aptly-public:latest
-          - registry: tcpcloud
-            name: aptly-api:latest
-          - registry: tcpcloud
-            name: aptly-publisher:latest
-          - registry: tcpcloud
-            name: jnlp-slave:latest
-          - registry: tcpcloud
-            name: phpldapadmin:0.6.12
-          - registry: tcpcloud
-            name: jenkins:2.73
-          - registry: tcpcloud
-            name: gerrit:2.13.6
-          - registry: tcpcloud
-            name: mysql:5.6
-          - registry: grafana
-            name: grafana:4.5.2
-          - registry: dockersamples
-            name: visualizer:latest
-          - registry: docker.elastic.co/elasticsearch
-            name: elasticsearch:5.4.1
-          - registry: library
-            name: mongo:3.4
-          - registry: library
-            name: postgres:9.6
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: registry:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: compose:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: openldap:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
+            name: aptly:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
+            name: aptly-public:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
+            name: aptly-api:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
+            name: aptly-publisher:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
+            name: jnlp-slave:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
+            name: phpldapadmin:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
+            name: jenkins:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
+            name: gerrit:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/cicd
+            name: mysql:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: grafana:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: visualizer:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: elasticsearch:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: mongo:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: postgres:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
-            name: heka:latest
+            name: heka:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
-            name: security-monkey-api:latest
+            name: security-monkey-api:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
-            name: security-monkey-scheduler:latest
+            name: security-monkey-scheduler:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
-            name: janitor-monkey:latest
+            name: janitor-monkey:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
-            name: rundeck:latest
+            name: rundeck:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
-            name: devops-portal:latest
+            name: devops-portal:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
-            name: pushkin:latest
+            name: pushkin:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
-            name: alertmanager:latest
+            name: alertmanager:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
-            name: pushgateway:latest
+            name: pushgateway:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
-            name: prometheus:latest
+            name: prometheus:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
-            name: telegraf:latest
+            name: telegraf:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
-            name: remote_storage_adapter:latest
+            name: remote_storage_adapter:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/openstack-docker
-            name: prometheus_relay:latest
+            name: prometheus_relay:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes/contrail-integration
-            name: contrail-cni:v1.0.0
+            name: contrail-cni:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes/contrail-integration
-            name: contrail-network-controller:v1.0.0
+            name: contrail-network-controller:${_param:apt_mk_version}
           - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes
-            name: hyperkube-amd64:v1.6.2-2
-          - registry: kubernetes
-            name: pause:latest
-          - registry: mirantis
-            name: virtlet:latest
-          - registry: gcr.io/google_containers
-            name: kubernetes-dashboard-amd64:v1.5.1
-          - registry: gcr.io/google_containers
-            name: k8s-dns-kube-dns-amd64:1.14.5
-          - registry: gcr.io/google_containers
-            name: k8s-dns-dnsmasq-amd64:1.14.5
-          - registry: gcr.io/google_containers
-            name: k8s-dns-sidecar-amd64:1.14.5
-          - registry: gcr.io/google_containers
-            name: cluster-proportional-autoscaler-amd64:1.0.0
-          - registry: mirantis
-            name: k8s-netchecker-agent:stable
-          - registry: mirantis
-            name: k8s-netchecker-server:stable
-          - registry: quay.io/coreos
-            name: etcd
-          - registry: quay.io/coreos
-            name: etcd-operator:v0.5.2
-          - registry: gcr.io/kubernetes-helm
-            name: tiller:v2.4.2
-          - registry: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico
-            name: ctl:latest
-          - registry: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico
-            name: node:latest
-          - registry: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico
-            name: cni:latest
-          - registry: calico
-            name: kube-policy-controller:v0.5.4
+            name: hyperkube-amd64:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: pause:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes
+            name: virtlet:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: kubernetes-dashboard-amd64:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: k8s-dns-kube-dns-amd64:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: k8s-dns-dnsmasq-amd64:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: k8s-dns-sidecar-amd64:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: cluster-proportional-autoscaler-amd64:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes
+            name: k8s-netchecker-agent:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/kubernetes
+            name: k8s-netchecker-server:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: etcd:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: etcd-operator:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: tiller:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico
+            name: ctl:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico
+            name: node:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/projectcalico/calico
+            name: cni:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/external
+            name: kube-policy-controller:${_param:apt_mk_version}
+          - registry: docker-prod-local.artifactory.mirantis.com/mirantis/oss
+            name: qa-tools:${_param:apt_mk_version}
   git:
     server:
        directory: /srv/git/
@@ -249,9 +250,9 @@
         - name: jeepyb
           url: https://github.com/openstack-infra/jeepyb.git
         - name: mk-pipelines
-          url: https://github.com/Mirantis/mk-pipelines.git
+          url: https://gerrit.mcp.mirantis.net/mk/mk-pipelines.git
         - name: pipeline-library
-          url: https://github.com/Mirantis/pipeline-library.git
+          url: https://gerrit.mcp.mirantis.net/mcp-ci/pipeline-library.git
         - name: rundeck-cis-jobs
           url: https://github.com/Mirantis/rundeck-cis-jobs.git
   nginx:
diff --git a/classes/cluster/mcp-offline/infra/init.yml b/classes/cluster/mcp-offline/infra/init.yml
index 31f2fd0..d099f9d 100644
--- a/classes/cluster/mcp-offline/infra/init.yml
+++ b/classes/cluster/mcp-offline/infra/init.yml
@@ -7,7 +7,7 @@
     # Don't set it "false" before you configure sudo policies and enable power users.
     # linux_system_user_sudo: true
     docker_compose_image: apt:5000/compose:1.8.0
-    apt_mk_version: stable
+    apt_mk_version: "2017.12"
     aptly_server_hostname: apt
     aptly_server_address: 10.1.0.14
     linux_repo_refresh_db: true
diff --git a/classes/system b/classes/system
index 31722b8..46951a4 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 31722b881d83fb2c73f37ec009f09dfa79556f5d
+Subproject commit 46951a44a34313aed88278283d63c70ecd5b5175