diff --git a/tests/ci/k3d/deploy_k3d.sh b/tests/ci/k3d/deploy_k3d.sh
index 77b3a8e1799d8c70db347934ad5754ecfeaed797..0b436bfe92405ffb8210e49391d1af4e6868e6c3 100644
--- a/tests/ci/k3d/deploy_k3d.sh
+++ b/tests/ci/k3d/deploy_k3d.sh
@@ -2,7 +2,7 @@
 
 set -ex
 # if keycloak label or all packages label add deploy k3d without loadbalancer so metallb can be used
-if [[ $CI_MERGE_REQUEST_LABELS =~ "keycloak" ||  $CI_MERGE_REQUEST_LABELS =~ "all-packages" ]]; then
+if [[ "${CI_COMMIT_BRANCH}" == "${CI_DEFAULT_BRANCH}" ]] || [[ ! -z "$CI_COMMIT_TAG" ]] || [[ $CI_MERGE_REQUEST_LABELS =~ "keycloak" ||  $CI_MERGE_REQUEST_LABELS =~ "all-packages" ]]; then
   k3d cluster create ${CI_JOB_ID} --config tests/ci/k3d/disable-servicelb-config.yaml --network ${CI_JOB_ID}
 else
   k3d cluster create ${CI_JOB_ID} --config tests/ci/k3d/config.yaml --network ${CI_JOB_ID}
diff --git a/tests/ci/k3d/metallb/install_metallb.sh b/tests/ci/k3d/metallb/install_metallb.sh
index 150696b119c5104b4f0b0e3a3955459e3ec197d3..d60e34f550bb210f9640e7c0731129ce49804b9e 100644
--- a/tests/ci/k3d/metallb/install_metallb.sh
+++ b/tests/ci/k3d/metallb/install_metallb.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-if [[ $CI_MERGE_REQUEST_LABELS =~ "keycloak" ||  $CI_MERGE_REQUEST_LABELS =~ "all-packages" ]]; then
+if [[ "${CI_COMMIT_BRANCH}" == "${CI_DEFAULT_BRANCH}" ]] || [[ ! -z "$CI_COMMIT_TAG" ]] || [[ $CI_MERGE_REQUEST_LABELS =~ "keycloak" ||  $CI_MERGE_REQUEST_LABELS =~ "all-packages" ]]; then
   kubectl create -f tests/ci/k3d/metallb/metallb.yaml
   kubectl create -f tests/ci/k3d/metallb/metallb-config.yaml
 else
diff --git a/tests/tests/01_virtualservices.sh b/tests/tests/01_virtualservices.sh
index 5da18892c322c26f76c68b48b842dcb30401595d..c0d200472716e285c9b4550fd6d62d2c97189c71 100755
--- a/tests/tests/01_virtualservices.sh
+++ b/tests/tests/01_virtualservices.sh
@@ -5,12 +5,12 @@ set -e
 
 # Populate /etc/hosts
 ip=$(kubectl -n istio-system get service public-ingressgateway -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-ip_passthrough=$(kubectl -n istio-system get service passthrough-ingressgateway -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
 echo "Checking "
 
 hosts=`kubectl get virtualservices -A -o jsonpath="{ .items[*].spec.hosts[*] }"`
 for host in $hosts; do
   if [ $host == "keycloak.bigbang.dev" ]; then
+    ip_passthrough=$(kubectl -n istio-system get service passthrough-ingressgateway -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
     echo "$ip_passthrough $host" >> /etc/hosts
   else
     echo "$ip $host" >> /etc/hosts