diff --git a/tools/deckhand_load_yaml.sh b/tools/deckhand_load_yaml.sh
index f88275c5..f5edca59 100755
--- a/tools/deckhand_load_yaml.sh
+++ b/tools/deckhand_load_yaml.sh
@@ -47,13 +47,7 @@ OS_PASSWORD="password"
 OS_AUTH_URL="http://keystone.${namespace}:80/v3"
 
 # Determine IP address of Ingress Controller
-# Note that the Ingress Controller currently needs to be in the same
-# namespace as the services that it is serving. The current workaround
-# will be to remove the Ingress Controller from OSH and put the UCP one
-# in the 'openstack' namespace. We should ideally have different Ingress
-# Controller for OpenStack and UCP. This logic will be updated at a
-# later date.
-ingress_controller_ip=`sudo kubectl get pods -n openstack -o wide | grep ingress-api | awk '{print $6}'`
+ingress_controller_ip=`sudo kubectl get pods -n ${namespace} -o wide | grep -v ingress-error-pages | grep -m 1 ingress | awk '{print $6}'`
 
 # Update /etc/hosts with the IP of the ingress controller
 # Note that these values would need to be set in the case
diff --git a/tools/run_shipyard.sh b/tools/run_shipyard.sh
index 122d6440..893e61e5 100755
--- a/tools/run_shipyard.sh
+++ b/tools/run_shipyard.sh
@@ -22,15 +22,10 @@ set -x
 # $ ./tools/run_shipyard.sh get actions
 #
 
-# NOTE: The Ingress Controller currently needs to be in the same
-# namespace as the services that it is serving. The current workaround
-# will be to remove the Ingress Controller from OSH and put the UCP one
-# in the 'openstack' namespace. We should ideally have different Ingress
-# Controller for OpenStack and UCP. This logic will be updated at a
-# later date. User can retrieve the IP of the ingress_controller_ip by
-# executing the following command:
+# NOTE: User can retrieve the IP of the ingress_controller_ip by executing
+# the following command:
 #
-# ingress_controller_ip=`sudo kubectl get pods -n openstack -o wide | grep ingress-api | awk '{print $6}'`
+# ingress_controller_ip=`sudo kubectl get pods -n ucp -o wide | grep -v ingress-error-pages | grep -m 1 ingress | awk '{print $6}'`
 #
 
 # NOTE: User should update /etc/hosts with the IP of the ingress