diff --git a/neutron/tests/fullstack/test_l3_agent.py b/neutron/tests/fullstack/test_l3_agent.py
index 1a39efa844b..e477e0ddce3 100644
--- a/neutron/tests/fullstack/test_l3_agent.py
+++ b/neutron/tests/fullstack/test_l3_agent.py
@@ -395,8 +395,11 @@ class TestLegacyL3Agent(TestL3Agent):
         v6network = self.useFixture(
             ip_network.ExclusiveIPNetwork(
                 "2001:db8:1234::1", "2001:db8:1234::10", "64")).network
+        # NOTE(ykarel): gateway_ip is explicitly added as iputils package
+        # requires fix for https://github.com/iputils/iputils/issues/371
+        # is not available in CentOS 9-Stream
         ext_v6sub = self.safe_client.create_subnet(
-            tenant_id, ext_net['id'], v6network)
+            tenant_id, ext_net['id'], v6network, gateway_ip='2001:db8:1234::1')
 
         router = self.safe_client.create_router(tenant_id,
                                                 external_network=ext_net['id'])
diff --git a/neutron/tests/fullstack/test_local_ip.py b/neutron/tests/fullstack/test_local_ip.py
index 2b61a9603c3..9ad9dedeb68 100644
--- a/neutron/tests/fullstack/test_local_ip.py
+++ b/neutron/tests/fullstack/test_local_ip.py
@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import time
+
 from neutron_lib import constants
 from oslo_utils import uuidutils
 
@@ -119,5 +121,9 @@ class LocalIPTestCase(base.BaseFullStackTestCase):
         # VM on different host shouldn't have access to this Local IP
         vms[2].assert_no_ping(local_ip['local_ip_address'])
 
+        # NOTE(ykarel): response comes from local_ip assigned to vm0,
+        # as a workaround sleep for arp cache expiry. It requires
+        # fix in Local IP feature
+        time.sleep(31)
         # check that VMs can still access each other with fixed IPs
         vms.ping_all()
diff --git a/roles/configure_functional_tests/tasks/main.yaml b/roles/configure_functional_tests/tasks/main.yaml
index 799db6998b3..1bd6c65d399 100644
--- a/roles/configure_functional_tests/tasks/main.yaml
+++ b/roles/configure_functional_tests/tasks/main.yaml
@@ -27,11 +27,15 @@
         MYSQL_GATHER_PERFORMANCE={{ MYSQL_GATHER_PERFORMANCE | default(true) }}
 
         source $NEUTRON_DIR/tools/configure_for_func_testing.sh
-
         if is_fedora; then
             # NOTE(slqweq) Running functional job e.g. on Centos requires to
             # have repo with rabbitmq-server and some other packages available
-            install_package centos-release-openstack-victoria
+            OPENSTACK_RELEASE=victoria
+            # For CentOS 9-Stream need to setup yoga repos
+            if [[ $os_VENDOR == "CentOSStream" && $os_RELEASE -gt 8 ]]; then
+                OPENSTACK_RELEASE=yoga
+            fi
+            install_package centos-release-openstack-${OPENSTACK_RELEASE}
             install_package iproute-tc haproxy keepalived
 
             # NOTE(slaweq) On Fedora/CentOS systems make sure that SELinux is
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 073ea3218fe..e2b598ca7a2 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -152,17 +152,12 @@
 - job:
     name: neutron-functional-with-uwsgi-fips
     parent: neutron-functional-with-uwsgi
-    nodeset: devstack-single-node-centos-8-stream
+    nodeset: devstack-single-node-centos-9-stream
     description: |
-      Functional testing for a FIPS enabled Centos 8 system
+      Functional testing for a FIPS enabled Centos 9 system
     vars:
       nslookup_target: 'opendev.org'
       enable_fips: True
-      # NOTE(ykarel) Remove MYSQL_GATHER_PERFORMANCE and
-      # tox_environment when this job switches to centos-9-stream
-      MYSQL_GATHER_PERFORMANCE: false
-      tox_environment:
-        TOX_PYTHON: python3.8
       devstack_localrc:
         ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
         Q_BUILD_OVS_FROM_GIT: true
@@ -229,17 +224,12 @@
 - job:
     name: neutron-fullstack-with-uwsgi-fips
     parent: neutron-fullstack-with-uwsgi
-    nodeset: devstack-single-node-centos-8-stream
+    nodeset: devstack-single-node-centos-9-stream
     description: |
-      Functional testing for a FIPS enabled Centos 8 system
+      Functional testing for a FIPS enabled Centos 9 system
     vars:
       nslookup_target: 'opendev.org'
       enable_fips: True
-      # NOTE(ykarel) Remove MYSQL_GATHER_PERFORMANCE and
-      # tox_environment when this job switches to centos-9-stream
-      MYSQL_GATHER_PERFORMANCE: false
-      tox_environment:
-        TOX_PYTHON: python3.8
       devstack_localrc:
         ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
         Q_BUILD_OVS_FROM_GIT: true