diff --git a/zuul.d/playbooks/ansible-collection-atmosphere-build-wheels/run.yml b/zuul.d/playbooks/ansible-collection-atmosphere-build-wheels/run.yml
new file mode 100644
index 0000000..e5977a6
--- /dev/null
+++ b/zuul.d/playbooks/ansible-collection-atmosphere-build-wheels/run.yml
@@ -0,0 +1,18 @@
+# Copyright (c) 2022 VEXXHOST, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+- name: Build wheels for OpenStack requirements
+  hosts: all
+  roles:
+    - build_openstack_requirements
\ No newline at end of file
diff --git a/zuul.d/playbooks/ansible-collection-atmosphere-merge-wheels/run.yml b/zuul.d/playbooks/ansible-collection-atmosphere-merge-wheels/run.yml
index 519aabb..8a75cd9 100644
--- a/zuul.d/playbooks/ansible-collection-atmosphere-merge-wheels/run.yml
+++ b/zuul.d/playbooks/ansible-collection-atmosphere-merge-wheels/run.yml
@@ -36,9 +36,17 @@
       loop: "{{ zuul.artifacts }}"
       when: item.metadata.get("type") == "wheels"
 
+    - name: Add upper-constraints.txt to the folder
+      ansible.builtin.get_url:
+        url: "https://releases.openstack.org/constraints/upper/{{ build_openstack_requirements_release }}"
+        dest: /tmp/wheels/upper-constraints.txt
+        mode: 0644
+
     - name: Create archive with all wheels
       # TODO(mnaser): Switch this to "community.general.archive" once Zuul is using
       #               a new enough Ansible.
       archive:
-        path: "/tmp/wheels/*.whl"
-        dest: /tmp/wheels.tar.gz
\ No newline at end of file
+        dest: /tmp/wheels.tar.gz
+        path:
+          - /tmp/wheels/*.whl
+          - /tmp/wheels/*.txt
\ No newline at end of file
diff --git a/zuul.d/wheels-wallaby.yaml b/zuul.d/wheels-wallaby.yaml
index 2f10d80..cbf951b 100644
--- a/zuul.d/wheels-wallaby.yaml
+++ b/zuul.d/wheels-wallaby.yaml
@@ -34,6 +34,8 @@
     dependencies:
       - ansible-collection-atmosphere-build-wheels-wallaby-amd64
       - ansible-collection-atmosphere-build-wheels-wallaby-aarch64
+    vars:
+      build_openstack_requirements_release: wallaby
 
 - job:
     name: ansible-collection-atmosphere-promote-wheels-wallaby
diff --git a/zuul.d/wheels.yaml b/zuul.d/wheels.yaml
index ee7ab18..fb3b68d 100644
--- a/zuul.d/wheels.yaml
+++ b/zuul.d/wheels.yaml
@@ -18,11 +18,10 @@
     pre-run:
       - zuul.d/playbooks/ansible-collection-atmosphere-build-wheels/pre-run.yml
     run:
-      - playbooks/build_wheels.yml
+      - zuul.d/playbooks/ansible-collection-atmosphere-build-wheels/run.yml
     post-run:
       - zuul.d/playbooks/ansible-collection-atmosphere-build-wheels/post-run.yml
     files: &build-wheels-files
-      - playbooks/build_wheels.yml
       - roles/build_openstack_requirements/.*
     vars:
       build_openstack_requirements_wheels_directory: /tmp