diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt
index be7c24e08c..faee249ba7 100644
--- a/global-requirement-pins.txt
+++ b/global-requirement-pins.txt
@@ -10,5 +10,5 @@
 ### These pins are updated through the sources-branch-updater script ###
 ###
 pip==8.1.2
-setuptools==25.1.0
+setuptools==25.1.1
 wheel==0.29.0
diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml
index 121465290e..b2daf684c9 100644
--- a/playbooks/defaults/repo_packages/openstack_other.yml
+++ b/playbooks/defaults/repo_packages/openstack_other.yml
@@ -27,19 +27,19 @@
 
 ## Tempest service
 tempest_git_repo: https://git.openstack.org/openstack/tempest
-tempest_git_install_branch: c9436c4fffe403be3555d1738440355019fffb35 # HEAD of "master" as of 27.07.2016
+tempest_git_install_branch: 1493c7f0ba49bfccb9ff8516b10a65d949d7462e # HEAD of "master" as of 01.08.2016
 tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
 tempest_git_project_group: utility_all
 
 ## NOVNC from source
 novncproxy_git_repo: https://github.com/kanaka/novnc
-novncproxy_git_install_branch: da82b3426c27bf1a79f671c5825d68ab8c0c5d9f # HEAD of "master" as of 27.07.2016
+novncproxy_git_install_branch: da82b3426c27bf1a79f671c5825d68ab8c0c5d9f # HEAD of "master" as of 01.08.2016
 novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}"
 novncproxy_git_project_group: nova_console
 
 ## spice-html5 from source
 spicehtml5_git_repo: https://github.com/SPICE/spice-html5
-spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 27.07.2016
+spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 01.08.2016
 spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
 spicehtml5_git_project_group: nova_console
 
diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml
index fb77f51e48..d60c1f3e1f 100644
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@@ -31,55 +31,55 @@
 
 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 689a99c58057dc52216eac362c8ead58618780ff # HEAD of "master" as of 27.07.2016
+requirements_git_install_branch: 754178dcbcfdb2ef0a61133845ed85cfe2daab38 # HEAD of "master" as of 01.08.2016
 requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"
 
 
 ## Aodh service
 aodh_git_repo: https://git.openstack.org/openstack/aodh
-aodh_git_install_branch: 06204adac4ec136650e9ae3219649d2b373c945c # HEAD of "master" as of 27.07.2016
+aodh_git_install_branch: 06204adac4ec136650e9ae3219649d2b373c945c # HEAD of "master" as of 01.08.2016
 aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}"
 aodh_git_project_group: aodh_all
 
 
 ## Ceilometer service
 ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
-ceilometer_git_install_branch: 77b5ff2472027d9f1a7076817b3585b8a20eb60d # HEAD of "master" as of 27.07.2016
+ceilometer_git_install_branch: 2b9fec553279d0a19c911d8d67c536cf8c846d27 # HEAD of "master" as of 01.08.2016
 ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}"
 ceilometer_git_project_group: ceilometer_all
 
 
 ## Cinder service
 cinder_git_repo: https://git.openstack.org/openstack/cinder
-cinder_git_install_branch: c523afa0fdbc6c46270419fbdb71c8bc6103ed52 # HEAD of "master" as of 27.07.2016
+cinder_git_install_branch: 72fdd889ebb5e261568236140d8fcacc05162156 # HEAD of "master" as of 01.08.2016
 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}"
 cinder_git_project_group: cinder_all
 
 
 ## Glance service
 glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: f36271e110c3500eeb80e743a4a78aac469b1e88 # HEAD of "master" as of 27.07.2016
+glance_git_install_branch: 068cf60808764876f00bfdfc857c04d840a54792 # HEAD of "master" as of 01.08.2016
 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}"
 glance_git_project_group: glance_all
 
 
 ## Gnocchi service
 gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi
-gnocchi_git_install_branch: 1d72344fd9a4b0eb1d454ba0a890346e9d7b825c # HEAD of "master" as of 27.07.2016
+gnocchi_git_install_branch: 94d773b0d54295ae05c04910b4030b7856b855df # HEAD of "master" as of 01.08.2016
 gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
 gnocchi_git_project_group: gnocchi_all
 
 
 ## Heat service
 heat_git_repo: https://git.openstack.org/openstack/heat
-heat_git_install_branch: 072944d91d5358d136c0e42e604e0d469ef8c8fe # HEAD of "master" as of 27.07.2016
+heat_git_install_branch: 86a037e3f2924742ab07d1c504144291ada5e477 # HEAD of "master" as of 01.08.2016
 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}"
 heat_git_project_group: heat_all
 
 
 ## Horizon service
 horizon_git_repo: https://git.openstack.org/openstack/horizon
-horizon_git_install_branch: 02043a98cb01dc9050dfaae5a95986b5f31dba84 # HEAD of "master" as of 27.07.2016
+horizon_git_install_branch: f9ba1ecc2f47a2b3fd2816dfba62f8ab9eaf343f # HEAD of "master" as of 01.08.2016
 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"
 horizon_git_project_group: horizon_all
 
@@ -87,76 +87,76 @@ horizon_git_project_group: horizon_all
 
 ## Horizon Ironic dashboard plugin
 ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui
-ironic_dashboard_git_install_branch: 9b8cce125c05435ee0baf9d8c61f5db0808e9b09 # HEAD of "master" as of 22 June 2016
+ironic_dashboard_git_install_branch: 8f554eb3a9dc6eacbfc86b4a58250d17dbb41e43 # HEAD of "master" as of 01.08.2016
 ironic_dashboard_git_dest: "/opt/ironic_dashboard_{{ ironic_dashboard_git_install_branch | replace('/', '_') }}"
 
 
 ## Horizon LBaaS dashboard plugin
 neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard
-neutron_lbaas_dashboard_git_install_branch: 0d25bbd63b2392f07e1f37e3d94119883858d3dd # HEAD of "master" as of 27.07.2016
+neutron_lbaas_dashboard_git_install_branch: 0d25bbd63b2392f07e1f37e3d94119883858d3dd # HEAD of "master" as of 01.08.2016
 neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}"
 neutron_lbaas_dashboard_git_project_group: neutron_agent
 
 
 ## Keystone service
 keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: 9d54eb33c1d74ff39c947af6ff984ef2e0bf4be4 # HEAD of "master" as of 27.07.2016
+keystone_git_install_branch: 3cada7760b429d5ae28bae5274c50febd1263819 # HEAD of "master" as of 01.08.2016
 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}"
 keystone_git_project_group: keystone_all
 
 
 ## Neutron service
 neutron_git_repo: https://git.openstack.org/openstack/neutron
-neutron_git_install_branch: 451193c8509125963af781352d9301e70d4ed956 # HEAD of "master" as of 27.07.2016
+neutron_git_install_branch: ee42af101157426539162012a5527e1e607e033c # HEAD of "master" as of 01.08.2016
 neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}"
 neutron_git_project_group: neutron_all
 
 neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
-neutron_lbaas_git_install_branch: 9664684aad0435c3f783bc6293a0040f5873db35 # HEAD of "master" as of 27.07.2016
+neutron_lbaas_git_install_branch: 9664684aad0435c3f783bc6293a0040f5873db35 # HEAD of "master" as of 01.08.2016
 neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}"
 neutron_lbaas_git_project_group: neutron_agent
 
 neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: bd724e60886b7a4eca760d6d53e1be1ec361675c # HEAD of "master" as of 27.07.2016
+neutron_vpnaas_git_install_branch: f6903524e0684b603bb18ade983b5eb0ce4b33d4 # HEAD of "master" as of 01.08.2016
 neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}"
 neutron_vpnaas_git_project_group: neutron_agent
 
 neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
-neutron_fwaas_git_install_branch: c3e491cae388713bb175d803de6a216a8816b816 # HEAD of "master" as of 27.07.2016
+neutron_fwaas_git_install_branch: c3e491cae388713bb175d803de6a216a8816b816 # HEAD of "master" as of 01.08.2016
 neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}"
 neutron_fwaas_git_project_group: neutron_agent
 
 
 ## Nova service
 nova_git_repo: https://git.openstack.org/openstack/nova
-nova_git_install_branch: 55f308c3affb17afea00894060eb81dd2dbf2a32 # HEAD of "master" as of 27.07.2016
+nova_git_install_branch: 32b7526b3cf40f40c5430034f75444fc64ac0e04 # HEAD of "master" as of 01.08.2016
 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"
 nova_git_project_group: nova_all
 
 
 ## PowerVM Virt Driver
 nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm
-nova_powervm_git_install_branch: 4fb42cc58ac7e6f331f974e81c83ea1de2c4b292 # HEAD of "master" as of 27.07.2016
+nova_powervm_git_install_branch: 2806c96cbf67067d6107257cc678b1aa8bb670a7 # HEAD of "master" as of 01.08.2016
 nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}"
 nova_powervm_git_project_group: nova_compute
 
 
 ## LXD Virt Driver
 nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
-nova_lxd_git_install_branch: cda09db0969107b2fd6a69bf4d32b043050de1e7 # HEAD of "master" as of 25.07.2016
+nova_lxd_git_install_branch: 96c2c0864c59589b40ca0d3ea989b0f09fedd5c7 # HEAD of "master" as of 01.08.2016
 nova_lxd_git_dest: "/opt/nova_lxd_{{ nova_lxd_git_install_branch | replace('/', '_') }}"
 nova_lxd_git_project_group: nova_compute
 
 
 ## Swift service
 swift_git_repo: https://git.openstack.org/openstack/swift
-swift_git_install_branch: f978133cfdb2639e679738e1e193ff9986f22231 # HEAD of "master" as of 27.07.2016
+swift_git_install_branch: 2c062d93d883260c4895bc87b5fb3f6a2c2513a2 # HEAD of "master" as of 01.08.2016
 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
 swift_git_project_group: swift_all
 
 
 ## Ironic service
 ironic_git_repo: https://git.openstack.org/openstack/ironic
-ironic_git_install_branch: f7bfa3ee73a2f94be28017212b699d07e9c7ad92 # HEAD of "master" as of 27.07.2016
+ironic_git_install_branch: 66b66fd6296398482d95f7ef5383ada9f6f60264 # HEAD of "master" as of 01.08.2016
 ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}"
 ironic_git_project_group: ironic_all
diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml
index 1d46448874..aa8660e707 100644
--- a/playbooks/inventory/group_vars/all.yml
+++ b/playbooks/inventory/group_vars/all.yml
@@ -26,7 +26,7 @@ ssh_delay: 5
 # These pins are updated through the sources-branch-updater script
 pip_packages:
   - pip==8.1.2
-  - setuptools==25.1.0
+  - setuptools==25.1.1
   - wheel==0.29.0
 
 pip_links:
diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh
index 245ad663bb..c13cb064c0 100755
--- a/scripts/scripts-library.sh
+++ b/scripts/scripts-library.sh
@@ -21,7 +21,7 @@ MAX_RETRIES=${MAX_RETRIES:-5}
 REPORT_DATA=${REPORT_DATA:-""}
 ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-" -e 'gather_facts=False' "}
 STARTTIME="${STARTTIME:-$(date +%s)}"
-PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==25.1.0 wheel==0.29.0 '}
+PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==25.1.1 wheel==0.29.0 '}
 
 # The default SSHD configuration has MaxSessions = 10. If a deployer changes
 #  their SSHD config, then the ANSIBLE_FORKS may be set to a higher number. We