diff --git a/.github/workflows/global-ci-bundle.yml b/.github/workflows/global-ci-bundle.yml
index 96dfe50..a317236 100644
--- a/.github/workflows/global-ci-bundle.yml
+++ b/.github/workflows/global-ci-bundle.yml
@@ -457,24 +457,17 @@ jobs:
 
       - name: Wait for Ingress and expose UI service
         run: |
-          external_ip=""
-          echo $external_ip;
-          while [[ -z $external_ip ]]
-            do
-              echo "Waiting for end point..."
-                external_ip=$(kubectl get ingress tackle --template="{{range.status.loadBalancer.ingress}}{{.ip}}{{end}}" -n konveyor-tackle);[[ -z $external_ip ]] &&
-                echo $external_ip;
-                sleep 10;
-            done
-          echo "End point ready:" &&
-          echo $external_ip;
-          echo "UI_URL=https://$(minikube ip)" >>$GITHUB_ENV
+          kubectl wait -n konveyor-tackle ingress/tackle --for=jsonpath='{.status.loadBalancer.ingress[0]}' --timeout=600s
+          minikube_ip=$(minikube ip)
+          echo "ingress is ready at: ${minikube_ip}"
+          echo "UI_URL=https://${minikube_ip}" >>$GITHUB_ENV
 
       - name: Run login tests
         uses: cypress-io/github-action@v6
         env:
           CYPRESS_user: admin
-          CYPRESS_pass: password
+          CYPRESS_initialPassword: Passw0rd!
+          CYPRESS_password: Dog8code
           CYPRESS_baseUrl: "${{ env.UI_URL }}"
         with:
           working-directory: tackle-ui-tests
diff --git a/.github/workflows/global-ci.yml b/.github/workflows/global-ci.yml
index 1e81a12..63b280d 100644
--- a/.github/workflows/global-ci.yml
+++ b/.github/workflows/global-ci.yml
@@ -404,24 +404,17 @@ jobs:
 
       - name: Wait for Ingress and expose UI service
         run: |
-          external_ip=""
-          echo $external_ip;
-          while [[ -z $external_ip ]]
-            do
-              echo "Waiting for end point..."
-                external_ip=$(kubectl get ingress tackle --template="{{range.status.loadBalancer.ingress}}{{.ip}}{{end}}" -n konveyor-tackle);[[ -z $external_ip ]] &&
-                echo $external_ip;
-                sleep 10;
-            done
-          echo "End point ready:" &&
-          echo $external_ip;
-          echo "UI_URL=https://$(minikube ip)" >>$GITHUB_ENV
+          kubectl wait -n konveyor-tackle ingress/tackle --for=jsonpath='{.status.loadBalancer.ingress[0]}' --timeout=600s
+          minikube_ip=$(minikube ip)
+          echo "ingress is ready at: ${minikube_ip}"
+          echo "UI_URL=https://${minikube_ip}" >>$GITHUB_ENV
 
       - name: Run login tests
         uses: cypress-io/github-action@v6
         env:
           CYPRESS_user: admin
-          CYPRESS_pass: password
+          CYPRESS_initialPassword: Passw0rd!
+          CYPRESS_password: Dog8code
           CYPRESS_baseUrl: "${{ env.UI_URL }}"
           CYPRESS_tackleUrl: "${{ env.UI_URL }}"
         with: