diff --git a/internal/troubleshoot/collect.go b/internal/troubleshoot/collect.go
index 00a80813bd..6bf7227a07 100644
--- a/internal/troubleshoot/collect.go
+++ b/internal/troubleshoot/collect.go
@@ -34,26 +34,10 @@ func CollectResult(ctx context.Context, restConfig *rest.Config, opts CollectOpt
 		}
 	}()
 
-	collectors := []tbcollect.Collector{
-		// Collect the custom resources from Gateway API and EG
-		collect.CustomResource{
-			ClientConfig: restConfig,
-			BundlePath:   opts.BundlePath,
-			IncludeGroups: []string{
-				"gateway.envoyproxy.io",
-				"gateway.networking.k8s.io",
-			},
-		},
-	}
+	collectors := []tbcollect.Collector{}
 	for _, ns := range opts.CollectedNamespaces {
 		bundlePath := opts.BundlePath
 		collectors = append(collectors,
-			// Collect resources from EnvoyGateway system namespace
-			collect.EnvoyGatewayResource{
-				ClientConfig: restConfig,
-				BundlePath:   bundlePath,
-				Namespace:    ns,
-			},
 			// Collect logs from EnvoyGateway system namespace
 			&tbcollect.CollectLogs{
 				Collector: &troubleshootv1b2.Logs{
@@ -64,12 +48,6 @@ func CollectResult(ctx context.Context, restConfig *rest.Config, opts CollectOpt
 				BundlePath:   bundlePath,
 				Context:      ctx,
 			},
-			// Collect prometheus metrics from EnvoyGateway system namespace
-			collect.PrometheusMetric{
-				BundlePath:   bundlePath,
-				ClientConfig: restConfig,
-				Namespace:    ns,
-			},
 			// Collect config dump from EnvoyGateway system namespace
 			collect.ConfigDump{
 				BundlePath:   bundlePath,
diff --git a/test/e2e/tests/utils.go b/test/e2e/tests/utils.go
index fbd5f075da..1502cf9286 100644
--- a/test/e2e/tests/utils.go
+++ b/test/e2e/tests/utils.go
@@ -612,11 +612,6 @@ type LokiQueryResponse struct {
 // CollectAndDump collects and dumps the cluster data for troubleshooting and log.
 // This function should be call within t.Cleanup.
 func CollectAndDump(t *testing.T, rest *rest.Config) {
-	if os.Getenv("ACTIONS_STEP_DEBUG") != "true" {
-		tlog.Logf(t, "Skipping collecting and dumping cluster data, set ACTIONS_STEP_DEBUG=true to enable it")
-		return
-	}
-
 	dumpedNamespaces := []string{"envoy-gateway-system"}
 	if IsGatewayNamespaceMode() {
 		dumpedNamespaces = append(dumpedNamespaces, ConformanceInfraNamespace)