diff --git a/.github/workflows/stackhpc-all-in-one.yml b/.github/workflows/stackhpc-all-in-one.yml
index 36a1ea99c..342338c46 100644
--- a/.github/workflows/stackhpc-all-in-one.yml
+++ b/.github/workflows/stackhpc-all-in-one.yml
@@ -410,6 +410,17 @@ jobs:
           KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
         if: inputs.upgrade
 
+      - name: Login to docker registry
+        run: |
+          docker run -t --rm \
+            -v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
+            -e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY \
+            ${{ steps.kayobe_image.outputs.kayobe_image }} \
+            /stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/playbook-run.sh etc/kayobe/ansible/docker-registry-login.yml
+        env:
+          KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
+        if: inputs.upgrade
+
       - name: Service upgrade
         run: |
           docker run -t --rm \
diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml
index aba6bacb7..0256d6acd 100644
--- a/.github/workflows/stackhpc-pull-request.yml
+++ b/.github/workflows/stackhpc-pull-request.yml
@@ -90,75 +90,75 @@ jobs:
     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-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-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-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' }}
+      #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.
+      ## Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
 
   all-in-one-upgrade-ubuntu-jammy-ovs:
     name: aio upgrade (Ubuntu Jammy OVS)
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index 2a1ceb662..7dc05fb88 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -149,11 +149,7 @@ stackhpc_kolla_source_version: "stackhpc/{{ openstack_release }}"
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-# FIXME: Waiting for
-# https://review.opendev.org/c/openstack/kolla-ansible/+/926198 to merge and
-# sync to stackhpc/2024.1
-# stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}"
-stackhpc_kolla_ansible_source_version: "fix-prometheus"
+stackhpc_kolla_ansible_source_version: "dnm-debug-precheck"
 
 ###############################################################################
 # Container image registry