diff --git a/ansible/roles/alliedware-plus-switch/tasks/main.yml b/ansible/roles/alliedware-plus-switch/tasks/main.yml
index ceb0d434c..be27a7d10 100644
--- a/ansible/roles/alliedware-plus-switch/tasks/main.yml
+++ b/ansible/roles/alliedware-plus-switch/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 - name: Ensure AlliedWare Plus switches are configured
   alliedtelesis.awplus.awplus_config:
+    diff_against: "running"
     lines: "{{ lookup('template', 'alliedware-plus-config.j2') }}"
     save_when: >-
       {{ alliedware_plus_switch_save | bool | ternary('modified', 'never') }}
diff --git a/roles/kayobe-ci-prep/tasks/main.yml b/roles/kayobe-ci-prep/tasks/main.yml
index 9e6b116ee..11847e719 100644
--- a/roles/kayobe-ci-prep/tasks/main.yml
+++ b/roles/kayobe-ci-prep/tasks/main.yml
@@ -1,13 +1,4 @@
 ---
-# NOTE: prefer IPv4 over IPv6 in getaddrinfo() to avoid slow/failing AAAA
-# lookups against hosts without real IPv6 connectivity
-- name: Prefer IPv4 over IPv6 for name resolution
-  become: true
-  ansible.builtin.lineinfile:
-    path: /etc/gai.conf
-    line: "precedence ::ffff:0:0/96  100"
-    create: true
-
 - name: Configure secondary storage drive
   #NOTE(wszumski) Some instances provide a smaller 40G root disk with a
   #secondary storage drive. This kolla-ansible provided role sets up the
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6db47b394..1ab792cf3 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -28,15 +28,12 @@
         - kayobe-overcloud-tls-rocky9
         - kayobe-overcloud-ubuntu-noble
         - kayobe-overcloud-ubuntu-noble-podman
-        - kayobe-overcloud-upgrade-slurp-rocky9
-        - kayobe-overcloud-upgrade-slurp-ubuntu-noble
         - kayobe-seed-rocky10
         - kayobe-seed-rocky10-podman
         - kayobe-seed-rocky9
         - kayobe-seed-rocky9-podman
         - kayobe-seed-ubuntu-noble
         - kayobe-seed-ubuntu-noble-podman
-        - kayobe-seed-upgrade-slurp-rocky9
         - kayobe-seed-vm-rocky10
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-noble
@@ -62,15 +59,12 @@
         - kayobe-overcloud-tls-rocky9
         - kayobe-overcloud-ubuntu-noble
         - kayobe-overcloud-ubuntu-noble-podman
-        - kayobe-overcloud-upgrade-slurp-rocky9
-        - kayobe-overcloud-upgrade-slurp-ubuntu-noble
         - kayobe-seed-rocky10
         - kayobe-seed-rocky10-podman
         - kayobe-seed-rocky9
         - kayobe-seed-rocky9-podman
         - kayobe-seed-ubuntu-noble
         - kayobe-seed-ubuntu-noble-podman
-        - kayobe-seed-upgrade-slurp-rocky9
         - kayobe-seed-vm-rocky10
         - kayobe-seed-vm-rocky9
         - kayobe-seed-vm-ubuntu-noble