diff --git a/openstack/ironic-inspector/ironic-inspector.spec.j2 b/openstack/ironic-inspector/ironic-inspector.spec.j2
index 1711f0fe5..5a46e2e81 100644
--- a/openstack/ironic-inspector/ironic-inspector.spec.j2
+++ b/openstack/ironic-inspector/ironic-inspector.spec.j2
@@ -29,7 +29,6 @@ BuildRequires:  {{ py3('devel') }}
 BuildRequires:  {{ py3('eventlet') }}
 BuildRequires:  {{ py3('fixtures') }}
 BuildRequires:  {{ py3('futurist') }}
-BuildRequires:  {{ py3('ironic-lib') }}
 BuildRequires:  {{ py3('jsonpath-rw') }}
 BuildRequires:  {{ py3('jsonschema') }}
 BuildRequires:  {{ py3('keystoneauth1') }}
@@ -92,7 +91,6 @@ Requires:     {{ py3('automaton') }}
 Requires:     {{ py3('construct') }}
 Requires:     {{ py3('eventlet') }}
 Requires:     {{ py3('futurist') }}
-Requires:     {{ py3('ironic-lib') }}
 Requires:     {{ py3('jsonpath-rw') }}
 Requires:     {{ py3('jsonschema') }}
 Requires:     {{ py3('keystoneauth1') }}
diff --git a/openstack/ironic-lib/ironic-lib.spec.j2 b/openstack/ironic-lib/ironic-lib.spec.j2
deleted file mode 100644
index 4f0033740..000000000
--- a/openstack/ironic-lib/ironic-lib.spec.j2
+++ /dev/null
@@ -1,74 +0,0 @@
-{% set pypi_name = 'ironic-lib' %}
-{% set upstream_version = upstream_version('6.2.0') %}
-{% set rpm_release = '1' %}
-{% set source = url_pypi() %}
-
-Name:           {{ py2name(py_versions='py3') }}
-Version:        {{ py2rpmversion() }}
-Release:        {{ py2rpmrelease() }}
-Summary:        Ironic Common Libraries
-License:        {{ license('Apache-2.0') }}
-Group:          Development/Languages/Python
-URL:            https://docs.openstack.org/ironic-lib/latest/
-Source0:        https://files.pythonhosted.org/packages/source/i/ironic-lib/ironic-lib-%{version}.tar.gz
-BuildRequires:  openstack-macros
-BuildRequires:  {{ py3('bcrypt') }}
-BuildRequires:  {{ py3('keystoneauth1') }}
-BuildRequires:  {{ py3('keystonemiddleware') }}
-BuildRequires:  {{ py3('oslo.concurrency') }}
-BuildRequires:  {{ py3('oslo.config') }}
-BuildRequires:  {{ py3('oslo.log') }}
-BuildRequires:  {{ py3('oslo.messaging') }}
-BuildRequires:  {{ py3('oslo.service') }}
-BuildRequires:  {{ py3('oslotest') }}
-BuildRequires:  {{ py3('pbr') }}
-BuildRequires:  {{ py3('stestr') }}
-BuildRequires:  {{ py3('tenacity') }}
-BuildRequires:  {{ py3('zeroconf') }}
-Requires:       {{ py3('bcrypt') }}
-Requires:       {{ py3('eventlet') }}
-Requires:       {{ py3('keystoneauth1') }}
-Requires:       {{ py3('oslo.concurrency') }}
-Requires:       {{ py3('oslo.config') }}
-Requires:       {{ py3('oslo.i18n') }}
-Requires:       {{ py3('oslo.log') }}
-Requires:       {{ py3('oslo.messaging') }}
-Requires:       {{ py3('oslo.serialization') }}
-Requires:       {{ py3('oslo.service') }}
-Requires:       {{ py3('oslo.utils') }}
-Requires:       {{ py3('requests') }}
-Requires:       {{ py3('tenacity') }}
-Requires:       {{ py3('zeroconf') }}
-BuildArch:      noarch
-
-%description
-A common library to be used **exclusively** by projects under the `Ironic
-governance <https://governance.openstack.org/tc/reference/projects/ironic.html>`
-
-%prep
-%autosetup -p1 -n {{ pypi_name }}-{{ upstream_version }}
-%py_req_cleanup
-
-%build
-%{py3_build}
-
-%check
-%{openstack_stestr_run}
-
-%install
-%{py3_install}
-
-install -p -m 755 -d %{buildroot}/%{_sysconfdir}/ironic/rootwrap.d
-install -p -m 640 etc/ironic/rootwrap.d/*.filters %{buildroot}/%{_sysconfdir}/ironic/rootwrap.d/
-rm -rf %{buildroot}/%{_prefix}/%{_sysconfdir}/ironic/rootwrap.d
-
-%files
-%license LICENSE
-%doc ChangeLog README.rst
-%{python3_sitelib}/ironic_lib
-%{python3_sitelib}/ironic_lib*egg-info
-%dir %{_sysconfdir}/ironic
-%dir %{_sysconfdir}/ironic/rootwrap.d
-%{_sysconfdir}/ironic/rootwrap.d/*.filters
-
-%changelog
diff --git a/openstack/ironic-python-agent/ironic-python-agent.spec.j2 b/openstack/ironic-python-agent/ironic-python-agent.spec.j2
index e71134ac3..7d626da98 100644
--- a/openstack/ironic-python-agent/ironic-python-agent.spec.j2
+++ b/openstack/ironic-python-agent/ironic-python-agent.spec.j2
@@ -17,12 +17,9 @@ BuildRequires:  {{ py3('Pint') }}
 BuildRequires:  {{ py3('Werkzeug') }}
 BuildRequires:  {{ py3('cryptography') }}
 BuildRequires:  {{ py3('eventlet') }}
-BuildRequires:  {{ py3('ironic-lib') }}
-BuildRequires:  {{ py3('netifaces') }}
 BuildRequires:  {{ py3('oslo.concurrency') }}
 BuildRequires:  {{ py3('oslo.config') }}
 BuildRequires:  {{ py3('oslo.log') }}
-BuildRequires:  {{ py3('oslo.serialization') }}
 BuildRequires:  {{ py3('oslo.service') }}
 BuildRequires:  {{ py3('oslo.utils') }}
 BuildRequires:  {{ py3('oslotest') }}
@@ -30,11 +27,11 @@ BuildRequires:  {{ py3('pbr') }}
 BuildRequires:  {{ py3('psutil') }}
 BuildRequires:  {{ py3('pyudev') }}
 BuildRequires:  {{ py3('requests') }}
-BuildRequires:  {{ py3('rtslib-fb') }}
 BuildRequires:  {{ py3('stestr') }}
 BuildRequires:  {{ py3('stevedore') }}
 BuildRequires:  {{ py3('tenacity') }}
 BuildRequires:  {{ py3('tooz') }}
+BuildRequires:  {{ py3('zeroconf') }}
 Requires:       python3-{{ pypi_name }} = %{version}-%{release}
 BuildArch:      noarch
 %if 0%{?suse_version}
@@ -64,22 +61,19 @@ Requires:       {{ py3('Pint') }}
 Requires:       {{ py3('Werkzeug') }}
 Requires:       {{ py3('cryptography') }}
 Requires:       {{ py3('eventlet') }}
-Requires:       {{ py3('ironic-lib') }}
-Requires:       {{ py3('netifaces') }}
 Requires:       {{ py3('oslo.concurrency') }}
 Requires:       {{ py3('oslo.config') }}
 Requires:       {{ py3('oslo.log') }}
-Requires:       {{ py3('oslo.serialization') }}
 Requires:       {{ py3('oslo.service') }}
 Requires:       {{ py3('oslo.utils') }}
 Requires:       {{ py3('pbr') }}
 Requires:       {{ py3('psutil') }}
 Requires:       {{ py3('pyudev') }}
 Requires:       {{ py3('requests') }}
-Requires:       {{ py3('rtslib-fb') }}
 Requires:       {{ py3('stevedore') }}
 Requires:       {{ py3('tenacity') }}
 Requires:       {{ py3('tooz') }}
+Requires:       {{ py3('zeroconf') }}
 
 %description -n python3-{{ pypi_name }}
 The ironic-python-agent works with the agent driver in Ironic to provision the node.
diff --git a/openstack/ironic/ironic.spec.j2 b/openstack/ironic/ironic.spec.j2
index 9493ac512..aa67f4066 100644
--- a/openstack/ironic/ironic.spec.j2
+++ b/openstack/ironic/ironic.spec.j2
@@ -24,25 +24,26 @@ Source6:        openstack-ironic-api.service
 Source7:        openstack-ironic-conductor.service
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py3('Jinja2') }}
+BuildRequires:  {{ py3('PyYAML') }}
 BuildRequires:  {{ py3('SQLAlchemy') }}
 BuildRequires:  {{ py3('WebOb') }}
 BuildRequires:  {{ py3('alembic') }}
 BuildRequires:  {{ py3('automaton') }}
-BuildRequires:  {{ py3('python-cinderclient') }}
+BuildRequires:  {{ py3('bcrypt') }}
 BuildRequires:  {{ py3('construct') }}
 BuildRequires:  {{ py3('ddt') }}
 BuildRequires:  {{ py3('eventlet') }}
 BuildRequires:  {{ py3('fixtures') }}
 BuildRequires:  {{ py3('futurist') }}
-BuildRequires:  {{ py3('python-glanceclient') }}
-BuildRequires:  {{ py3('ironic-lib') }}
 BuildRequires:  {{ py3('iso8601') }}
 BuildRequires:  {{ py3('jsonpatch') }}
 BuildRequires:  {{ py3('jsonschema') }}
 BuildRequires:  {{ py3('keystoneauth1') }}
 BuildRequires:  {{ py3('keystonemiddleware') }}
 BuildRequires:  {{ py3('microversion_parse') }}
+BuildRequires:  {{ py3('netaddr') }}
 BuildRequires:  {{ py3('openstacksdk') }}
+BuildRequires:  {{ py3('os-service-types') }}
 BuildRequires:  {{ py3('os-traits') }}
 BuildRequires:  {{ py3('oslo.concurrency') }}
 BuildRequires:  {{ py3('oslo.config') }}
@@ -66,18 +67,17 @@ BuildRequires:  {{ py3('pbr') }}
 BuildRequires:  {{ py3('pecan') }}
 BuildRequires:  {{ py3('psutil') }}
 BuildRequires:  {{ py3('pycdlib') }}
-BuildRequires:  {{ py3('pysendfile') }}
 BuildRequires:  {{ py3('pysnmp') }}
-BuildRequires:  {{ py3('pytz') }}
 BuildRequires:  {{ py3('requests') }}
 BuildRequires:  {{ py3('rfc3986') }}
 BuildRequires:  {{ py3('stestr') }}
 BuildRequires:  {{ py3('stevedore') }}
 BuildRequires:  {{ py3('sushy') }}
-BuildRequires:  {{ py3('python-swiftclient') }}
 BuildRequires:  {{ py3('tenacity') }}
 BuildRequires:  {{ py3('testtools') }}
 BuildRequires:  {{ py3('tooz') }}
+BuildRequires:  {{ py3('websockify') }}
+BuildRequires:  {{ py3('zeroconf') }}
 BuildRequires:  sudo
 Requires:       logrotate
 Requires:       python3-{{ pypi_name }} = %{epoch}:%{version}-%{release}
@@ -112,22 +112,23 @@ also supports vendor-specific plugins which may implement additional functionali
 Summary:        OpenStack shared file system service (ironic) - Python module
 Group:          Development/Languages/Python
 Requires:       {{ py3('Jinja2') }}
+Requires:       {{ py3('PyYAML') }}
 Requires:       {{ py3('SQLAlchemy') }}
 Requires:       {{ py3('WebOb') }}
 Requires:       {{ py3('alembic') }}
 Requires:       {{ py3('automaton') }}
-Requires:       {{ py3('python-cinderclient') }}
+Requires:       {{ py3('bcrypt') }}
 Requires:       {{ py3('construct') }}
 Requires:       {{ py3('eventlet') }}
 Requires:       {{ py3('futurist') }}
-Requires:       {{ py3('python-glanceclient') }}
-Requires:       {{ py3('ironic-lib') }}
 Requires:       {{ py3('jsonpatch') }}
 Requires:       {{ py3('jsonschema') }}
 Requires:       {{ py3('keystoneauth1') }}
 Requires:       {{ py3('keystonemiddleware') }}
 Requires:       {{ py3('microversion_parse') }}
+Requires:       {{ py3('netaddr') }}
 Requires:       {{ py3('openstacksdk') }}
+Requires:       {{ py3('os-service-types') }}
 Requires:       {{ py3('os-traits') }}
 Requires:       {{ py3('oslo.concurrency') }}
 Requires:       {{ py3('oslo.config') }}
@@ -148,15 +149,14 @@ Requires:       {{ py3('pbr') }}
 Requires:       {{ py3('pecan') }}
 Requires:       {{ py3('psutil') }}
 Requires:       {{ py3('pycdlib') }}
-Requires:       {{ py3('pysendfile') }}
-Requires:       {{ py3('pytz') }}
 Requires:       {{ py3('requests') }}
 Requires:       {{ py3('rfc3986') }}
 Requires:       {{ py3('stevedore') }}
 Requires:       {{ py3('sushy') }}
-Requires:       {{ py3('python-swiftclient') }}
 Requires:       {{ py3('tenacity') }}
 Requires:       {{ py3('tooz') }}
+Requires:       {{ py3('websockify') }}
+Requires:       {{ py3('zeroconf') }}
 Requires:       sudo
 
 %description -n python3-{{ pypi_name }}