diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 7a1047535e..596f6dde7b 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -145,11 +145,11 @@
 - name: rabbitmq_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
-  version: 55a66fa0baaa49aeeaa0cb4672c87e8003f17b26
+  version: deccf93bdda1aa873b956418168368284509c99b
 - name: repo_build
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_build
-  version: b9960a02f3111b0adba0d24c76621cc3b76805a7
+  version: 630a6dfdcb46ba719ddb7fd7a4875259c5602b15
 - name: repo_server
   scm: git
   src: https://git.openstack.org/openstack/openstack-ansible-repo_server
diff --git a/playbooks/utility-install.yml b/playbooks/utility-install.yml
index 3f72f64a14..33ab1e84c0 100644
--- a/playbooks/utility-install.yml
+++ b/playbooks/utility-install.yml
@@ -105,6 +105,23 @@
           args:
             creates: "{{ utility_venv_bin }}/activate"
 
+        - name: Upgrade pip/setuptools/wheel to the versions we want
+          pip:
+            name:
+              - pip
+              - setuptools
+              - wheel
+            state: "{{ utility_pip_package_state }}"
+            virtualenv: "{{ utility_venv_bin | dirname }}"
+            virtualenv_site_packages: "no"
+            extra_args: >-
+              {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
+              {{ pip_install_options | default('') }}
+          register: install_packages
+          until: install_packages is success
+          retries: 5
+          delay: 2
+
         - name: Install pip packages
           pip:
             name: "{{ _openstack_client_list | union(utility_pip_packages) }}"