diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000000..2a38d6bc75
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["pbr>=6.1.1"]
+build-backend = "pbr.build"
diff --git a/releasenotes/notes/fixed-osa-version-detection-59ea42b9f2f55914.yaml b/releasenotes/notes/fixed-osa-version-detection-59ea42b9f2f55914.yaml
new file mode 100644
index 0000000000..d15523fb9d
--- /dev/null
+++ b/releasenotes/notes/fixed-osa-version-detection-59ea42b9f2f55914.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    OpenStack-Ansible and venv version detection is fixed for environments
+    which were upgraded from pre-Flamingo releases.
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index f5d8f8d249..3b04d388c7 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -135,7 +135,7 @@ if [ "${SETUP_ARA}" == "true" ]; then
 fi
 
 # Get current code version (this runs at the root of OSA clone)
-export CURRENT_OSA_VERSION=$(cd ${OSA_CLONE_DIR}; /opt/ansible-runtime/bin/python -c "from importlib.metadata import version; print(version('openstack-ansible'))")
+export CURRENT_OSA_VERSION=$(cd /tmp; /opt/ansible-runtime/bin/python -c "from importlib.metadata import version; print(version('openstack-ansible'))")
 
 # Ensure that Ansible binaries run from the venv
 pushd /opt/ansible-runtime/bin
diff --git a/setup.py b/setup.py
index cd35c3c35b..db1ad0c61b 100644
--- a/setup.py
+++ b/setup.py
@@ -16,5 +16,5 @@
 import setuptools
 
 setuptools.setup(
-    setup_requires=['pbr>=2.0.0'],
+    setup_requires=['pbr>=6.1.1'],
     pbr=True)