diff --git a/charts/nextcloud-mcp-server/templates/_helpers.tpl b/charts/nextcloud-mcp-server/templates/_helpers.tpl
index c54b510..5b2c5c2 100644
--- a/charts/nextcloud-mcp-server/templates/_helpers.tpl
+++ b/charts/nextcloud-mcp-server/templates/_helpers.tpl
@@ -95,15 +95,11 @@ Create the name of the PVC to use for OAuth storage
 {{- end }}
 
 {{/*
-Return the appropriate MCP server port based on auth mode
+Return the MCP server port
 */}}
 {{- define "nextcloud-mcp-server.port" -}}
-{{- if eq .Values.auth.mode "oauth" }}
-{{- .Values.auth.oauth.port }}
-{{- else }}
 {{- .Values.mcp.port }}
 {{- end }}
-{{- end }}
 
 {{/*
 Return the image tag
diff --git a/charts/nextcloud-mcp-server/values.yaml b/charts/nextcloud-mcp-server/values.yaml
index d842735..db30f10 100644
--- a/charts/nextcloud-mcp-server/values.yaml
+++ b/charts/nextcloud-mcp-server/values.yaml
@@ -61,8 +61,6 @@ auth:
 
   # OAuth2/OIDC settings (experimental)
   oauth:
-    # Port for OAuth MCP server (default: 8001)
-    port: 8001
     # OAuth token type: "jwt" or "opaque"
     tokenType: "jwt"
     # Pre-registered OAuth client ID (optional, ignored if existingSecret is set)
@@ -97,8 +95,11 @@ auth:
 mcp:
   # Transport mode (default: streamable-http for SSE)
   transport: "streamable-http"
-  # Port for basic auth mode
+  # Port for MCP server (both basic auth and OAuth modes)
   port: 8000
+  # Additional command-line arguments to pass to nextcloud-mcp-server
+  # Example: ["--log-level", "debug", "--enable-app", "notes"]
+  extraArgs: []
 
 # Document processing configuration (optional)
 documentProcessing: