diff --git a/test/apim-apk-agent-test/cucumber-tests/scripts/setup-hosts.sh b/test/apim-apk-agent-test/cucumber-tests/scripts/setup-hosts.sh
index 6e5a9d9d6..e0d1df1cf 100644
--- a/test/apim-apk-agent-test/cucumber-tests/scripts/setup-hosts.sh
+++ b/test/apim-apk-agent-test/cucumber-tests/scripts/setup-hosts.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-
+helm upgrade --install ingress-nginx ingress-nginx --repo https://kubernetes.github.io/ingress-nginx --namespace ingress-nginx --create-namespace
 kubectl apply -f ./CRs/artifacts.yaml
 kubectl wait deployment/apim-wso2am-cp-deployment-1 -n apk --for=condition=available --timeout=600s
 kubectl wait --timeout=5m -n apk deployment/apk-wso2-apk-adapter-deployment --for=condition=Available
@@ -10,11 +10,10 @@ CC_IP=$(kubectl get svc apk-wso2-apk-common-controller-web-server-service -n apk
 sudo echo "$IP localhost" | sudo tee -a /etc/hosts
 sudo echo "$IP idp.am.wso2.com" | sudo tee -a /etc/hosts
 sudo echo "$CC_IP apk-wso2-apk-common-controller-service.apk.svc" | sudo tee -a /etc/hosts
-sudo echo "127.0.0.1 am.wso2.com" | sudo tee -a /etc/hosts
+sudo echo "$IP am.wso2.com" | sudo tee -a /etc/hosts
 sudo echo "$IP api.am.wso2.com" | sudo tee -a /etc/hosts
 sudo echo "$IP default.gw.wso2.com" | sudo tee -a /etc/hosts
 sudo echo "$IP default.sandbox.gw.wso2.com" | sudo tee -a /etc/hosts
 sudo echo "$IP sandbox.default.gw.wso2.com" | sudo tee -a /etc/hosts
 sudo echo "255.255.255.255 broadcasthost" | sudo tee -a /etc/hosts
 sudo echo "::1 localhost" | sudo tee -a /etc/hosts
-kubectl port-forward svc/apim-wso2am-cp-1-service -n apk 9443:9443 &
diff --git a/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java b/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java
index c84883d3f..c3aa9a8b5 100644
--- a/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java
+++ b/test/apim-apk-agent-test/cucumber-tests/src/test/java/org/wso2/apk/integration/utils/Constants.java
@@ -21,7 +21,7 @@ public class Constants {
 
     public static final String DEFAULT_IDP_HOST = "am.wso2.com";
     public static final String DEFAULT_API_HOST = "am.wso2.com";
-    public static final String DEFAULT_GW_PORT = "9443";
+    public static final String DEFAULT_GW_PORT = "";
     public static final String DEFAULT_TOKEN_EP = "oauth2/token";
     public static final String DEFAULT_DCR_EP = "client-registration/v0.17/register";
     public static final String DEFAULT_API_CONFIGURATOR = "api/configurator/1.1.0/";