diff --git a/bootstrap/playbooks/build-main.yaml b/bootstrap/playbooks/build-main.yaml
index 76f32f5f..6308862e 100644
--- a/bootstrap/playbooks/build-main.yaml
+++ b/bootstrap/playbooks/build-main.yaml
@@ -9,3 +9,4 @@
     - include: tasks/docker.yaml
     #- include: celery.yaml tags=['master'] celery_dir=/var/run/celery
     - include: tasks/cloud_archive.yaml
+    #- include: tasks/mos.yaml
diff --git a/bootstrap/playbooks/tasks/cloud_archive.yaml b/bootstrap/playbooks/tasks/cloud_archive.yaml
index 7fd1aba9..42dbd0b4 100644
--- a/bootstrap/playbooks/tasks/cloud_archive.yaml
+++ b/bootstrap/playbooks/tasks/cloud_archive.yaml
@@ -1,5 +1,7 @@
 ---
 
+- shell: apt-get update
+- shell: apt-get -y upgrade
 - shell: add-apt-repository -y cloud-archive:juno
 - shell: apt-get update
-- shell: apt-get -y dist-upgrade
+- shell: apt-get update --fix-missing
diff --git a/bootstrap/playbooks/tasks/mos.yaml b/bootstrap/playbooks/tasks/mos.yaml
new file mode 100644
index 00000000..bea391bc
--- /dev/null
+++ b/bootstrap/playbooks/tasks/mos.yaml
@@ -0,0 +1,11 @@
+---
+
+- shell: apt-get update
+- shell: apt-get -y upgrade
+- apt_repository: repo='deb http://fuel-repository.mirantis.com/fwm/6.1/ubuntu mos6.1 main' validate_certs=no
+- shell: echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99mos61
+- shell: echo 'Package: *' > /etc/apt/preferences.d/mos.pref
+- shell: echo 'Pin: release o=Mirantis,a=mos6.1,n=mos6.1,l=mos6.1' >> /etc/apt/preferences.d/mos.pref
+- shell: echo 'Pin-Priority: 1050' >> /etc/apt/preferences.d/mos.pref
+- shell: apt-get update
+- shell: apt-get update --fix-missing