diff --git a/ansible/roles/blazar/defaults/main.yml b/ansible/roles/blazar/defaults/main.yml
index 2ca63d5443ac5494381d5bf609c481b1b3343758..6cd6a69030e4dd4b76633743550324aaa99c74a3 100644
--- a/ansible/roles/blazar/defaults/main.yml
+++ b/ansible/roles/blazar/defaults/main.yml
@@ -11,6 +11,7 @@ blazar_services:
       - "{{ node_config_directory }}/blazar-api/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "kolla_logs:/var/log/kolla/"
+      - "{{ kolla_dev_repos_directory ~ '/blazar/blazar:/var/lib/kolla/venv/lib/python2.7/site-packages/blazar' if blazar_dev_mode | bool else '' }}"
   blazar-manager:
     container_name: blazar_manager
     group: blazar-manager
@@ -20,6 +21,8 @@ blazar_services:
       - "{{ node_config_directory }}/blazar-manager/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "kolla_logs:/var/log/kolla/"
+      - "{{ kolla_dev_repos_directory ~ '/blazar/blazar:/var/lib/kolla/venv/lib/python2.7/site-packages/blazar' if blazar_dev_mode | bool else '' }}"
+
 
 ####################
 # Blazar
@@ -61,3 +64,11 @@ blazar_logging_debug: "{{ openstack_logging_debug }}"
 blazar_keystone_user: "blazar"
 
 openstack_blazar_auth: "{{ openstack_auth }}"
+
+
+#####################
+## Kolla
+#####################
+blazar_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
+blazar_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
+blazar_dev_mode: "{{ kolla_dev_mode }}"
diff --git a/ansible/roles/blazar/handlers/main.yml b/ansible/roles/blazar/handlers/main.yml
index 67fa82179616e15a51f41959da5a9d1b0b75bb8f..64626bae09b9a08ed3874319dbaa710bf356bc2b 100644
--- a/ansible/roles/blazar/handlers/main.yml
+++ b/ansible/roles/blazar/handlers/main.yml
@@ -13,7 +13,7 @@
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
     image: "{{ service.image }}"
-    volumes: "{{ service.volumes }}"
+    volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
     - kolla_action != "config"
     - inventory_hostname in groups[service.group]
@@ -37,7 +37,7 @@
     common_options: "{{ docker_common_options }}"
     name: "{{ service.container_name }}"
     image: "{{ service.image }}"
-    volumes: "{{ service.volumes }}"
+    volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
     - kolla_action != "config"
     - inventory_hostname in groups[service.group]
diff --git a/ansible/roles/blazar/tasks/bootstrap_service.yml b/ansible/roles/blazar/tasks/bootstrap_service.yml
index 74e07b154661eec61185885257867d543f405f23..b59b8aed1927b67990c9b0923b59bf7dbe997a9c 100644
--- a/ansible/roles/blazar/tasks/bootstrap_service.yml
+++ b/ansible/roles/blazar/tasks/bootstrap_service.yml
@@ -15,6 +15,6 @@
       BOOTSTRAP:
     name: "bootstrap_blazar"
     restart_policy: "never"
-    volumes: "{{ blazar_api.volumes }}"
+    volumes: "{{ blazar_api.volumes|reject('equalto', '')|list }}"
   run_once: True
   delegate_to: "{{ groups[blazar_api.group][0] }}"
diff --git a/ansible/roles/blazar/tasks/clone.yml b/ansible/roles/blazar/tasks/clone.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a107eefa58255817acb9edda8ae0dc4ea4b3eaab
--- /dev/null
+++ b/ansible/roles/blazar/tasks/clone.yml
@@ -0,0 +1,6 @@
+---
+- name: Cloning blazar source repository for development
+  git:
+    repo: "{{ blazar_git_repository }}"
+    dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
+    update: "{{ blazar_dev_repos_pull }}"
diff --git a/ansible/roles/blazar/tasks/config.yml b/ansible/roles/blazar/tasks/config.yml
index dc7f5e1f2b4476bf7ac252a41bc14f798931281a..b12809959fb2689d1eef7ad8216d1c8749aeac09 100644
--- a/ansible/roles/blazar/tasks/config.yml
+++ b/ansible/roles/blazar/tasks/config.yml
@@ -88,7 +88,7 @@
     common_options: "{{ docker_common_options }}"
     name: "{{ item.value.container_name }}"
     image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes }}"
+    volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
   register: check_blazar_containers
   when:
     - kolla_action != "config"
diff --git a/ansible/roles/blazar/tasks/deploy.yml b/ansible/roles/blazar/tasks/deploy.yml
index 9cee66a9d8462f8f566b07209a061aebf7bf5aaa..fa2fb2ef2bfed2439b76cc8d0dcb54728d7e7ba1 100644
--- a/ansible/roles/blazar/tasks/deploy.yml
+++ b/ansible/roles/blazar/tasks/deploy.yml
@@ -6,6 +6,9 @@
   when: inventory_hostname in groups['blazar-api'] or
         inventory_hostname in groups['blazar-manager']
 
+- include: clone.yml
+  when: blazar_dev_mode | bool
+
 - include: bootstrap.yml
   when: inventory_hostname in groups['blazar-api']