diff --git a/openstack/automaton/automaton.spec.j2 b/openstack/automaton/automaton.spec.j2
index 5f2d4ec8f..ceba6634c 100644
--- a/openstack/automaton/automaton.spec.j2
+++ b/openstack/automaton/automaton.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'automaton' %}
-{% set upstream_version = upstream_version('2.0.0') %}
+{% set upstream_version = upstream_version('2.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/castellan/castellan.spec.j2 b/openstack/castellan/castellan.spec.j2
index f25ddfaa3..b88088bfc 100644
--- a/openstack/castellan/castellan.spec.j2
+++ b/openstack/castellan/castellan.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'castellan' %}
-{% set upstream_version = upstream_version('2.0.0') %}
+{% set upstream_version = upstream_version('3.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/debtcollector/debtcollector.spec.j2 b/openstack/debtcollector/debtcollector.spec.j2
index 3126ace2d..b7654292f 100644
--- a/openstack/debtcollector/debtcollector.spec.j2
+++ b/openstack/debtcollector/debtcollector.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'debtcollector' %}
-{% set upstream_version = upstream_version('2.0.0') %}
+{% set upstream_version = upstream_version('2.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/futurist/futurist.spec.j2 b/openstack/futurist/futurist.spec.j2
index 1a34bc10c..07e2e890a 100644
--- a/openstack/futurist/futurist.spec.j2
+++ b/openstack/futurist/futurist.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'futurist' %}
-{% set upstream_version = upstream_version('2.1.0') %}
+{% set upstream_version = upstream_version('2.1.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/oslo.context/oslo.context.spec.j2 b/openstack/oslo.context/oslo.context.spec.j2
index 38e77ed08..a560cd206 100644
--- a/openstack/oslo.context/oslo.context.spec.j2
+++ b/openstack/oslo.context/oslo.context.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'oslo.context' %}
-{% set upstream_version = upstream_version('3.0.0') %}
+{% set upstream_version = upstream_version('3.0.2') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/oslo.policy/oslo.policy.spec.j2 b/openstack/oslo.policy/oslo.policy.spec.j2
index 32b6c4630..d19d84b66 100644
--- a/openstack/oslo.policy/oslo.policy.spec.j2
+++ b/openstack/oslo.policy/oslo.policy.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'oslo.policy' %}
-{% set upstream_version = upstream_version('3.0.3') %}
+{% set upstream_version = upstream_version('3.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/oslotest/oslotest.spec.j2 b/openstack/oslotest/oslotest.spec.j2
index f0d7004ea..0978f2e06 100644
--- a/openstack/oslotest/oslotest.spec.j2
+++ b/openstack/oslotest/oslotest.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'oslotest' %}
-{% set upstream_version = upstream_version('4.0.0') %}
+{% set upstream_version = upstream_version('4.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/osprofiler/osprofiler.spec.j2 b/openstack/osprofiler/osprofiler.spec.j2
index 7e26904b6..19e376d09 100644
--- a/openstack/osprofiler/osprofiler.spec.j2
+++ b/openstack/osprofiler/osprofiler.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'osprofiler' %}
-{% set upstream_version = upstream_version('3.0.0') %}
+{% set upstream_version = upstream_version('3.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/ovsdbapp/ovsdbapp.spec.j2 b/openstack/ovsdbapp/ovsdbapp.spec.j2
index 4a5c7b826..a41e46e22 100644
--- a/openstack/ovsdbapp/ovsdbapp.spec.j2
+++ b/openstack/ovsdbapp/ovsdbapp.spec.j2
@@ -1,6 +1,6 @@
 %define with_tests 1
 {% set pypi_name = 'ovsdbapp' %}
-{% set upstream_version = upstream_version('1.0.0') %}
+{% set upstream_version = upstream_version('1.1.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 Name:           {{ py2name() }}
diff --git a/openstack/pycadf/pycadf.spec.j2 b/openstack/pycadf/pycadf.spec.j2
index c1ee94afa..a203660c1 100644
--- a/openstack/pycadf/pycadf.spec.j2
+++ b/openstack/pycadf/pycadf.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'pycadf' %}
-{% set upstream_version = upstream_version('2.10.0') %}
+{% set upstream_version = upstream_version('3.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 Name:           {{ py2name() }}
@@ -43,6 +43,7 @@ This package contains the Python 3.x module.
 Summary:        Documentation for the DMTF Cloud Audit (CADF) data model
 BuildRequires:  {{ py3('Sphinx') }}
 BuildRequires:  {{ py3('openstackdocstheme') }}
+BuildRequires:  {{ py3('sphinxcontrib-apidoc') }}
 
 %description -n python-pycadf-doc
 Documentation for the DMTF Cloud Audit (CADF) data model.
diff --git a/openstack/reno/reno.spec.j2 b/openstack/reno/reno.spec.j2
index 46bc4e359..899023efd 100644
--- a/openstack/reno/reno.spec.j2
+++ b/openstack/reno/reno.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'reno' %}
-{% set upstream_version = upstream_version('3.0.0') %}
+{% set upstream_version = upstream_version('3.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/sphinx-feature-classification/sphinx-feature-classification.spec.j2 b/openstack/sphinx-feature-classification/sphinx-feature-classification.spec.j2
index f1eace67e..e48bed095 100644
--- a/openstack/sphinx-feature-classification/sphinx-feature-classification.spec.j2
+++ b/openstack/sphinx-feature-classification/sphinx-feature-classification.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'sphinx-feature-classification' %}
-{% set upstream_version = upstream_version('1.0.0') %}
+{% set upstream_version = upstream_version('1.0.1') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/sushy/sushy.spec.j2 b/openstack/sushy/sushy.spec.j2
index 98eeff130..a59795e7e 100644
--- a/openstack/sushy/sushy.spec.j2
+++ b/openstack/sushy/sushy.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'sushy' %}
-{% set upstream_version = upstream_version('3.1.0') %}
+{% set upstream_version = upstream_version('3.2.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
diff --git a/openstack/tempest/tempest.spec.j2 b/openstack/tempest/tempest.spec.j2
index fedc878a6..c03a2889a 100644
--- a/openstack/tempest/tempest.spec.j2
+++ b/openstack/tempest/tempest.spec.j2
@@ -1,5 +1,5 @@
 {% set pypi_name = 'tempest' %}
-{% set upstream_version = upstream_version('23.0.0') %}
+{% set upstream_version = upstream_version('24.0.0') %}
 {% set rpm_release = '1' %}
 {% set source = url_pypi() %}
 
@@ -136,7 +136,6 @@ cp -av .stestr.conf %{buildroot}/%{_localstatedir}/lib/%{name}-test/
 %doc README.rst ChangeLog
 %_tmpfilesdir/%{name}.conf
 %{_bindir}/tempest
-%{_bindir}/verify-tempest-config
 %{_bindir}/tempest-account-generator
 %{_bindir}/skip-tracker
 %{_bindir}/check-uuid