diff --git a/pkg/velaql/providers/query/handler_test.go b/pkg/velaql/providers/query/handler_test.go
index fe4d9eaef..1cbd945e9 100644
--- a/pkg/velaql/providers/query/handler_test.go
+++ b/pkg/velaql/providers/query/handler_test.go
@@ -955,6 +955,7 @@ options: {
 		Expect(err).Should(BeNil())
 		Expect(len(urls)).Should(Equal(len(endpoints)))
 		for i, e := range endpoints {
+			fmt.Println(e.String())
 			Expect(urls[i]).Should(Equal(e.String()))
 		}
 	})
diff --git a/references/cli/portforward.go b/references/cli/portforward.go
index ee4c7ed58..4f1c547e4 100644
--- a/references/cli/portforward.go
+++ b/references/cli/portforward.go
@@ -175,17 +175,22 @@ func (o *VelaPortForwardOptions) Init(ctx context.Context, cmd *cobra.Command, a
 				fmt.Println("The Service you specified does not exist, please select it from the list.")
 			}
 		}
-		if selectService == nil {
-			selectService, o.targetPort, err = AskToChooseOneService(services, len(o.Args) < 2)
-			if err != nil {
-				return err
+		if len(services) > 0 {
+			if selectService == nil {
+				selectService, o.targetPort, err = AskToChooseOneService(services, len(o.Args) < 2)
+				if err != nil {
+					return err
+				}
 			}
-		}
-		if selectService != nil {
-			o.targetResource.cluster = selectService.Cluster
-			o.targetResource.name = selectService.Object.GetName()
-			o.targetResource.namespace = selectService.Object.GetNamespace()
-			o.targetResource.kind = selectService.Object.GetKind()
+			if selectService != nil {
+				o.targetResource.cluster = selectService.Cluster
+				o.targetResource.name = selectService.Object.GetName()
+				o.targetResource.namespace = selectService.Object.GetNamespace()
+				o.targetResource.kind = selectService.Object.GetKind()
+			}
+		} else if o.ResourceName == "" {
+			// If users do not specify the resource name and there is no service, switch to query the pod
+			o.ResourceType = "pod"
 		}
 	}
 
diff --git a/test/e2e-multicluster-test/testdata/app/example-envbinding-app-wo-workflow.yaml b/test/e2e-multicluster-test/testdata/app/example-envbinding-app-wo-workflow.yaml
index 15484dc85..f6c49c574 100644
--- a/test/e2e-multicluster-test/testdata/app/example-envbinding-app-wo-workflow.yaml
+++ b/test/e2e-multicluster-test/testdata/app/example-envbinding-app-wo-workflow.yaml
@@ -9,7 +9,9 @@ spec:
       type: webservice
       properties:
         image: crccheck/hello-world
-        port: 8000
+        ports: 
+        - port: 8000
+          expose: true
       traits:
         - type: scaler
           properties:
diff --git a/test/e2e-multicluster-test/testdata/app/example-envbinding-app.yaml b/test/e2e-multicluster-test/testdata/app/example-envbinding-app.yaml
index 4e77d8bf3..b102f6d3b 100644
--- a/test/e2e-multicluster-test/testdata/app/example-envbinding-app.yaml
+++ b/test/e2e-multicluster-test/testdata/app/example-envbinding-app.yaml
@@ -9,7 +9,9 @@ spec:
       type: webservice
       properties:
         image: crccheck/hello-world
-        port: 8000
+        ports: 
+        - port: 8000
+          expose: true
       traits:
         - type: scaler
           properties:
diff --git a/test/e2e-multicluster-test/testdata/app/example-vela-cli-tool-test-app.yaml b/test/e2e-multicluster-test/testdata/app/example-vela-cli-tool-test-app.yaml
index f2cc12c4c..7b3bca91d 100644
--- a/test/e2e-multicluster-test/testdata/app/example-vela-cli-tool-test-app.yaml
+++ b/test/e2e-multicluster-test/testdata/app/example-vela-cli-tool-test-app.yaml
@@ -9,20 +9,19 @@ spec:
       type: webservice
       properties:
         image: crccheck/hello-world
-        port: 8000
+        ports: 
+        - port: 8000
+          expose: true
   policies:
     - name: env-policy
-      type: env-binding
+      type: topology
       properties:
-        envs:
-          - name: test
-            placement:
-              clusterSelector:
-                name: cluster-worker
+        clusters: 
+        - cluster-worker
   workflow:
     steps:
       - name: deploy-test
-        type: deploy2env
+        type: deploy
         properties:
-          policy: env-policy
-          env: test
+          policies: 
+          - env-policy
diff --git a/test/e2e-multicluster-test/testdata/app/multi-cluster-health-policy.yaml b/test/e2e-multicluster-test/testdata/app/multi-cluster-health-policy.yaml
index 70ff93162..cd4cda04b 100644
--- a/test/e2e-multicluster-test/testdata/app/multi-cluster-health-policy.yaml
+++ b/test/e2e-multicluster-test/testdata/app/multi-cluster-health-policy.yaml
@@ -9,7 +9,9 @@ spec:
       type: webservice
       properties:
         image: crccheck/hello-world
-        port: 8000
+        ports: 
+        - port: 8000
+          expose: true
         type: webservice
       traits:
         - type: rollout