diff --git a/apps/server/taylordb/query-builder.ts b/apps/server/taylordb/query-builder.ts
index 7708b54..b733fbb 100644
--- a/apps/server/taylordb/query-builder.ts
+++ b/apps/server/taylordb/query-builder.ts
@@ -10,8 +10,8 @@ import type { TaylorDatabase } from "./types.js";
 
 export const queryBuilder = createQueryBuilder<TaylorDatabase>({
   baseUrl: process.env.TAYLORDB_BASE_URL!,
-  baseId: process.env.TAYLORDB_BASE_ID!,
-  apiKey: process.env.TAYLORDB_API_KEY!,
+  baseId: process.env.TAYLORDB_SERVER_ID!,
+  apiKey: process.env.TAYLORDB_API_TOKEN!,
 });
 
 /**
diff --git a/taylordb.yml b/taylordb.yml
index ce7608a..af34014 100644
--- a/taylordb.yml
+++ b/taylordb.yml
@@ -22,7 +22,7 @@ services:
         vars:
           TAYLORDB_BASE_URL: vars.TAYLORDB_BASE_URL
           TAYLORDB_API_KEY: secrets.TAYLORDB_API_TOKEN
-          TAYLORDB_BASE_ID: vars.TAYLORDB_BASE_ID
+          TAYLORDB_BASE_ID: vars.TAYLORDB_SERVER_ID
           FRONTEND_URL: routing.client.url
   
   client: