diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 2576b23b95..f7f9306d92 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -63,6 +63,7 @@
       kube_version: "1.31.3-1.1"
       calico_version: "v3.27.4"
       metallb_version: "0.13.12"
+      ingress_setup: true
       helm_version: "v3.14.0"
       crictl_version: "v1.30.1"
       zuul_osh_relative_path: ../openstack-helm
@@ -94,7 +95,6 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/common/ingress.sh
         - export VOLUME_HELM_ARGS="--set volume.enabled=false"; ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/common/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
@@ -120,7 +120,6 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/common/ingress.sh
         - export VOLUME_HELM_ARGS="--set volume.enabled=false"; ./tools/deployment/component/common/rabbitmq.sh
         - ./tools/deployment/component/common/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
@@ -149,7 +148,6 @@
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/ceph/ceph-rook.sh
         - ./tools/deployment/component/ceph/ceph-adapter-rook.sh
-        - ./tools/deployment/common/ingress.sh
         - export VOLUME_HELM_ARGS=" "; ./tools/deployment/component/common/rabbitmq.sh
         - export VOLUME_HELM_ARGS=" "; ./tools/deployment/component/common/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
@@ -175,7 +173,6 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/prepare-helm-repos-local.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/common/ingress.sh
         - - ./tools/deployment/component/common/rabbitmq.sh
           - ./tools/deployment/component/common/mariadb.sh
           - ./tools/deployment/component/common/memcached.sh
@@ -205,7 +202,6 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/prepare-helm-repos-public.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/common/ingress.sh
         - - ./tools/deployment/component/common/rabbitmq.sh
           - ./tools/deployment/component/common/mariadb.sh
           - ./tools/deployment/component/common/memcached.sh
@@ -231,7 +227,6 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/common/ingress.sh
         - - ./tools/deployment/component/common/rabbitmq.sh
           - ./tools/deployment/component/common/mariadb.sh
           - ./tools/deployment/component/common/memcached.sh
@@ -262,7 +257,6 @@
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/common/cert-manager.sh
-        - ./tools/deployment/common/ingress.sh
         - ./tools/deployment/component/common/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
@@ -284,7 +278,6 @@
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/ceph/ceph.sh
         - ./tools/deployment/component/ceph/ceph-ns-activate.sh
-        - ./tools/deployment/common/ingress.sh
         - - ./tools/deployment/component/common/mariadb.sh
           - ./tools/deployment/component/common/memcached.sh
           - ./tools/deployment/component/common/rabbitmq.sh
@@ -308,7 +301,6 @@
         - ./tools/deployment/common/setup-client.sh
         - ./tools/deployment/component/ceph/ceph-rook.sh
         - ./tools/deployment/component/ceph/ceph-adapter-rook.sh
-        - ./tools/deployment/common/ingress.sh
         - - ./tools/deployment/component/common/mariadb.sh
           - ./tools/deployment/component/common/memcached.sh
           - ./tools/deployment/component/common/rabbitmq.sh
@@ -342,7 +334,6 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/common/ingress.sh
         - export GLANCE_BACKEND=local; ./tools/deployment/component/common/openstack.sh
         - export HELM_TESTS_TRIES=3; export OSH_TEST_TIMEOUT=1200; ./tools/deployment/common/run-helm-tests.sh openstack
         - ./tools/deployment/common/use-it.sh
@@ -363,7 +354,6 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/common/ingress.sh
         - ./tools/deployment/component/common/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
@@ -386,7 +376,6 @@
         - ./tools/deployment/common/cert-manager.sh
         - ./tools/deployment/component/ceph/ceph-rook.sh
         - ./tools/deployment/component/ceph/ceph-adapter-rook.sh
-        - ./tools/deployment/common/ingress.sh
         - ./tools/deployment/component/common/mariadb.sh
         - ./tools/deployment/component/common/memcached.sh
         - ./tools/deployment/component/common/rabbitmq.sh
@@ -415,7 +404,6 @@
         - ./tools/deployment/common/prepare-k8s.sh
         - ./tools/deployment/common/prepare-charts.sh
         - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/common/ingress.sh
         - - ./tools/deployment/component/common/rabbitmq.sh
           - ./tools/deployment/component/common/mariadb.sh
           - ./tools/deployment/component/common/memcached.sh