diff --git a/internal/provider/model_provider.go b/internal/provider/model_provider.go
index 06168f73..a61cf664 100644
--- a/internal/provider/model_provider.go
+++ b/internal/provider/model_provider.go
@@ -236,6 +236,11 @@ func (p ArgoCDProviderConfig) setPortForwardingOpts(ctx context.Context, opts *a
 		}
 
 		opts.ServerAddr = "localhost" // will be overwritten by ArgoCD module when we initialize the API client but needs to be set here to ensure we
+		opts.ServerName = "argocd-server"
+
+		if opts.PortForwardNamespace == "" {
+			opts.PortForwardNamespace = "argocd"
+		}
 
 		if p.Kubernetes == nil {
 			break