diff --git a/defaults/main.yml b/defaults/main.yml
index b4fb00ab..40021045 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -23,6 +23,8 @@ cinder_git_install_branch: master
 cinder_developer_mode: false
 cinder_developer_constraints:
   - "git+{{ cinder_git_repo }}@{{ cinder_git_install_branch }}#egg=cinder"
+cinder_developer_mode_packages:
+  - git
 
 # Name of the virtual env to deploy into
 cinder_venv_tag: untagged
diff --git a/tasks/cinder_install.yml b/tasks/cinder_install.yml
index 1ded1f94..bcf86911 100644
--- a/tasks/cinder_install.yml
+++ b/tasks/cinder_install.yml
@@ -55,6 +55,17 @@
     - inventory_hostname in groups['cinder_volume']
     - cinder_backend_lvm_inuse | bool
 
+- name: Install distro packages for developer_mode installs
+  package:
+    name: "{{ item }}"
+    state: "{{ cinder_package_state }}"
+  register: install_packages
+  until: install_packages|success
+  retries: 5
+  delay: 2
+  with_items: "{{ cinder_developer_mode_packages }}"
+  when: cinder_developer_mode | bool
+
 - name: Create developer mode constraint file
   copy:
     dest: "/opt/developer-pip-constraints.txt"
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 1549ca3d..1700312c 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -25,7 +25,6 @@ cinder_distro_packages:
   - kmod-devel
   - kmod-libs
   - zlib-devel
-  - git
   - which
 
 cinder_volume_distro_packages:
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml
index e1b2bd9c..71e48b6b 100644
--- a/vars/ubuntu-16.04.yml
+++ b/vars/ubuntu-16.04.yml
@@ -24,7 +24,6 @@ tgt_service_name: tgt
 cinder_distro_packages:
   - rpcbind
   - rsync
-  - git
   - nfs-common
   - libpq-dev
   - libkmod-dev