diff --git a/roles/nftables/tasks/main.yaml b/roles/nftables/tasks/main.yaml
index 3af97edacf0..c86bbfe664f 100644
--- a/roles/nftables/tasks/main.yaml
+++ b/roles/nftables/tasks/main.yaml
@@ -8,8 +8,14 @@
   shell:
     cmd: |
       /usr/bin/update-alternatives --set iptables /usr/sbin/iptables-nft
+      /usr/bin/update-alternatives --set iptables-save /usr/sbin/iptables-nft-save
+      /usr/bin/update-alternatives --set iptables-restore /usr/sbin/iptables-nft-restore
       /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-nft
+      /usr/bin/update-alternatives --set ip6tables-save /usr/sbin/ip6tables-nft-save
+      /usr/bin/update-alternatives --set ip6tables-restore /usr/sbin/ip6tables-nft-restore
       /usr/bin/update-alternatives --set ebtables /usr/sbin/ebtables-nft
+      /usr/bin/update-alternatives --set ebtables-save /usr/sbin/ebtables-nft-save
+      /usr/bin/update-alternatives --set ebtables-restore /usr/sbin/ebtables-nft-restore
       /usr/bin/update-alternatives --set arptables /usr/sbin/arptables-nft
     executable: /bin/bash
   become: yes
diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml
index 25e4f80b0f0..125470554d6 100644
--- a/zuul.d/job-templates.yaml
+++ b/zuul.d/job-templates.yaml
@@ -88,8 +88,8 @@
             voting: true
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
         - openstacksdk-functional-devstack-networking
-        - neutron-linuxbridge-tempest-plugin-scenario-nftables
-        - neutron-ovs-tempest-plugin-scenario-iptables_hybrid-nftables
+        - neutron-linuxbridge-tempest-plugin-nftables
+        - neutron-ovs-tempest-plugin-iptables_hybrid-nftables
         - devstack-enforce-scope
         - neutron-tempest-plugin-linuxbridge
     experimental: