diff --git a/defaults/main.yml b/defaults/main.yml
index 3c253ae..0bea2de 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -46,7 +46,7 @@ rally_database_connection_string: mysql+pymysql://{{ rally_galera_user }}:{{ ral
 # NOTE(mnaser): This uses the Rally upper-constraints because it
 #               is branchless and maintains it's own constraints,
 #               outside of requirements.
-rally_upper_constraints_url: "https://releases.openstack.org/constraints/upper/master"
+rally_upper_constraints_url: "https://opendev.org/openstack/rally-openstack/raw/branch/master/upper-constraints.txt"
 rally_git_constraints:
   - "--constraint {{ rally_upper_constraints_url }}"
 rally_pip_packages:
diff --git a/tasks/main.yml b/tasks/main.yml
index 65834ae..ae4ab90 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -51,10 +51,13 @@
   vars:
     venv_python_executable: "{{ rally_venv_python_executable }}"
     venv_build_constraints: "{{ rally_git_constraints }}"
+    venv_build_global_constraints: "{{ [] }}"
+    venv_build_distro_package_list: "{{ rally_devel_distro_packages }}"
     venv_install_destination_path: "{{ rally_bin | dirname }}"
     venv_install_distro_package_list: "{{ rally_distro_packages }}"
     venv_pip_install_args: "{{ rally_pip_install_args }}"
     venv_pip_packages: "{{ rally_pip_packages }}"
+    venv_wheel_build_enable: false
     venv_facts_when_changed:
       - section: "rally"
         option: "venv_tag"
diff --git a/vars/debian.yml b/vars/debian.yml
index 17d0513..d508a45 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -15,4 +15,7 @@
 
 cache_timeout: 600
 
+rally_devel_distro_packages:
+  - libpython3-dev
+
 rally_distro_packages: []
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 423b4eb..279d35c 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -13,4 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+rally_devel_distro_packages:
+  - python36-devel
+
 rally_distro_packages: []