diff --git a/pkg/services/config.go b/pkg/services/config.go
index c09d23e0d..a699aa0ca 100644
--- a/pkg/services/config.go
+++ b/pkg/services/config.go
@@ -13,6 +13,7 @@ import (
 	"github.com/gptscript-ai/gptscript/pkg/cache"
 	gptscriptai "github.com/gptscript-ai/gptscript/pkg/gptscript"
 	"github.com/gptscript-ai/gptscript/pkg/loader"
+	"github.com/gptscript-ai/gptscript/pkg/runner"
 	"github.com/gptscript-ai/gptscript/pkg/sdkserver"
 	baaah "github.com/obot-platform/nah"
 	"github.com/obot-platform/nah/pkg/leader"
@@ -115,11 +116,18 @@ func newGPTScript(ctx context.Context, workspaceTool, datasetsTool, toolsRegistr
 		})
 	}
 
+	credOverrides := strings.Split(os.Getenv("GPTSCRIPT_CREDENTIAL_OVERRIDE"), ",")
+	if len(credOverrides) == 1 && strings.TrimSpace(credOverrides[0]) == "" {
+		credOverrides = nil
+	}
 	url, err := sdkserver.EmbeddedStart(ctx, sdkserver.Options{
 		Options: gptscriptai.Options{
 			Cache: cache.Options{
 				CacheDir: os.Getenv("GPTSCRIPT_CACHE_DIR"),
 			},
+			Runner: runner.Options{
+				CredentialOverrides: credOverrides,
+			},
 			SystemToolsDir: os.Getenv("GPTSCRIPT_SYSTEM_TOOLS_DIR"),
 		},
 		DatasetTool:   datasetsTool,