diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml
index 65caaa0ce..a353b9e55 100644
--- a/.github/workflows/stackhpc-pull-request.yml
+++ b/.github/workflows/stackhpc-pull-request.yml
@@ -8,58 +8,58 @@ name: Pull request
 'on':
   pull_request:
 jobs:
-  # Detect which files have changed and use this to run jobs conditionally.
-  # Note that we can't use the workflow-level paths attribute since this
-  # would skip the workflow entirely, and would prevent us from making the
-  # aio jobs required to pass (a skip counts as a pass).
-  check-changes:
-    runs-on: ubuntu-22.04
-    permissions:
-      pull-requests: read
-    name: Check changed files
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
-    outputs:
-      aio: ${{ steps.changes.outputs.aio }}
-      build-kayobe-image: ${{ steps.changes.outputs.build-kayobe-image }}
-      check-tags: ${{ steps.changes.outputs.check-tags }}
-    steps:
-      - name: GitHub Checkout
-        uses: actions/checkout@v4
-
-      - name: Check changed files
-        uses: dorny/paths-filter@v3
-        id: changes
-        with:
-          # Filters are defined in this file.
-          filters: .github/path-filters.yml
-
-  tox:
-    runs-on: ubuntu-22.04
-    permissions: {}
-    strategy:
-      matrix:
-        include:
-          - environment: pep8
-            python-version: "3.10"
-          - environment: releasenotes
-            python-version: "3.10"
-          - environment: docs
-            python-version: "3.10"
-    name: Tox ${{ matrix.environment }} with Python ${{ matrix.python-version }}
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
-    steps:
-      - name: GitHub Checkout 🛎
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Setup Python ${{ matrix.python-version }} 🐍
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install Tox 📦
-        run: pip install tox
-      - name: Run Tox ${{ matrix.environment }} 🧪
-        run: tox -e ${{ matrix.environment }}
+  # # Detect which files have changed and use this to run jobs conditionally.
+  # # Note that we can't use the workflow-level paths attribute since this
+  # # would skip the workflow entirely, and would prevent us from making the
+  # # aio jobs required to pass (a skip counts as a pass).
+  # check-changes:
+  #   runs-on: ubuntu-22.04
+  #   permissions:
+  #     pull-requests: read
+  #   name: Check changed files
+  #   if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+  #   outputs:
+  #     aio: ${{ steps.changes.outputs.aio }}
+  #     build-kayobe-image: ${{ steps.changes.outputs.build-kayobe-image }}
+  #     check-tags: ${{ steps.changes.outputs.check-tags }}
+  #   steps:
+  #     - name: GitHub Checkout
+  #       uses: actions/checkout@v4
+
+  #     - name: Check changed files
+  #       uses: dorny/paths-filter@v3
+  #       id: changes
+  #       with:
+  #         # Filters are defined in this file.
+  #         filters: .github/path-filters.yml
+
+  # tox:
+  #   runs-on: ubuntu-22.04
+  #   permissions: {}
+  #   strategy:
+  #     matrix:
+  #       include:
+  #         - environment: pep8
+  #           python-version: "3.10"
+  #         - environment: releasenotes
+  #           python-version: "3.10"
+  #         - environment: docs
+  #           python-version: "3.10"
+  #   name: Tox ${{ matrix.environment }} with Python ${{ matrix.python-version }}
+  #   if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+  #   steps:
+  #     - name: GitHub Checkout 🛎
+  #       uses: actions/checkout@v4
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Setup Python ${{ matrix.python-version }} 🐍
+  #       uses: actions/setup-python@v5
+  #       with:
+  #         python-version: ${{ matrix.python-version }}
+  #     - name: Install Tox 📦
+  #       run: pip install tox
+  #     - name: Run Tox ${{ matrix.environment }} 🧪
+  #       run: tox -e ${{ matrix.environment }}
 
   lint:
     runs-on: ubuntu-22.04
@@ -106,129 +106,129 @@ jobs:
   # when the parent jobs completed successfully or were skipped. We pass an
   # 'if' argument to the called workflow to allow running it conditionally.
 
-  build-kayobe-image:
-    name: Build Kayobe Image
-    needs:
-      - check-changes
-    uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
-    with:
-      if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
-
-  check-tags:
-    name: Check container image tags
-    needs:
-      - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-check-tags.yml
-    with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
-
-  all-in-one-ubuntu-jammy-ovs:
-    name: aio (Ubuntu Jammy OVS)
-    needs:
-      - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-all-in-one.yml
-    with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: ubuntu
-      os_release: jammy
-      ssh_username: ubuntu
-      neutron_plugin: ovs
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
-
-  all-in-one-ubuntu-jammy-ovn:
-    name: aio (Ubuntu Jammy OVN)
-    needs:
-      - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-all-in-one.yml
-    with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: ubuntu
-      os_release: jammy
-      ssh_username: ubuntu
-      neutron_plugin: ovn
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
-
-  all-in-one-rocky-9-ovs:
-    name: aio (Rocky 9 OVS)
-    needs:
-      - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-all-in-one.yml
-    with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: rocky
-      os_release: "9"
-      ssh_username: cloud-user
-      neutron_plugin: ovs
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
-
-  all-in-one-rocky-9-ovn:
-    name: aio (Rocky 9 OVN)
-    needs:
-      - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-all-in-one.yml
-    with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: rocky
-      os_release: "9"
-      ssh_username: cloud-user
-      neutron_plugin: ovn
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
-
-  # Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
-
-  all-in-one-upgrade-ubuntu-jammy-ovs:
-    name: aio upgrade (Ubuntu Jammy OVS)
-    needs:
-      - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-all-in-one.yml
-    with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: ubuntu
-      os_release: jammy
-      ssh_username: ubuntu
-      neutron_plugin: ovs
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-      upgrade: true
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
-
-  all-in-one-upgrade-rocky-9-ovn:
-    name: aio upgrade (Rocky 9 OVN)
-    needs:
-      - check-changes
-      - build-kayobe-image
-    uses: ./.github/workflows/stackhpc-all-in-one.yml
-    with:
-      kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
-      os_distribution: rocky
-      os_release: "9"
-      ssh_username: cloud-user
-      neutron_plugin: ovn
-      OS_CLOUD: openstack
-      if: ${{ needs.check-changes.outputs.aio == 'true' }}
-      upgrade: true
-    secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+  # build-kayobe-image:
+  #   name: Build Kayobe Image
+  #   needs:
+  #     - check-changes
+  #   uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
+  #   with:
+  #     if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
+  #   if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+
+  # check-tags:
+  #   name: Check container image tags
+  #   needs:
+  #     - check-changes
+  #     - build-kayobe-image
+  #   uses: ./.github/workflows/stackhpc-check-tags.yml
+  #   with:
+  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+  #     if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
+  #   secrets: inherit
+  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+
+  # all-in-one-ubuntu-jammy-ovs:
+  #   name: aio (Ubuntu Jammy OVS)
+  #   needs:
+  #     - check-changes
+  #     - build-kayobe-image
+  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
+  #   with:
+  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+  #     os_distribution: ubuntu
+  #     os_release: jammy
+  #     ssh_username: ubuntu
+  #     neutron_plugin: ovs
+  #     OS_CLOUD: openstack
+  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
+  #   secrets: inherit
+  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+
+  # all-in-one-ubuntu-jammy-ovn:
+  #   name: aio (Ubuntu Jammy OVN)
+  #   needs:
+  #     - check-changes
+  #     - build-kayobe-image
+  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
+  #   with:
+  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+  #     os_distribution: ubuntu
+  #     os_release: jammy
+  #     ssh_username: ubuntu
+  #     neutron_plugin: ovn
+  #     OS_CLOUD: openstack
+  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
+  #   secrets: inherit
+  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+
+  # all-in-one-rocky-9-ovs:
+  #   name: aio (Rocky 9 OVS)
+  #   needs:
+  #     - check-changes
+  #     - build-kayobe-image
+  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
+  #   with:
+  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+  #     os_distribution: rocky
+  #     os_release: "9"
+  #     ssh_username: cloud-user
+  #     neutron_plugin: ovs
+  #     OS_CLOUD: openstack
+  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
+  #   secrets: inherit
+  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+
+  # all-in-one-rocky-9-ovn:
+  #   name: aio (Rocky 9 OVN)
+  #   needs:
+  #     - check-changes
+  #     - build-kayobe-image
+  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
+  #   with:
+  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+  #     os_distribution: rocky
+  #     os_release: "9"
+  #     ssh_username: cloud-user
+  #     neutron_plugin: ovn
+  #     OS_CLOUD: openstack
+  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
+  #   secrets: inherit
+  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+
+  # # Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
+
+  # all-in-one-upgrade-ubuntu-jammy-ovs:
+  #   name: aio upgrade (Ubuntu Jammy OVS)
+  #   needs:
+  #     - check-changes
+  #     - build-kayobe-image
+  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
+  #   with:
+  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+  #     os_distribution: ubuntu
+  #     os_release: jammy
+  #     ssh_username: ubuntu
+  #     neutron_plugin: ovs
+  #     OS_CLOUD: openstack
+  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
+  #     upgrade: true
+  #   secrets: inherit
+  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
+
+  # all-in-one-upgrade-rocky-9-ovn:
+  #   name: aio upgrade (Rocky 9 OVN)
+  #   needs:
+  #     - check-changes
+  #     - build-kayobe-image
+  #   uses: ./.github/workflows/stackhpc-all-in-one.yml
+  #   with:
+  #     kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
+  #     os_distribution: rocky
+  #     os_release: "9"
+  #     ssh_username: cloud-user
+  #     neutron_plugin: ovn
+  #     OS_CLOUD: openstack
+  #     if: ${{ needs.check-changes.outputs.aio == 'true' }}
+  #     upgrade: true
+  #   secrets: inherit
+  #   if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
diff --git a/README.rst b/README.rst
index 0f5cf6d74..6984028e8 100644
--- a/README.rst
+++ b/README.rst
@@ -2,17 +2,79 @@
 StackHPC Kayobe Configuration
 =============================
 
-This repository provides a base Kayobe configuration for the Caracal release
+This repository provides a base Kayobe configuration for the Master release
 of StackHPC OpenStack.
 
 Documentation is hosted on `readthedocs.io
-<https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-2024.1/index.html>`__,
+<https://stackhpc-kayobe-config.readthedocs.io/en/stackhpc-master/index.html>`__,
 and includes release notes.
 
-Resources
-=========
+Kayobe
+======
 
-* Kayobe documentation: https://docs.openstack.org/kayobe/2024.1/
-* Kayobe source: https://opendev.org/openstack/kayobe
-* Kayobe bugs: https://storyboard.openstack.org/#!/project/openstack/kayobe-config
-* IRC: #openstack-kolla
+The hosts in an OpenStack control plane must somehow be provisioned, but
+deploying a secondary OpenStack cloud to do this seems like overkill.
+
+Kayobe stands on the shoulders of giants:
+
+* OpenStack bifrost discovers and provisions the cloud
+* OpenStack kolla builds container images for OpenStack services
+* OpenStack kolla-ansible delivers painless deployment and upgrade of
+  containerised OpenStack services
+
+To this solid base, kayobe adds:
+
+* Configuration of cloud host OS & flexible networking
+* Management of physical network devices
+* A friendly openstack-like CLI
+
+All this and more, automated from top to bottom using Ansible.
+
+Features
+--------
+
+* Heavily automated using Ansible
+* *kayobe* Command Line Interface (CLI) for cloud operators
+* Deployment of a *seed* VM used to manage the OpenStack control plane
+* Configuration of physical network infrastructure
+* Discovery, introspection and provisioning of control plane hardware using
+  `OpenStack bifrost <https://docs.openstack.org/bifrost/latest/>`_
+* Deployment of an OpenStack control plane using `OpenStack kolla-ansible
+  <https://docs.openstack.org/kolla-ansible/latest/>`_
+* Discovery, introspection and provisioning of bare metal compute hosts
+  using `OpenStack ironic <https://docs.openstack.org/ironic/latest/>`_ and
+  `ironic inspector <https://docs.openstack.org/ironic-inspector/latest/>`_
+* Virtualised compute using `OpenStack nova
+  <https://docs.openstack.org/nova/latest/>`_
+* Containerised workloads on bare metal using `OpenStack magnum
+  <https://docs.openstack.org/magnum/latest/>`_
+* Control plane monitoring using `Prometheus <https://prometheus.io/>`__ and
+  `Grafana <https://grafana.com/>`__.
+* Log aggregation using `OpenSearch <https://opensearch.org/docs/latest/>`__
+  and `OpenSearch Dashboards
+  <https://opensearch.org/docs/latest/dashboards/index/>`__.
+
+Documentation
+-------------
+
+https://docs.openstack.org/kayobe/latest/
+
+Release Notes
+-------------
+
+https://docs.openstack.org/releasenotes/kayobe/
+
+Bugs
+----
+
+https://bugs.launchpad.net/kayobe
+
+Community
+---------
+
+OFTC's `IRC channel <http://webchat.oftc.net/?channels=openstack-kolla>`_: #openstack-kolla
+
+License
+-------
+
+Kayobe is distributed under the `Apache 2.0 License <https://www.apache.org/licenses/LICENSE-2.0>`__.
diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml
index cb24d7484..1d6d92a79 100644
--- a/etc/kayobe/apt.yml
+++ b/etc/kayobe/apt.yml
@@ -40,7 +40,7 @@ apt_keys:
 # * types: whitespace-separated list of repository types, e.g. deb or deb-src
 #   (optional, default is 'deb')
 # * url: URL of the repository
-# * suites: whitespace-separated list of suites, e.g. jammy (optional, default
+# * suites: whitespace-separated list of suites, e.g. noble (optional, default
 #   is ansible_facts.distribution_release)
 # * components: whitespace-separated list of components, e.g. main (optional,
 #   default is 'main')
@@ -84,6 +84,14 @@ stackhpc_apt_repositories:
 # are deployed.
 apt_repositories: "{{ stackhpc_apt_repositories | selectattr('required') | list if stackhpc_repos_enabled | bool else [] }}"
 
+# List of Apt preferences options. Each item is a dict with the following
+# keys:
+# * content: free-form preferences file content
+# * filename: name of a file in /etc/apt/preferences.d/ in which to write
+#   the configuration
+# Default is an empty list.
+#apt_preferences:
+
 # Whether to disable repositories in /etc/apt/sources.list. This may be used
 # when replacing the distribution repositories via apt_repositories.
 # Default is false.
diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml
index 4a060deb6..30bb757d6 100644
--- a/etc/kayobe/bifrost.yml
+++ b/etc/kayobe/bifrost.yml
@@ -158,6 +158,12 @@ kolla_bifrost_ipa_ramdisk_upstream_url: "{{ (stackhpc_ipa_image_url + '/ipa.init
 # Server inventory for Bifrost.
 #kolla_bifrost_servers:
 
+###############################################################################
+# Node provisioning configuration
+# Whether to use Ironic introspection data for admin interface MAC address
+# Default is false.
+#kolla_bifrost_use_introspection_mac:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/bmc.yml b/etc/kayobe/bmc.yml
index ea10df37f..b29ecf670 100644
--- a/etc/kayobe/bmc.yml
+++ b/etc/kayobe/bmc.yml
@@ -14,6 +14,9 @@
 # Password to use to access a host's BMC via IPMI.
 #ipmi_password:
 
+# Address to use to access a host's BMC via Redfish.
+#redfish_address:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/globals.yml b/etc/kayobe/globals.yml
index a97f74d1a..93ebdb4f9 100644
--- a/etc/kayobe/globals.yml
+++ b/etc/kayobe/globals.yml
@@ -49,7 +49,7 @@
 #os_distribution:
 
 # OS release. Valid options are "9-stream" when os_distribution is "centos", or
-# "9" when os_distribution is "rocky", or "jammy" when os_distribution is
+# "9" when os_distribution is "rocky", or "noble" when os_distribution is
 # "ubuntu".
 #os_release:
 
diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml
index 2c4a98fe0..d4417879a 100644
--- a/etc/kayobe/infra-vms.yml
+++ b/etc/kayobe/infra-vms.yml
@@ -30,13 +30,11 @@
 #infra_vm_root_format:
 
 # Base image for the infra VM root volume. Default is
-# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
-# when os_distribution is "ubuntu",
-# "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
-# when os_distribution is "rocky" and seed_vm_boot_firmware is "efi",
-# "https://dl.rockylinux.org/vault/rocky/9.3/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
-# when os_distribution is "rocky" and seed_vm_boot_firmware is not "efi"
-# (default is "bios"), or
+# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
+# when os_distribution is "ubuntu", or
+# https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2
+# when os_distribution is "rocky",
+# or
 # "https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20221206.0.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
@@ -60,7 +58,7 @@
 # OS family. Needed for config drive generation.
 #infra_vm_os_family:
 
-# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'.
+# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'efi'.
 #infra_vm_boot_firmware:
 
 # Machine type. Libvirt default configuration is used.
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 6e90b29b5..29427f1ef 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -62,6 +62,10 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
 ###############################################################################
 # Kolla configuration.
 
+# Kolla base container image architecture. Options are "x86_64", "aarch64".
+# Default is "{{ ansible_facts.architecture }}"
+#kolla_base_arch:
+
 # Kolla base container image distribution. Options are "centos", "debian",
 # "rocky", "ubuntu". Default is {{ os_distribution }}.
 #kolla_base_distro:
@@ -579,12 +583,12 @@ kolla_enable_central_logging: true
 #kolla_enable_ceph_rgw:
 #kolla_enable_ceph_rgw_loadbalancer:
 #kolla_enable_cinder:
-#kolla_enable_cinder_backend_hnas_nfs:
 #kolla_enable_cinder_backend_iscsi:
 #kolla_enable_cinder_backend_lvm:
 #kolla_enable_cinder_backend_nfs:
 #kolla_enable_cinder_backend_pure_fc:
 #kolla_enable_cinder_backend_pure_iscsi:
+#kolla_enable_cinder_backend_pure_nvme_tcp:
 #kolla_enable_cinder_backend_pure_roce:
 #kolla_enable_cinder_backend_quobyte:
 #kolla_enable_cinder_backup:
@@ -704,11 +708,11 @@ kolla_enable_prometheus: true
 #kolla_enable_prometheus_haproxy_exporter:
 #kolla_enable_prometheus_libvirt_exporter:
 #kolla_enable_prometheus_memcached_exporter:
-#kolla_enable_prometheus_msteams:
 #kolla_enable_prometheus_mysqld_exporter:
 #kolla_enable_prometheus_node_exporter:
 #kolla_enable_prometheus_openstack_exporter:
 #kolla_enable_prometheus_openstack_exporter_external:
+#kolla_enable_prometheus_proxysql_exporter:
 #kolla_enable_prometheus_rabbitmq_exporter:
 #kolla_enable_prometheus_server:
 #kolla_enable_proxysql:
diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml
index 66da584f1..1acfd0756 100644
--- a/etc/kayobe/openstack.yml
+++ b/etc/kayobe/openstack.yml
@@ -2,14 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "2024.1".
+# Name of the current OpenStack release. Default is "master".
 #openstack_release:
 
-# Codename of the current OpenStack release.
-# NOTE(upgrade): Update to current release codename.
-openstack_release_codename: "caracal"
-
-# Name of the current OpenStack branch. Default is "stable/2024.1".
+# Name of the current OpenStack branch. Default is "master".
 #openstack_branch:
 
 ###############################################################################
diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml
index 541103f08..e824bdf5a 100644
--- a/etc/kayobe/overcloud-dib.yml
+++ b/etc/kayobe/overcloud-dib.yml
@@ -31,7 +31,7 @@ overcloud_dib_host_packages_extra:
 #overcloud_dib_os_release:
 
 # List of default DIB elements. Default is ["{{ overcloud_dib_os_element }}",
-# "cloud-init-datasources", "enable-serial-console", "vm"].
+# "cloud-init", "cloud-init-datasources", "enable-serial-console", "vm"].
 #overcloud_dib_elements_default:
 
 # List of additional DIB elements. Default is none.
diff --git a/etc/kayobe/proxy.yml b/etc/kayobe/proxy.yml
index 714b9dae5..d7df51e52 100644
--- a/etc/kayobe/proxy.yml
+++ b/etc/kayobe/proxy.yml
@@ -12,8 +12,9 @@
 
 # List of domains, hostnames, IP addresses and networks for which no proxy is
 # used. Defaults to ["127.0.0.1", "localhost", "{{ ('http://' ~
-# docker_registry) | urlsplit('hostname') }}"] if docker_registry is set, or
-# ["127.0.0.1", "localhost"] otherwise. This is configured only if either
+# docker_registry) | urlsplit('hostname') }}","{{ kolla_internal_vip_address
+# }}"] if docker_registry is set, or ["127.0.0.1", "localhost","{{
+# kolla_internal_vip_address }}"] otherwise. This is configured only if either
 # http_proxy or https_proxy is set.
 #no_proxy:
 
diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml
index 42aea8da5..647cbef64 100644
--- a/etc/kayobe/seed-vm.yml
+++ b/etc/kayobe/seed-vm.yml
@@ -30,7 +30,7 @@
 #seed_vm_root_format:
 
 # Base image for the seed VM root volume. Default is
-# "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
+# "https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
 # when os_distribution is "ubuntu",
 # "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
 # when os_distribution is "rocky" and seed_vm_boot_firmware is "efi",
@@ -63,7 +63,7 @@
 #
 #seed_vm_interfaces:
 
-# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'bios'.
+# Boot firmware. Possible values are 'bios' or 'efi'. Default is 'efi'.
 #seed_vm_boot_firmware:
 
 # Machine type. Libvirt default configuration is used.
diff --git a/setup.cfg b/setup.cfg
index fda5c64d2..5a75436d2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,3 +12,6 @@ classifier =
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
+
+[options]
+packages =