diff --git a/doc/requirements.txt b/doc/requirements.txt
index b6ef42dc..255f9f24 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,5 @@
 sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-httpdomain>=1.3.0 # BSD
-sphinxcontrib-blockdiag>=1.5.4 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
 reno>=3.1.0 # Apache-2.0
 os-api-ref>=1.4.0 # Apache-2.0
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/setup_firewalld.yml b/playbooks/roles/bifrost-ironic-install/tasks/setup_firewalld.yml
index 3c960eda..2bf1316f 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/setup_firewalld.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/setup_firewalld.yml
@@ -11,6 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
+- name: "Ensure firewalld is unmasked"
+  systemd:
+    name: firewalld
+    masked: no
+
 - name: "Enable firewalld"
   service:
     name: firewalld
diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
index 43195258..aa38dcdc 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
@@ -142,6 +142,7 @@ allow_credentials = {{ enable_cors_credential_support | default('true') }}
 
 [ipmi]
 debug = {{ ironic_debug | bool and testing | bool }}
+disable_boot_timeout = {{ ipmi_disable_boot_timeout | default('True') | bool }}
 
 [ilo]
 use_web_server_for_images = true
diff --git a/tox.ini b/tox.ini
index 6725788f..7a1a5a4c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,6 +42,7 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1}
   -r{toxinidir}/doc/requirements.txt
+  setuptools>=65.7.0,<82 # MIT
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pdf-docs]