diff --git a/lib/directus.ts b/lib/directus.ts
index 23de415a..36c71ef6 100644
--- a/lib/directus.ts
+++ b/lib/directus.ts
@@ -3,8 +3,20 @@ import { createMintelDirectusClient, ensureDirectusAuthenticated } from '@mintel
 import { config } from './config';
 import { getServerAppServices } from './services/create-services.server';
 
+/**
+ * Directus Schema Definitions
+ */
+export interface Schema {
+  products: any[];
+  categories: any[];
+  contact_submissions: any[];
+  product_requests: any[];
+  translations: any[];
+  categories_link: any[];
+}
+
 // Initialize client using Mintel standards (environment-aware)
-const client = createMintelDirectusClient();
+const client = createMintelDirectusClient<Schema>();
 
 /**
  * Helper to determine if we should show detailed errors
diff --git a/lib/env.ts b/lib/env.ts
index 3638d5f8..b7ecb376 100644
--- a/lib/env.ts
+++ b/lib/env.ts
@@ -3,12 +3,7 @@ import { validateMintelEnv, mintelEnvSchema } from '@mintel/next-utils';
 
 /**
  * Environment variable schema.
- * Extends the default Mintel environment schema which already includes:
- * - Directus (URL, TOKEN, INTERNAL_URL, etc.)
- * - Mail (HOST, PORT, etc.)
- * - Gotify
- * - Logging
- * - Analytics
+ * Extends the default Mintel environment schema.
  */
 const envExtension = {
   // Project specific overrides or additions
@@ -29,6 +24,11 @@ const envExtension = {
   INFRA_DIRECTUS_TOKEN: z.string().optional(),
 };
 
+/**
+ * Full schema including Mintel base
+ */
+export const envSchema = mintelEnvSchema.extend(envExtension);
+
 /**
  * Validated environment object.
  */