diff --git a/Dockerfile b/Dockerfile
index 2904742a3..5c5bc3118 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ ENV PGDATA=/data/postgresql
 COPY --from=build-pgvector /usr/lib/postgresql17/vector.so /usr/lib/postgresql17/
 COPY --from=build-pgvector /usr/share/postgresql17/extension/vector* /usr/share/postgresql17/extension/
 
-RUN apk add --no-cache git python-3.13 py3.13-pip npm bash tini procps libreoffice docker perl-utils
+RUN apk add --no-cache git python-3.13 py3.13-pip npm bash tini procps libreoffice docker perl-utils sqlite sqlite-dev
 COPY --chmod=0755 /tools/package-chrome.sh /
 
 RUN /package-chrome.sh && rm /package-chrome.sh
@@ -56,6 +56,7 @@ COPY --from=bin /app/bin/obot /bin/
 EXPOSE 22
 # libreoffice executables
 ENV PATH=$PATH:/usr/lib/libreoffice/program
+ENV PATH=$PATH:/usr/bin
 ENV HOME=/data
 ENV XDG_CACHE_HOME=/data/cache
 ENV OBOT_SERVER_AGENTS_DIR=/agents
diff --git a/pkg/api/handlers/tables.go b/pkg/api/handlers/tables.go
index fa48f2441..9aa8b52ae 100644
--- a/pkg/api/handlers/tables.go
+++ b/pkg/api/handlers/tables.go
@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"encoding/json"
-	"fmt"
 	"regexp"
 
 	"github.com/gptscript-ai/go-gptscript"
@@ -23,10 +22,10 @@ func NewTableHandler(gptScript *gptscript.GPTScript) *TableHandler {
 
 func (t *TableHandler) tables(req api.Context, workspaceID string) (string, error) {
 	var toolRef v1.ToolReference
-	if err := req.Get(&toolRef, "database"); err != nil {
+	if err := req.Get(&toolRef, "database-ui"); err != nil {
 		return "", err
 	}
-	run, err := t.gptScript.Run(req.Context(), "List Database Tables from "+toolRef.Status.Reference, gptscript.Options{
+	run, err := t.gptScript.Run(req.Context(), "list_database_tables from "+toolRef.Status.Reference, gptscript.Options{
 		Workspace: workspaceID,
 	})
 	if err != nil {
@@ -38,16 +37,16 @@ func (t *TableHandler) tables(req api.Context, workspaceID string) (string, erro
 
 func (t *TableHandler) rows(req api.Context, workspaceID, tableName string) (string, error) {
 	var toolRef v1.ToolReference
-	if err := req.Get(&toolRef, "database"); err != nil {
+	if err := req.Get(&toolRef, "database-ui"); err != nil {
 		return "", err
 	}
 	input, err := json.Marshal(map[string]string{
-		"query": fmt.Sprintf("SELECT * FROM '%s';", tableName),
+		"table": tableName,
 	})
 	if err != nil {
 		return "", err
 	}
-	run, err := t.gptScript.Run(req.Context(), "Run Database Query from "+toolRef.Status.Reference, gptscript.Options{
+	run, err := t.gptScript.Run(req.Context(), "list_database_table_rows from "+toolRef.Status.Reference, gptscript.Options{
 		Input:     string(input),
 		Workspace: workspaceID,
 	})