diff --git a/Dockerfile b/Dockerfile
index 9bef17ea..41aa3e3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,18 +2,13 @@ FROM ubuntu:14.04
 
 WORKDIR /
 
-RUN apt-get update
-RUN apt-get install -y python python-dev python-distribute python-pip openssh-client rsync
-RUN pip install ansible
-
 ADD bootstrap/playbooks/celery.yaml /celery.yaml
 ADD resources /resources
 ADD templates /templates
 ADD run.sh /run.sh
 
-RUN apt-get update
-RUN apt-get install -y python python-dev python-distribute python-pip \
-    libyaml-dev vim libffi-dev libssl-dev git
+RUN apt-get upgrade && apt-get update
+RUN apt-get install -y python python-dev python-distribute python-pip openssh-client rsync libyaml-dev vim libffi-dev libssl-dev git
 RUN pip install ansible
 
 RUN pip install git+https://github.com/Mirantis/solar.git
diff --git a/bootstrap/playbooks/celery.yaml b/bootstrap/playbooks/celery.yaml
index e0ad2c33..4baed9bc 100644
--- a/bootstrap/playbooks/celery.yaml
+++ b/bootstrap/playbooks/celery.yaml
@@ -15,9 +15,6 @@
     - shell: celery multi stopwait 2  -A solar.orchestration.runner
              chdir={{ celery_dir }}
       tags: [stop]
-    - shell: celery multi start 2 -A solar.orchestration.runner -P:2 prefork -c:1 1 -c:2 3 -Q:1 scheduler,system_log -Q:2 celery,{{ hostname.stdout }}
+    - shell: celery multi start 2 -A solar.orchestration.runner -P:2 gevent -c:1 1 -Q:1 scheduler,system_log -Q:2 celery,{{ hostname.stdout }}
              chdir={{ celery_dir }}
       tags: [master]
-    - shell: celery multi start 1 -A solar.orchestration.runner -Q:1  {{ hostname.stdout }}
-             chdir={{ celery_dir }}
-      tags: [slave]