diff --git a/docker-images/controller-ci/Dockerfile b/docker-images/controller-ci/Dockerfile
index 627fae2..7c81a26 100644
--- a/docker-images/controller-ci/Dockerfile
+++ b/docker-images/controller-ci/Dockerfile
@@ -14,9 +14,8 @@ RUN \
   apt-get update && \
   apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \
   apt-get install -y -o Dpkg::Options::="--force-confnew" \
-  git ca-certificates git-lfs && \
+  git ca-certificates git-lfs ansible python3-boto3 && \
   apt-get clean  && \
-  pip3 install ansible boto3 && \
   git lfs install --skip-repo && \
   update-alternatives --install /usr/bin/python python /usr/bin/python3 1 && \
   useradd -m controller && \
@@ -54,7 +53,7 @@ RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update && \
-  su - ce-dev -c "/usr/local/bin/ansible-playbook --extra-vars=\"{ansible_common_remote_group: controller}\" /home/ce-dev/ce-provision/provision.yml" && \
+  su - ce-dev -c "/usr/bin/ansible-playbook --extra-vars=\"{ansible_common_remote_group: controller}\" /home/ce-dev/ce-provision/provision.yml" && \
   rm /home/ce-dev/ce-provision/provision.yml && \
   apt-get clean  && \
   rm -rf \
diff --git a/docker-images/controller/Dockerfile b/docker-images/controller/Dockerfile
index e5d2c05..a61a9b1 100644
--- a/docker-images/controller/Dockerfile
+++ b/docker-images/controller/Dockerfile
@@ -17,7 +17,7 @@ RUN \
   /tmp/*
 
 
-RUN su - ce-dev -c "git clone --branch 1.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
+RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
 
 COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml
 
@@ -25,7 +25,7 @@ RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \  
   apt-get update && \
-  su - ce-dev -c "/usr/local/bin/ansible-playbook /home/ce-dev/ce-provision/provision.yml" && \
+  su - ce-dev -c "/usr/bin/ansible-playbook /home/ce-dev/ce-provision/provision.yml" && \
   rm /home/ce-dev/ce-provision/provision.yml && \
   apt-get clean  && \
   rm -rf \
diff --git a/docker-images/dind/Dockerfile b/docker-images/dind/Dockerfile
index 2c3b99b..5675565 100644
--- a/docker-images/dind/Dockerfile
+++ b/docker-images/dind/Dockerfile
@@ -1,4 +1,4 @@
-FROM codeenigma/ce-dev-1.x
+FROM codeenigma/ce-dev-1.x:latest
 
 RUN \
   set -x && \