diff --git a/bootstrap/playbooks/build-main.yaml b/bootstrap/playbooks/build-main.yaml
index 6308862e..8f65449b 100644
--- a/bootstrap/playbooks/build-main.yaml
+++ b/bootstrap/playbooks/build-main.yaml
@@ -3,10 +3,12 @@
 - name: Main build script
   hosts: all
   sudo: yes
+  vars:
+    ssh_ip_mask: "10.0.0.*"
   tasks:
     - include: tasks/base.yaml
     - include: tasks/puppet.yaml
     - include: tasks/docker.yaml
-    #- include: celery.yaml tags=['master'] celery_dir=/var/run/celery
     - include: tasks/cloud_archive.yaml
-    #- include: tasks/mos.yaml
+    - include: tasks/ssh_conf.yaml
+
diff --git a/bootstrap/playbooks/files/ssh_conf b/bootstrap/playbooks/files/ssh_conf
new file mode 100644
index 00000000..da7b2483
--- /dev/null
+++ b/bootstrap/playbooks/files/ssh_conf
@@ -0,0 +1,2 @@
+Host {{ssh_ip_mask}}
+  StrictHostKeyChecking no
diff --git a/bootstrap/playbooks/solar.yaml b/bootstrap/playbooks/solar.yaml
index 519c44f5..e2211caf 100644
--- a/bootstrap/playbooks/solar.yaml
+++ b/bootstrap/playbooks/solar.yaml
@@ -2,12 +2,15 @@
 
 - hosts: all
   sudo: yes
+  vars:
+    ssh_ip_mask: "10.0.0.*"
   tasks:
     # upgrade pbr first, old version throws strange errors
     - shell: pip install pbr -U
     # Setup development env for solar
     - shell: pip install -e . chdir=/vagrant
     - shell: pip install git+git://github.com/Mirantis/solar-agent.git
+    - include: tasks/ssh_conf.yaml
 
 - hosts: all
   tasks:
diff --git a/bootstrap/playbooks/tasks/ssh_conf.yaml b/bootstrap/playbooks/tasks/ssh_conf.yaml
new file mode 100644
index 00000000..1c99ff94
--- /dev/null
+++ b/bootstrap/playbooks/tasks/ssh_conf.yaml
@@ -0,0 +1,3 @@
+---
+
+- template: src=files/ssh_conf dest=/root/.ssh/config
diff --git a/docker-compose.yml b/docker-compose.yml
index cc70bdad..27e2f71c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ solar-celery:
     - /vagrant/templates:/vagrant/templates
     - /vagrant/resources:/vagrant/resources
     - /vagrant/library:/vagrant/library
-    - ~/.ssh/known_hosts:/root/.ssh/known_hosts
+    - ~/.ssh:/root/.ssh
     - ./bootstrap/playbooks/celery.yaml:/celery.yaml
   environment:
     - REDIS_HOST=redis