diff --git a/releasenotes/notes/add-uc-to-whels-2f692964ae6d684c.yaml b/releasenotes/notes/add-uc-to-whels-2f692964ae6d684c.yaml
new file mode 100644
index 0000000..0865169
--- /dev/null
+++ b/releasenotes/notes/add-uc-to-whels-2f692964ae6d684c.yaml
@@ -0,0 +1,3 @@
+---
+fixes:
+  - Added "upper-constraints.txt" to wheels archive.
diff --git a/roles/build_openstack_requirements/tasks/main.yml b/roles/build_openstack_requirements/tasks/main.yml
index d56e18e..eb9c3cb 100644
--- a/roles/build_openstack_requirements/tasks/main.yml
+++ b/roles/build_openstack_requirements/tasks/main.yml
@@ -83,6 +83,15 @@
     CASS_DRIVER_BUILD_CONCURRENCY: "{{ ansible_processor_vcpus }}"
     MAKEFLAGS: "-j{{ ansible_processor_vcpus }}"
 
+- name: Build wheels for extra packages
+  changed_when: false
+  ansible.builtin.command:
+    pip wheel --no-deps -c {{ _upper_constraints_file.path }} uwsgi
+  args:
+    chdir: "{{ build_openstack_requirements_wheels_path }}"
+  environment:
+    MAKEFLAGS: "-j{{ ansible_processor_vcpus }}"
+
 - name: Create archive with all wheels
   # TODO(mnaser): Switch this to "community.general.archive" once Zuul is using
   #               a new enough Ansible.
diff --git a/playbooks/build_wheels.yml b/zuul.d/playbooks/ansible-collection-atmosphere-build-wheels/run.yml
similarity index 100%
rename from playbooks/build_wheels.yml
rename to zuul.d/playbooks/ansible-collection-atmosphere-build-wheels/run.yml
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